Packman Build Service PMBS

Changes of Revision 5

mpfc.changes Changed

mpfc.spec Changed

@@ -1,50 +1,73 @@
-# vim: set sw=4 ts=4 et nu:
-
-%define soname 0
-
-Name:               mpfc
-Version:            1.3.8.1
-Release:            0.pm.1
-Summary:            Music Player for Linux Console
-# http://prdownloads.sourceforge.net/mpfc/mpfc-%{version}.tar.gz
-Source:             mpfc-%{version}.tar.bz2
-Source1:            mpfc.desktop
-# pbleser: use getaddrinfo() instead of gethostbyname() as the former also supports IPv6
-Patch1:             mpfc-getaddrinfo.patch
-# pbleser: fix missing standard library include(s)
-Patch2:             mpfc-fix_missing_std_headers.patch
-# pbleser: fix missing includes and declarations from internal code
-Patch3:             mpfc-fix_missing_includes.patch
-Source99:           mpfc-rpmlintrc
-URL:                http://sourceforge.net/projects/mpfc/
-Group:              Productivity/Multimedia/Sound/Players
-License:            GNU General Public License version 3 (GPL v3)
-BuildRoot:          %{_tmppath}/build-%{name}-%{version}
-BuildRequires:      ncurses-devel
-BuildRequires:      libicu-devel
-BuildRequires:      libmad-devel
-BuildRequires:      alsa-devel
-BuildRequires:      flac-devel
-BuildRequires:      libogg-devel libvorbis-devel
-%if 0%{?suse_version} >= 1140
-BuildRequires:      gpm-devel
+#
+# spec file for package mpfc
+#
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+%define soname 2
+Name:           mpfc
+Version:        2.0
+Release:        0
+Summary:        Music Player for Linux Console
+License:        GPL-2.0
+Group:          Productivity/Multimedia/Sound/Players
+Url:            https://code.google.com/p/mpfc/
+Source:         http://sourceforge.net/projects/mpfc/files/mpfc/%{name}-%{version}.tar.bz2
+Source1:        mpfc.desktop
+Source99:       mpfc-rpmlintrc
+#PATCH-FIX-UPSTREAM texinfo.patch avvissu@yandex.ru -- Fix no info dir entry in mpfc.info.gz
+Patch0:         mpfc-2.0-texinfo.patch
+#PATCH-FIX-UPSTREAM FSF.patch avvissu@yandex.ru -- Fix wrong fsf address
+Patch1:         mpfc-2.0-FSF.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  bison
+BuildRequires:  flex
+BuildRequires:  gcc
+BuildRequires:  glibc-devel
+BuildRequires:  gpm-devel
+BuildRequires:  libtool
+BuildRequires:  make
+BuildRequires:  makeinfo
+BuildRequires:  pkgconfig
+BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(flac)
+BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(gstreamer-audio-1.0)
+BuildRequires:  pkgconfig(icu-uc)
+BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(mad)
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(taglib)
+BuildRequires:  pkgconfig(vorbis)
+%if 0%{?suse_version} >= 1320
+BuildRequires:  pkgconfig(ncurses)
 %else
-BuildRequires:      gpm
+BuildRequires:  ncurses-devel
 %endif
-BuildRequires:      bison flex
-BuildRequires:      gcc make glibc-devel pkgconfig
-BuildRequires:      autoconf automake libtool
-BuildRequires:      update-desktop-files
-Requires:           libmpfc%{soname} = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 MPFC is a full-featured curses-based music player for Linux. It supports the
 standard playlist paradigm and a number of input file formats through loadable
 modules (plugins).
 
-%package -n libmpfc%{soname}
-Summary:            Music Player for Linux Console Library
-Group:              System/Libraries
+%package -n     libmpfc%{soname}
+Summary:        Music Player for Linux Console Library
+Group:          System/Libraries
 
 %description -n libmpfc%{soname}
 MPFC is a full-featured curses-based music player for Linux. It supports the
@@ -54,10 +77,10 @@
 This package contains the libmpfc library, that is used by mpfc and its
 plugins.
 
-%package -n libmpfc-devel
-Summary:            Development environment for mpfc plugins
-Group:              Development/Libraries/C and C++
-Requires:           libmpfc%{soname} = %{version}
+%package -n     libmpfc-devel
+Summary:        Development environment for mpfc plugins
+Group:          Development/Libraries/C and C++
+Requires:       libmpfc%{soname} = %{version}
 
 %description -n libmpfc-devel
 MPFC is a full-featured curses-based music player for Linux. It supports the
@@ -68,88 +91,70 @@
 
 %prep
 %setup -q
-%patch1
-%patch2
-%patch3
+%patch0 -p1
+%patch1 -p1
+
+touch NEWS ChangeLog
 
 %build
-CFLAGS="%{optflags} -Wall -Wno-unused -I/usr/include/ncursesw" \
+autoreconf -fiv
+%if 0%{?suse_version} < 1320
+export CURSES_CFLAGS="%{optflags} -Wall -Wno-unused -I%{_includedir}/ncursesw" \
+export CURSES_LIBS="L%{libdir} -lncursesw -ltinfo"
+%endif
+
 %configure \
     --disable-rpath \
     --enable-gpm \
-    --enable-mp3 \
-    --enable-flac \
     --enable-cue \
+    --enable-m3u \
+    --enable-pls \
     --enable-audiocd \
-    --enable-ogg \
-    --enable-alsa \
-    --enable-wav \
-    --enable-disk_writer \
-    --enable-oss
+	--enable-static=no
 
-%__make %{?_smp_flags}
+make %{?_smp_mflags}
 
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
-find "%{buildroot}%{_libdir}" -type f $ -name '*.a' -o -name '*.la' $ -exec %__rm {} \;
+find %{buildroot} -type f -name "*.la" -delete -print
 
-for p in general charset effect; do
+for p in general; do
     # using mkdir here on purpose, as mkdir_p and install -d fail silently if the
     # directory already exists, but we want the build to fail if mpfc suddenly has
     # plugins in there (to change the spec file accordingly)
-    %__mkdir "%{buildroot}%{_libdir}/mpfc/$p"
+    mkdir "%{buildroot}%{_libdir}/mpfc/$p"
 done
 
-%__install -D -m0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop"
-%suse_update_desktop_file -r "%{name}" AudioVideo Player
+install -D -m0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop"
 
 %find_lang "%{name}"
 
 %post   -n libmpfc%{soname} -p /sbin/ldconfig
+
 %postun -n libmpfc%{soname} -p /sbin/ldconfig
 
 %post
+%if 0%{?suse_version} >= 1140
+%desktop_database_post
+%endif
 %install_info --info-dir="%{_infodir}" "%{_infodir}/mpfc.info%{ext_info}"
 
 %postun
+%if 0%{?suse_version} >= 1140
+%desktop_database_postun
+%endif
 %install_info_delete --info-dir="%{_infodir}" "%{_infodir}/mpfc.info%{ext_info}"
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
-
 %files -f "%{name}.lang"
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%config(noreplace) %{_sysconfdir}/mpfcrc
-%{_bindir}/mpfc
-%dir %{_libdir}/mpfc
-%dir %{_libdir}/mpfc/input
-%{_libdir}/mpfc/input/libaudiocd.so
-%{_libdir}/mpfc/input/libaudiocd.so.*
-%{_libdir}/mpfc/input/libcue.so
-%{_libdir}/mpfc/input/libcue.so.*
-%{_libdir}/mpfc/input/libflac.so
-%{_libdir}/mpfc/input/libflac.so.*
-%{_libdir}/mpfc/input/libmp3.so
-%{_libdir}/mpfc/input/libmp3.so.*
-%{_libdir}/mpfc/input/libogg_vorbis.so
-%{_libdir}/mpfc/input/libogg_vorbis.so.*
-%{_libdir}/mpfc/input/libwav.so
-%{_libdir}/mpfc/input/libwav.so.*
-%dir %{_libdir}/mpfc/output
-%{_libdir}/mpfc/output/libalsa.so
-%{_libdir}/mpfc/output/libalsa.so.*
-%{_libdir}/mpfc/output/libdisk_writer.so
-%{_libdir}/mpfc/output/libdisk_writer.so.*
-%{_libdir}/mpfc/output/liboss.so
-%{_libdir}/mpfc/output/liboss.so.*
-%dir %{_libdir}/mpfc/general
-%dir %{_libdir}/mpfc/charset
-%dir %{_libdir}/mpfc/effect
-%doc %{_infodir}/mpfc.info%{ext_info}
-%doc %{_mandir}/man1/mpfc.1%{ext_man}
+%{_bindir}/%{name}
+%{_libdir}/%{name}
+%{_infodir}/mpfc.info%{ext_info}
+%{_mandir}/man1/mpfc.1%{ext_man}
 %{_datadir}/applications/%{name}.desktop
+#%config(noreplace) %{_sysconfdir}/mpfcrc
 
 %files -n libmpfc%{soname}
 %defattr(-,root,root)
@@ -160,8 +165,9 @@
 
 %files -n libmpfc-devel
 %defattr(-,root,root)
-%{_includedir}/mpfc
+%{_includedir}/%{name}
 %{_libdir}/libmpfc.so
 %{_libdir}/libmpfcwnd.so
 %{_libdir}/pkgconfig/mpfc.pc
 
+%changelog

mpfc-2.0-FSF.patch Added

@@ -0,0 +1,1606 @@
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/configure mpfc-2.0/configure
+--- mpfc-2.0.orig/configure	2014-01-31 19:43:59.000000000 +0300
++++ mpfc-2.0/configure	2015-02-24 17:44:10.790480595 +0300
+@@ -12494,7 +12494,7 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301 USA
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/cfg.c mpfc-2.0/libmpfc/cfg.c
+--- mpfc-2.0.orig/libmpfc/cfg.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/cfg.c	2015-02-24 17:44:10.083490982 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ 
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/cfg_rcfile.c mpfc-2.0/libmpfc/cfg_rcfile.c
+--- mpfc-2.0.orig/libmpfc/cfg_rcfile.c	2014-01-30 23:30:35.000000000 +0300
++++ mpfc-2.0/libmpfc/cfg_rcfile.c	2015-02-24 17:44:10.119490453 +0300
+@@ -17,8 +17,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <ctype.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/command.c mpfc-2.0/libmpfc/command.c
+--- mpfc-2.0.orig/libmpfc/command.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/command.c	2015-02-24 17:44:10.089490893 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/logger.c mpfc-2.0/libmpfc/logger.c
+--- mpfc-2.0.orig/libmpfc/logger.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/logger.c	2015-02-24 17:44:10.096490791 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdio.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/plugin.c mpfc-2.0/libmpfc/plugin.c
+--- mpfc-2.0.orig/libmpfc/plugin.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/plugin.c	2015-02-24 17:44:10.108490615 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <dlfcn.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/plugin_general.c mpfc-2.0/libmpfc/plugin_general.c
+--- mpfc-2.0.orig/libmpfc/plugin_general.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/plugin_general.c	2015-02-24 17:44:10.104490673 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/plugin_mng.c mpfc-2.0/libmpfc/plugin_mng.c
+--- mpfc-2.0.orig/libmpfc/plugin_mng.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/plugin_mng.c	2015-02-24 17:44:10.065491246 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdio.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/plugin_plist.c mpfc-2.0/libmpfc/plugin_plist.c
+--- mpfc-2.0.orig/libmpfc/plugin_plist.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/plugin_plist.c	2015-02-24 17:44:10.085490952 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <dlfcn.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/song_info.c mpfc-2.0/libmpfc/song_info.c
+--- mpfc-2.0.orig/libmpfc/song_info.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/song_info.c	2015-02-24 17:44:10.111490570 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/string.c mpfc-2.0/libmpfc/string.c
+--- mpfc-2.0.orig/libmpfc/string.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/string.c	2015-02-24 17:44:10.073491128 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdio.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/util.c mpfc-2.0/libmpfc/util.c
+--- mpfc-2.0.orig/libmpfc/util.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/util.c	2015-02-24 17:44:10.102490702 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdarg.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd.c mpfc-2.0/libmpfcwnd/wnd.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd.c	2015-02-24 17:44:10.227488866 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <assert.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd.h mpfc-2.0/libmpfcwnd/wnd.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd.h	2015-02-24 17:44:10.364486854 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_basic.c mpfc-2.0/libmpfcwnd/wnd_basic.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_basic.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_basic.c	2015-02-24 17:44:10.371486750 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <string.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_basic.h mpfc-2.0/libmpfcwnd/wnd_basic.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_basic.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_basic.h	2015-02-24 17:44:10.171489689 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_COMMON_MSG_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_button.c mpfc-2.0/libmpfcwnd/wnd_button.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_button.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_button.c	2015-02-24 17:44:10.307487691 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_button.h mpfc-2.0/libmpfcwnd/wnd_button.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_button.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_button.h	2015-02-24 17:44:10.324487441 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_BUTTON_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_checkbox.c mpfc-2.0/libmpfcwnd/wnd_checkbox.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_checkbox.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_checkbox.c	2015-02-24 17:44:10.187489454 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_checkbox.h mpfc-2.0/libmpfcwnd/wnd_checkbox.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_checkbox.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_checkbox.h	2015-02-24 17:44:10.161489836 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_CHECKBOX_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_class.c mpfc-2.0/libmpfcwnd/wnd_class.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_class.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_class.c	2015-02-24 17:44:10.151489983 +0300
+@@ -17,8 +17,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_class.h mpfc-2.0/libmpfcwnd/wnd_class.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_class.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_class.h	2015-02-24 17:44:10.355486986 +0300
+@@ -17,8 +17,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_CLASS_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_combobox.c mpfc-2.0/libmpfcwnd/wnd_combobox.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_combobox.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_combobox.c	2015-02-24 17:44:10.331487338 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_combobox.h mpfc-2.0/libmpfcwnd/wnd_combobox.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_combobox.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_combobox.h	2015-02-24 17:44:10.321487485 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_COMBOBOX_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_def_handlers.c mpfc-2.0/libmpfcwnd/wnd_def_handlers.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_def_handlers.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_def_handlers.c	2015-02-24 17:44:10.377486663 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <strings.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_def_handlers.h mpfc-2.0/libmpfcwnd/wnd_def_handlers.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_def_handlers.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_def_handlers.h	2015-02-24 17:44:10.275488161 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_DEF_HANDLERS_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_dialog.c mpfc-2.0/libmpfcwnd/wnd_dialog.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_dialog.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_dialog.c	2015-02-24 17:44:10.243488631 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_dialog.h mpfc-2.0/libmpfcwnd/wnd_dialog.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_dialog.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_dialog.h	2015-02-24 17:44:10.145490071 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_DIALOG_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_dlgitem.c mpfc-2.0/libmpfcwnd/wnd_dlgitem.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_dlgitem.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_dlgitem.c	2015-02-24 17:44:10.273488191 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <string.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_dlgitem.h mpfc-2.0/libmpfcwnd/wnd_dlgitem.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_dlgitem.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_dlgitem.h	2015-02-24 17:44:10.278488117 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_DLG_ITEM_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_editbox.c mpfc-2.0/libmpfcwnd/wnd_editbox.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_editbox.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_editbox.c	2015-02-24 17:44:10.343487162 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_editbox.h mpfc-2.0/libmpfcwnd/wnd_editbox.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_editbox.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_editbox.h	2015-02-24 17:44:10.311487632 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_EDITBOX_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_filebox.c mpfc-2.0/libmpfcwnd/wnd_filebox.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_filebox.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_filebox.c	2015-02-24 17:44:10.265488308 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <sys/types.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_filebox.h mpfc-2.0/libmpfcwnd/wnd_filebox.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_filebox.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_filebox.h	2015-02-24 17:44:10.317487544 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_FILEBOX_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_hbox.c mpfc-2.0/libmpfcwnd/wnd_hbox.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_hbox.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_hbox.c	2015-02-24 17:44:10.148490027 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_hbox.h mpfc-2.0/libmpfcwnd/wnd_hbox.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_hbox.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_hbox.h	2015-02-24 17:44:10.280488087 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_HBOX_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_kbd.c mpfc-2.0/libmpfcwnd/wnd_kbd.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_kbd.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_kbd.c	2015-02-24 17:44:10.191489395 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <assert.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_kbd.h mpfc-2.0/libmpfcwnd/wnd_kbd.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_kbd.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_kbd.h	2015-02-24 17:44:10.286487999 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_KBD_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_kbind.c mpfc-2.0/libmpfcwnd/wnd_kbind.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_kbind.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_kbind.c	2015-02-24 17:44:10.297487838 +0300
+@@ -17,8 +17,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <ctype.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_kbind.h mpfc-2.0/libmpfcwnd/wnd_kbind.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_kbind.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_kbind.h	2015-02-24 17:44:10.268488264 +0300
+@@ -17,8 +17,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_KBIND_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_label.c mpfc-2.0/libmpfcwnd/wnd_label.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_label.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_label.c	2015-02-24 17:44:10.315487574 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_label.h mpfc-2.0/libmpfcwnd/wnd_label.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_label.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_label.h	2015-02-24 17:44:10.257488425 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_LABEL_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_listbox.c mpfc-2.0/libmpfcwnd/wnd_listbox.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_listbox.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_listbox.c	2015-02-24 17:44:10.304487735 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_listbox.h mpfc-2.0/libmpfcwnd/wnd_listbox.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_listbox.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_listbox.h	2015-02-24 17:44:10.159489865 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_LISTBOX_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_mouse.c mpfc-2.0/libmpfcwnd/wnd_mouse.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_mouse.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_mouse.c	2015-02-24 17:44:10.156489909 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include "types.h"
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_mouse.h mpfc-2.0/libmpfcwnd/wnd_mouse.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_mouse.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_mouse.h	2015-02-24 17:44:10.284488029 +0300
+@@ -15,8 +15,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __MPFC_WND_MOUSE_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_msg.c mpfc-2.0/libmpfcwnd/wnd_msg.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_msg.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_msg.c	2015-02-24 17:44:10.182489527 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <assert.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_msg.h mpfc-2.0/libmpfcwnd/wnd_msg.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_msg.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_msg.h	2015-02-24 17:44:10.236488734 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_MSG_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_multiview_dialog.c mpfc-2.0/libmpfcwnd/wnd_multiview_dialog.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_multiview_dialog.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_multiview_dialog.c	2015-02-24 17:44:10.174489645 +0300
+@@ -17,8 +17,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_multiview_dialog.h mpfc-2.0/libmpfcwnd/wnd_multiview_dialog.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_multiview_dialog.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_multiview_dialog.h	2015-02-24 17:44:10.373486722 +0300
+@@ -17,8 +17,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_MULTIVIEW_DIALOG_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_print.c mpfc-2.0/libmpfcwnd/wnd_print.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_print.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_print.c	2015-02-24 17:44:10.254488470 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <assert.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_print.h mpfc-2.0/libmpfcwnd/wnd_print.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_print.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_print.h	2015-02-24 17:44:10.232488793 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_PRINT_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_radio.c mpfc-2.0/libmpfcwnd/wnd_radio.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_radio.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_radio.c	2015-02-24 17:44:10.346487118 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_radio.h mpfc-2.0/libmpfcwnd/wnd_radio.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_radio.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_radio.h	2015-02-24 17:44:10.326487412 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_RADIO_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_repval.c mpfc-2.0/libmpfcwnd/wnd_repval.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_repval.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_repval.c	2015-02-24 17:44:10.333487309 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include "types.h"
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_repval.h mpfc-2.0/libmpfcwnd/wnd_repval.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_repval.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_repval.h	2015-02-24 17:44:10.166489762 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_REPVAL_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_root.c mpfc-2.0/libmpfcwnd/wnd_root.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_root.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_root.c	2015-02-24 17:44:10.349487074 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <string.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_root.h mpfc-2.0/libmpfcwnd/wnd_root.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_root.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_root.h	2015-02-24 17:44:10.245488602 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_ROOT_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_scrollable.c mpfc-2.0/libmpfcwnd/wnd_scrollable.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_scrollable.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_scrollable.c	2015-02-24 17:44:10.353487015 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_scrollable.h mpfc-2.0/libmpfcwnd/wnd_scrollable.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_scrollable.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_scrollable.h	2015-02-24 17:44:10.164489792 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_SCROLLABLE_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_types.h mpfc-2.0/libmpfcwnd/wnd_types.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_types.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_types.h	2015-02-24 17:44:10.229488837 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_TYPES_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_vbox.c mpfc-2.0/libmpfcwnd/wnd_vbox.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_vbox.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_vbox.c	2015-02-24 17:44:10.139490159 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_vbox.h mpfc-2.0/libmpfcwnd/wnd_vbox.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_vbox.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_vbox.h	2015-02-24 17:44:10.141490130 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_VBOX_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_views.c mpfc-2.0/libmpfcwnd/wnd_views.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_views.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_views.c	2015-02-24 17:44:10.143490100 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_views.h mpfc-2.0/libmpfcwnd/wnd_views.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd_views.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_views.h	2015-02-24 17:44:10.319487515 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_VIEWS_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/m4/pkg.m4 mpfc-2.0/m4/pkg.m4
+--- mpfc-2.0.orig/m4/pkg.m4	2013-01-27 06:33:52.000000000 +0300
++++ mpfc-2.0/m4/pkg.m4	2015-02-24 17:44:10.136490203 +0300
+@@ -15,7 +15,7 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301 USA
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/plugins/plist/audiocd/audiocd.c mpfc-2.0/plugins/plist/audiocd/audiocd.c
+--- mpfc-2.0.orig/plugins/plist/audiocd/audiocd.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/plugins/plist/audiocd/audiocd.c	2015-02-24 17:44:10.132490262 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <ctype.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/plugins/plist/cue/cue.c mpfc-2.0/plugins/plist/cue/cue.c
+--- mpfc-2.0.orig/plugins/plist/cue/cue.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/plugins/plist/cue/cue.c	2015-02-24 17:44:10.125490364 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ //#include "config.h"
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/plugins/plist/m3u/m3u.c mpfc-2.0/plugins/plist/m3u/m3u.c
+--- mpfc-2.0.orig/plugins/plist/m3u/m3u.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/plugins/plist/m3u/m3u.c	2015-02-24 17:44:10.122490409 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <ctype.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/plugins/plist/pls/pls.c mpfc-2.0/plugins/plist/pls/pls.c
+--- mpfc-2.0.orig/plugins/plist/pls/pls.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/plugins/plist/pls/pls.c	2015-02-24 17:44:10.129490306 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdio.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/browser.c mpfc-2.0/src/browser.c
+--- mpfc-2.0.orig/src/browser.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/browser.c	2015-02-24 17:44:10.409486193 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/browser.h mpfc-2.0/src/browser.h
+--- mpfc-2.0.orig/src/browser.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/browser.h	2015-02-24 17:44:10.425485957 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_BROWSER_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/cfg.h mpfc-2.0/src/cfg.h
+--- mpfc-2.0.orig/src/cfg.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/cfg.h	2015-02-24 17:44:10.539484283 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_CFG_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/command.h mpfc-2.0/src/command.h
+--- mpfc-2.0.orig/src/command.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/command.h	2015-02-24 17:44:10.389486486 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_COMMAND_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/file_utils.c mpfc-2.0/src/file_utils.c
+--- mpfc-2.0.orig/src/file_utils.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/file_utils.c	2015-02-24 17:44:10.545484194 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <sys/types.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/file_utils.h mpfc-2.0/src/file_utils.h
+--- mpfc-2.0.orig/src/file_utils.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/file_utils.h	2015-02-24 17:44:10.383486574 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_FILE_UTILS_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/genp.h mpfc-2.0/src/genp.h
+--- mpfc-2.0.orig/src/genp.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/genp.h	2015-02-24 17:44:10.485485076 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_GENP_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/help_screen.c mpfc-2.0/src/help_screen.c
+--- mpfc-2.0.orig/src/help_screen.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/help_screen.c	2015-02-24 17:44:10.387486516 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/help_screen.h mpfc-2.0/src/help_screen.h
+--- mpfc-2.0.orig/src/help_screen.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/help_screen.h	2015-02-24 17:44:10.381486604 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_HELP_SCREEN_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/history.c mpfc-2.0/src/history.c
+--- mpfc-2.0.orig/src/history.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/history.c	2015-02-24 17:44:10.557484018 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/history.h mpfc-2.0/src/history.h
+--- mpfc-2.0.orig/src/history.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/history.h	2015-02-24 17:44:10.484485091 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_HISTORY_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/info_rw_thread.c mpfc-2.0/src/info_rw_thread.c
+--- mpfc-2.0.orig/src/info_rw_thread.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/info_rw_thread.c	2015-02-24 17:44:10.504484796 +0300
+@@ -17,8 +17,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <pthread.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/info_rw_thread.h mpfc-2.0/src/info_rw_thread.h
+--- mpfc-2.0.orig/src/info_rw_thread.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/info_rw_thread.h	2015-02-24 17:44:10.546484180 +0300
+@@ -17,8 +17,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_INFO_RW_THREAD_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/json_helpers.c mpfc-2.0/src/json_helpers.c
+--- mpfc-2.0.orig/src/json_helpers.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/json_helpers.c	2015-02-24 17:44:10.436485796 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include "json_helpers.h"
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/json_helpers.h mpfc-2.0/src/json_helpers.h
+--- mpfc-2.0.orig/src/json_helpers.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/json_helpers.h	2015-02-24 17:44:10.380486618 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_JSON_HELPERS_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/logger.h mpfc-2.0/src/logger.h
+--- mpfc-2.0.orig/src/logger.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/logger.h	2015-02-24 17:44:10.548484150 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_LOGGER_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/logger_view.c mpfc-2.0/src/logger_view.c
+--- mpfc-2.0.orig/src/logger_view.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/logger_view.c	2015-02-24 17:44:10.543484224 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/logger_view.h mpfc-2.0/src/logger_view.h
+--- mpfc-2.0.orig/src/logger_view.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/logger_view.h	2015-02-24 17:44:10.496484915 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_LOGGER_VIEW_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/main.c mpfc-2.0/src/main.c
+--- mpfc-2.0.orig/src/main.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/main.c	2015-02-24 17:44:10.416486089 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdio.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/main_types.h mpfc-2.0/src/main_types.h
+--- mpfc-2.0.orig/src/main_types.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/main_types.h	2015-02-24 17:44:10.552484092 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_MAIN_TYPES_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/metadata_io.c mpfc-2.0/src/metadata_io.c
+--- mpfc-2.0.orig/src/metadata_io.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/metadata_io.c	2015-02-24 17:44:10.420486031 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdio.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/metadata_io.h mpfc-2.0/src/metadata_io.h
+--- mpfc-2.0.orig/src/metadata_io.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/metadata_io.h	2015-02-24 17:44:10.431485869 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_METADATA_IO_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/mystring.h mpfc-2.0/src/mystring.h
+--- mpfc-2.0.orig/src/mystring.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/mystring.h	2015-02-24 17:44:10.517484606 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_MYSTRING_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/player.c mpfc-2.0/src/player.c
+--- mpfc-2.0.orig/src/player.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/player.c	2015-02-24 17:44:10.482485120 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <getopt.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/player.h mpfc-2.0/src/player.h
+--- mpfc-2.0.orig/src/player.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/player.h	2015-02-24 17:44:10.515484635 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_PLAYER_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/plist.c mpfc-2.0/src/plist.c
+--- mpfc-2.0.orig/src/plist.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/plist.c	2015-02-24 17:44:10.536484326 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <ctype.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/plist.h mpfc-2.0/src/plist.h
+--- mpfc-2.0.orig/src/plist.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/plist.h	2015-02-24 17:44:10.555484047 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_PLIST_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/plp.h mpfc-2.0/src/plp.h
+--- mpfc-2.0.orig/src/plp.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/plp.h	2015-02-24 17:44:10.506484768 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_PLP_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/plugin.h mpfc-2.0/src/plugin.h
+--- mpfc-2.0.orig/src/plugin.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/plugin.h	2015-02-24 17:44:10.396486384 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_PLUGIN_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/pmng.h mpfc-2.0/src/pmng.h
+--- mpfc-2.0.orig/src/pmng.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/pmng.h	2015-02-24 17:44:10.439485752 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_PMNG_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/rd_with_notify.c mpfc-2.0/src/rd_with_notify.c
+--- mpfc-2.0.orig/src/rd_with_notify.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/rd_with_notify.c	2015-02-24 17:44:10.422486001 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/rd_with_notify.h mpfc-2.0/src/rd_with_notify.h
+--- mpfc-2.0.orig/src/rd_with_notify.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/rd_with_notify.h	2015-02-24 17:44:10.507484753 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_RD_WITH_NOTIFY_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/server.c mpfc-2.0/src/server.c
+--- mpfc-2.0.orig/src/server.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/server.c	2015-02-24 17:44:10.501484841 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <errno.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/server.h mpfc-2.0/src/server.h
+--- mpfc-2.0.orig/src/server.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/server.h	2015-02-24 17:44:10.435485810 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_SERVER_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/server_client.c mpfc-2.0/src/server_client.c
+--- mpfc-2.0.orig/src/server_client.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/server_client.c	2015-02-24 17:44:10.430485884 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <ctype.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/server_client.h mpfc-2.0/src/server_client.h
+--- mpfc-2.0.orig/src/server_client.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/server_client.h	2015-02-24 17:44:10.394486413 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_SERVER_CLIENT_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/song.c mpfc-2.0/src/song.c
+--- mpfc-2.0.orig/src/song.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/song.c	2015-02-24 17:44:10.494484944 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/song.h mpfc-2.0/src/song.h
+--- mpfc-2.0.orig/src/song.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/song.h	2015-02-24 17:44:10.509484723 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_SONG_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/song_info.h mpfc-2.0/src/song_info.h
+--- mpfc-2.0.orig/src/song_info.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/song_info.h	2015-02-24 17:44:10.508484738 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_SONG_INFO_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/test.c mpfc-2.0/src/test.c
+--- mpfc-2.0.orig/src/test.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/test.c	2015-02-24 17:44:10.390486472 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <pthread.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/test.h mpfc-2.0/src/test.h
+--- mpfc-2.0.orig/src/test.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/test.h	2015-02-24 17:44:10.410486178 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_TEST_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/types.h mpfc-2.0/src/types.h
+--- mpfc-2.0.orig/src/types.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/types.h	2015-02-24 17:44:10.379486633 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_TYPES_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/undo.c mpfc-2.0/src/undo.c
+--- mpfc-2.0.orig/src/undo.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/undo.c	2015-02-24 17:44:10.415486104 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/undo.h mpfc-2.0/src/undo.h
+--- mpfc-2.0.orig/src/undo.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/undo.h	2015-02-24 17:44:10.434485825 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_UNDO_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/src/util.h mpfc-2.0/src/util.h
+--- mpfc-2.0.orig/src/util.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/src/util.h	2015-02-24 17:44:10.393486427 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_UTIL_H__

mpfc-2.0-texinfo.patch Added

mpfc-fix_missing_includes.patch Deleted

@@ -1,146 +0,0 @@
---- libmpfcwnd/wnd_repval.c.orig	2011-03-13 21:47:14.000000000 +0100
-+++ libmpfcwnd/wnd_repval.c	2011-03-13 21:47:30.000000000 +0100
-@@ -25,6 +25,7 @@
- #include "wnd_dialog.h"
- #include "wnd_editbox.h"
- #include "wnd_repval.h"
-+#include "wnd_label.h"
- 
- /* Create a repeat value dialog */
- dialog_t *wnd_repval_new( wnd_t *parent, void *on_ok, int dig )
---- libmpfcwnd/wnd_filebox.c.orig	2011-03-13 21:45:32.000000000 +0100
-+++ libmpfcwnd/wnd_filebox.c	2011-03-13 21:46:28.000000000 +0100
-@@ -33,6 +33,9 @@
- #include "wnd_editbox.h"
- #include "wnd_filebox.h"
- #include "wnd_hbox.h"
-+#include "wnd_label.h"
-+
-+extern int mbslen( char *str );
- 
- /* Create a new file box */
- filebox_t *filebox_new( wnd_t *parent, char *id, char *text, char letter,
---- libmpfcwnd/wnd_combobox.c.orig	2011-03-13 21:46:39.000000000 +0100
-+++ libmpfcwnd/wnd_combobox.c	2011-03-13 21:47:06.000000000 +0100
-@@ -28,6 +28,9 @@
- #include "wnd_dlgitem.h"
- #include "wnd_editbox.h"
- #include "wnd_hbox.h"
-+#include "wnd_label.h"
-+
-+extern int mbslen( char *str );
- 
- /* Create a new combo box */
- combo_t *combo_new( wnd_t *parent, char *id, char *text, char letter, 
---- libmpfcwnd/wnd_print.c.orig	2011-03-13 21:44:42.000000000 +0100
-+++ libmpfcwnd/wnd_print.c	2011-03-13 21:44:50.000000000 +0100
-@@ -32,6 +32,7 @@
- #include "types.h"
- #include "wnd.h"
- #include "wnd_print.h"
-+#include "util.h"
- 
- /* Move cursor to a specified position */
- void wnd_move( wnd_t *wnd, wnd_move_style_t style, int x, int y )
---- libmpfcwnd/wnd_mouse.c.orig	2011-03-13 21:45:09.000000000 +0100
-+++ libmpfcwnd/wnd_mouse.c	2011-03-13 21:45:14.000000000 +0100
-@@ -27,6 +27,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include "wnd.h"
-+#include "util.h"
- 
- /* Initialize mouse */
- wnd_mouse_data_t *wnd_mouse_init( wnd_global_data_t *global )
---- libmpfcwnd/wnd.c.orig	2011-03-13 21:43:05.000000000 +0100
-+++ libmpfcwnd/wnd.c	2011-03-13 21:54:48.000000000 +0100
-@@ -29,6 +29,9 @@
- #include "logger.h"
- #include "wnd.h"
- #include "wnd_root.h"
-+#include "util.h"
-+
-+extern int mbslen( char *str );
- 
- /* Initialize window system and create root window */
- wnd_t *wnd_init( cfg_node_t *cfg_list, logger_t *log )
---- src/info_rw_thread.c.orig	2011-03-13 21:50:18.000000000 +0100
-+++ src/info_rw_thread.c	2011-03-13 21:50:35.000000000 +0100
-@@ -27,6 +27,7 @@
- #include "info_rw_thread.h"
- #include "player.h"
- #include "song.h"
-+#include "util.h"
- 
- /* Thread queue */
- irw_queue_t *irw_head, *irw_tail;
---- src/player.c.orig	2011-03-13 21:47:47.000000000 +0100
-+++ src/player.c	2011-03-13 21:58:43.000000000 +0100
-@@ -58,7 +58,15 @@
- #include "wnd_multiview_dialog.h"
- #include "wnd_radio.h"
- #include "wnd_root.h"
-+#include "wnd_repval.h"
- #include "xconvert.h"
-+#include "info_rw_thread.h"
-+#include "outp.h"
-+#include "inp.h"
-+#include "genp.h"
-+extern void outp_set_mixer_type( out_plugin_t *p, plugin_mixer_type_t type );
-+extern dword inp_get_flags( in_plugin_t *p );
-+extern void pmng_hook( pmng_t *pmng, char *hook );
- 
- /*****
-  *
---- src/plist.c.orig	2011-03-13 21:58:13.000000000 +0100
-+++ src/plist.c	2011-03-13 21:58:20.000000000 +0100
-@@ -36,6 +36,7 @@
- #include "util.h"
- #include "undo.h"
- #include "wnd.h"
-+#include "info_rw_thread.h"
- 
- extern void pmng_hook( pmng_t *pmng, char *hook );
- 
---- libmpfc/id3.c.orig	2011-03-13 21:41:08.000000000 +0100
-+++ libmpfc/id3.c	2011-03-13 21:41:21.000000000 +0100
-@@ -26,6 +26,7 @@
- #include <unicode/ucnv.h>
- #include "types.h"
- #include "myid3.h"
-+#include "util.h"
- 
- /* Create a new empty tag */
- id3_tag_t *id3_new( void )
---- libmpfc/logger.c.orig	2011-03-13 21:42:40.000000000 +0100
-+++ libmpfc/logger.c	2011-03-13 21:42:49.000000000 +0100
-@@ -28,6 +28,8 @@
- #include "cfg.h"
- #include "logger.h"
- 
-+int logger_get_level( logger_t *log );
-+
- /* Initialize logger */
- logger_t *logger_new( cfg_node_t *cfg_list, char *file_name )
- {
---- libmpfc/vfs.c.orig	2011-03-13 21:42:13.000000000 +0100
-+++ libmpfc/vfs.c	2011-03-13 21:42:28.000000000 +0100
-@@ -33,6 +33,8 @@
- #include "vfs.h"
- #include "util.h"
- 
-+extern dword inp_get_flags( in_plugin_t *p );
-+
- /* Check if symbol is a special pattern symbol */
- #define VFS_SYM_SPECIAL(ch, space_is_special) \
- 		((ch) == '*' || (ch) == '?' || (ch) == '' || (ch) == '' || \
---- libmpfc/file_http.c.orig	2011-03-13 21:40:51.000000000 +0100
-+++ libmpfc/file_http.c	2011-03-13 21:41:02.000000000 +0100
-@@ -35,6 +35,7 @@
- #include "file.h"
- #include "file_http.h"
- #include "mystring.h"
-+#include "util.h"
- 
- /* Get file data */
- #define FHTTP_GET_DATA(data, file) \

mpfc-fix_missing_std_headers.patch Deleted

mpfc-getaddrinfo.patch Deleted

@@ -1,221 +0,0 @@
---- plugins/input/audiocd/cddb.c.orig	2011-03-13 21:10:31.000000000 +0100
-+++ plugins/input/audiocd/cddb.c	2011-03-13 21:36:20.000000000 +0100
-@@ -39,7 +39,7 @@
- #define CDDB_MAX_LINE_LEN 256
- 
- #define CDDB_BUF_SIZE 65536
--#define CDDB_PORT 8880
-+#define CDDB_PORT "8880"
- 
- /* Data */
- static char **cddb_data = NULL;
-@@ -201,10 +201,11 @@
- {
- 	int sockfd = -1, i;
- 	char bufCDDB_BUF_SIZE;
--	struct hostent *he;
--	struct sockaddr_in their_addr;
- 	char hostMAX_FILE_NAME;
- 	char category80;
-+    struct addrinfo hints;
-+    struct addrinfo *result, *rp;
-+    int s;
- 
- 	if (!cddb_server_found)
- 		return FALSE;
-@@ -213,23 +214,35 @@
- 	cddb_get_host_name(host);
- 
- 	/* Get host address */
-+    memset(&hints, 0, sizeof(struct addrinfo));
-+    hints.ai_family = AF_UNSPEC;
-+    hints.ai_socktype = SOCK_STREAM;
-+    hints.ai_flags = 0;
-+    hints.ai_protocol = 0;
- 	logger_message(acd_log, 1, _("Getting address of %s"), host);
--	he = gethostbyname(host);
--	if (he == NULL)
--		goto close;
--
--	/* Initialize socket and connect */
--	logger_message(acd_log, 1, _("Connecting to %s"), host);
--	sockfd = socket(AF_INET, SOCK_STREAM, 0);
--	if (sockfd < 0)
--		goto close;
--	their_addr.sin_family = AF_INET;
--	their_addr.sin_port = htons(CDDB_PORT);
--	their_addr.sin_addr = *((struct in_addr *)he->h_addr);
--	memset(&(their_addr.sin_zero), 0, 8);
--	if (connect(sockfd, (struct sockaddr *)&their_addr, 
--				sizeof(struct sockaddr)) < 0)
--		goto close;
-+    s = getaddrinfo(host, CDDB_PORT, &hints, &result);
-+    if (s != 0)
-+    {
-+	    logger_error(acd_log, 1, _("Failed to connect to %s: getaddrinfo: %s"), host, gai_strerror(s));
-+        goto close;
-+    }
-+    for (rp = result; rp != NULL; rp = rp->ai_next)
-+    {
-+        sockfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-+        if (sockfd < 0)
-+            continue;
-+	    logger_message(acd_log, 1, _("Connecting to %s"), host);
-+        if (connect(sockfd, rp->ai_addr, rp->ai_addrlen) >= 0)
-+            break;
-+        close(sockfd);
-+    }
-+    if (rp == NULL)
-+    {
-+        freeaddrinfo(result);
-+	    logger_error(acd_log, 1, _("Failed to connect to %s"), host);
-+        goto close;
-+    }
-+    logger_message(acd_log, 1, _("Connected to %s"), host);
- 
- 	/* Communicate with server */
- 	logger_message(acd_log, 1, _("Sending query to server"));
-@@ -548,12 +561,13 @@
- void cddb_submit( char *filename )
- {	
- 	char *email, *category;
--	int sockfd = -1, i;
-+	int sockfd = -1;
- 	char bufCDDB_BUF_SIZE;
--	struct hostent *he;
--	struct sockaddr_in their_addr;
- 	char hostMAX_FILE_NAME;
- 	char *post_str;
-+    struct addrinfo hints;
-+    struct addrinfo *result, *rp;
-+    int s;
- 	
- 	/* Check data */
- 	if (cddb_data == NULL)
-@@ -584,22 +598,29 @@
- 
- 	/* Get host address */
- 	logger_message(acd_log, 1, _("Getting address of %s"), host);
--	he = gethostbyname(host);
--	if (he == NULL)
--		goto close;
--
--	/* Initialize socket and connect */
--	logger_message(acd_log, 1, _("Connecting to %s"), host);
--	sockfd = socket(AF_INET, SOCK_STREAM, 0);
--	if (sockfd < 0)
--		goto close;
--	their_addr.sin_family = AF_INET;
--	their_addr.sin_port = htons(CDDB_PORT);
--	their_addr.sin_addr = *((struct in_addr *)he->h_addr);
--	memset(&(their_addr.sin_zero), 0, 8);
--	if (connect(sockfd, (struct sockaddr *)&their_addr, 
--				sizeof(struct sockaddr)) < 0)
--		goto close;
-+    s = getaddrinfo(host, CDDB_PORT, &hints, &result);
-+    if (s != 0)
-+    {
-+	    logger_error(acd_log, 1, _("Failed to connect to %s: getaddrinfo: %s"), host, gai_strerror(s));
-+        goto close;
-+    }
-+    for (rp = result; rp != NULL; rp = rp->ai_next)
-+    {
-+        sockfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-+        if (sockfd < 0)
-+            continue;
-+	    logger_message(acd_log, 1, _("Connecting to %s"), host);
-+        if (connect(sockfd, rp->ai_addr, rp->ai_addrlen) >= 0)
-+            break;
-+        close(sockfd);
-+    }
-+    if (rp == NULL)
-+    {
-+        freeaddrinfo(result);
-+	    logger_error(acd_log, 1, _("Failed to connect to %s"), host);
-+        goto close;
-+    }
-+    logger_message(acd_log, 1, _("Connected to %s"), host);
- 
- 	/* Communicate with server */
- 	logger_message(acd_log, 1, _("Posting data to server"));
---- libmpfc/file_http.c.orig	2011-03-13 21:21:09.000000000 +0100
-+++ libmpfc/file_http.c	2011-03-13 21:33:29.000000000 +0100
-@@ -43,16 +43,17 @@
- /* Open a file */
- file_t *fhttp_open( file_t *f, char *mode )
- {
--	int i;
- 	file_http_data_t *data;
--	struct hostent *he;
--	struct sockaddr_in their_addr;
- 	char str1024;
- 	char *header = NULL, *ph = NULL;
- 	int n, end, hs, code;
- 	char *name, *host_name, *file_name;
- 	int port;
- 	int read_size;
-+    struct addrinfo hints;
-+    struct addrinfo *result, *rp;
-+    int s;
-+    char portstr16;
- 
- 	/* Allocate memory for additional data */
- 	f->m_data = (void *)malloc(sizeof(*data));
-@@ -76,28 +77,37 @@
- 	{
- 		/* Parse URL */
- 		fhttp_parse_url(name, &host_name, &file_name, &port);
-+        snprintf(portstr, 16, "%d", port);
- 
--		/* Get host address */
-+        /* Get host address */
-+        memset(&hints, 0, sizeof(struct addrinfo));
-+        hints.ai_family = AF_UNSPEC;
-+        hints.ai_socktype = SOCK_STREAM;
-+        hints.ai_flags = 0;
-+        hints.ai_protocol = 0;
- 		logger_message(f->m_log, 1, _("Getting address of host %s"), host_name);
--		he = gethostbyname(host_name);
--		if (he == NULL)
--		{
--			goto close;
--		}
--		logger_message(f->m_log, 1, _("OK"));
--
--		/* Initialize socket and connect */
--		data->m_sock = socket(AF_INET, SOCK_STREAM, 0);
--		if (data->m_sock < 0)
--			goto close;
--		their_addr.sin_family = AF_INET;
--		their_addr.sin_port = htons(port);
--		their_addr.sin_addr = *((struct in_addr *)he->h_addr);
--		memset(&(their_addr.sin_zero), 0, 8);
--		logger_message(f->m_log, 1, _("Connecting to %s"), host_name);
--		if (connect(data->m_sock, (struct sockaddr *)&their_addr, 
--					sizeof(struct sockaddr)) < 0)
--			goto close;
-+        s = getaddrinfo(host_name, portstr, &hints, &result);
-+        if (s != 0)
-+        {
-+            logger_error(f->m_log, 1, _("Failed to connect to %s: getaddrinfo: %s"), host_name, gai_strerror(s));
-+            goto close;
-+        }
-+        for (rp = result; rp != NULL; rp = rp->ai_next)
-+        {
-+            data->m_sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-+            if (data->m_sock < 0)
-+                continue;
-+            logger_message(f->m_log, 1, _("Connecting to %s"), host_name);
-+            if (connect(data->m_sock, rp->ai_addr, rp->ai_addrlen) >= 0)
-+                break;
-+            close(data->m_sock);
-+        }
-+        if (rp == NULL)
-+        {
-+            freeaddrinfo(result);
-+            logger_error(f->m_log, 1, _("Failed to connect to %s"), host_name);
-+            goto close;
-+        }
- 		logger_message(f->m_log, 1, _("OK"));
- 
- 		/* Send request for file we need */

mpfc-1.3.8.1.tar.bz2/ChangeLog Deleted

@@ -1,1177 +0,0 @@
-2011-03-13 12:16  sg2
-
-	* libmpfc/id3.c, plugins/input/audiocd/cddb.c,
-	  plugins/input/cue/cue_sheet.c,
-	  plugins/output/disk_writer/writer.c, plugins/output/oss/oss.c,
-	  src/eqwnd.c, src/player.c: warn_unused_result warnings fixed.
-
-2011-03-13 11:58  sg2
-
-	* AUTHORS, libmpfc/Makefile.am, libmpfc/file.c, libmpfc/id3.c,
-	  libmpfc/plugin_input.c, libmpfc/util.c, libmpfc/vfs.c,
-	  libmpfcwnd/Makefile.am, libmpfcwnd/wnd_checkbox.c,
-	  libmpfcwnd/wnd_def_handlers.c, libmpfcwnd/wnd_editbox.c,
-	  libmpfcwnd/wnd_label.c, libmpfcwnd/wnd_listbox.c,
-	  libmpfcwnd/wnd_radio.c, libmpfcwnd/wnd_root.c, mpfc.pc.in,
-	  plugins/input/audiocd/Makefile.am,
-	  plugins/input/audiocd/audiocd.c, plugins/input/cue/Makefile.am,
-	  plugins/input/cue/cue.c, plugins/input/flac/Makefile.am,
-	  plugins/input/mp3/Makefile.am, plugins/input/ogg/Makefile.am,
-	  plugins/input/ogg/ogg.c, plugins/input/wav/Makefile.am,
-	  plugins/output/alsa/Makefile.am,
-	  plugins/output/disk_writer/Makefile.am,
-	  plugins/output/disk_writer/writer.c,
-	  plugins/output/oss/Makefile.am, plugins/output/oss/oss.c,
-	  src/browser.c, src/player.c, src/plist.c: Some patches by Pascal
-	  Bleser to fix build process and a possible buffer oveflow in m3u
-	  parsing.
-
-2011-03-12 21:46  sg2
-
-	* Makefile.am: Added m4 to dist.
-
-2011-03-12 19:47  sg2
-
-	* Makefile.am: EXTRA_DIST fix.
-
-2011-03-12 19:37  sg2
-
-	* ChangeLog: ChangeLog updated.
-
-2011-03-12 19:35  sg2
-
-	* configure.ac: Version update.
-
-2011-03-12 19:18  sg2
-
-	* .: MPFC 1.3.8 release.
-
-2011-01-04 19:29  sg2
-
-	* Fixed a crash occuring when --title-format is specified at
-	  startup.
-
-2011-01-04 19:18  sg2
-
-	* disk writer plugin: introduce the name-as-title cfg option to let
-	  the output file be named as the song title.
-
-2011-01-04 19:12  sg2
-
-	* cue plugin: set correct track number in the song info.
-
-2011-01-04 19:11  sg2
-
-	* Introduce the cur-song-title cfg variable.
-
-2010-09-22 12:03  sg2
-
-	* Linking problems fix.
-
-2010-09-21 16:01  sg2
-
-	* Added an option plugins.output.alsa.mixer-card-name to select
-	  mixer card (e.g. "hw:1").
-
-2010-06-23 17:35  sg2
-
-	* Increase wait interval (a temporary solution).
-
-2010-03-07 22:10  sg2
-
-	* Fixed some compiler warnings.
-
-2010-03-07 22:01  sg2
-
-	* cue plugin added to the default distribution.
-
-2010-03-07 21:56  sg2
-
-	* FLAC plugin added to the default distribution.
-
-2010-03-06 23:40  sg2
-
-	* Compilation fix.
-
-2010-01-05 20:36  sg2
-
-	* Fixed a problem with audio parameters printing (bug #2827602).
-
-2009-08-09 16:52  sg2
-
-	* Change ALSA buffer parameter (as in libao).
-
-2009-08-08 18:41  sg2
-
-	* Skip ID3 tags when decoding mp3.
-
-2009-08-08 17:24  sg2
-
-	* Debug logging removed.
-
-2009-08-08 14:23  sg2
-
-	* Unicode ID3 tags support.
-
-2009-08-08 12:48  sg2
-
-	* Installation fixed.
-
-2009-08-08 12:33  sg2
-
-	* 1. Use ICU library.
-	  2. Fixed a problem with composing unicode characters.
-
-2009-04-29 07:42  sg2
-
-	* Don't flush output if stopping was initiated by user.
-
-2008-11-23 12:50  sg2
-
-	* Line graphics fixed.
-
-2008-11-08 21:46  sg2
-
-	* Add mutex around resizeterm call (otherwise it usually crashes
-	  :).
-
-2008-09-10 23:29  sg2
-
-	* Fixed warnings.
-
-2008-02-14 21:19  sg2
-
-	* Set mixer type at start.
-
-2008-02-08 22:12  sg2
-
-	* Songs queueing implemented (a patch by Derek Davis).
-
-2007-09-21 20:45  sg2
-
-	* Switched to a newer gettext version.
-
-2007-09-21 19:42  sg2
-
-	* Added an option to disable traversing hidden files.
-
-2007-09-21 19:41  sg2
-
-	* Partial unicode support.
-
-2006-06-06 10:08  sg2
-
-	* Fixed compilation warnings.
-
-2006-06-06 10:00  sg2
-
-	* Audio CD digital playback mode implemented.
-
-2006-06-06 09:51  sg2
-
-	* Fixed some problems.
-
-2006-06-05 22:18  sg2
-
-	* Removed static/shared stuff.
-
-2006-02-14 13:06  sg2
-
-	* MPFC 1.3.7 release.
-
-2006-02-14 13:02  sg2
-
-	* Fixed 'seek backwards' bug.
-
-2006-02-04 10:34  sg2
-
-	* MPFC 1.3.7 RC2.
-
-2006-02-04 09:21  sg2
-
-	* 'plist-del', 'set-volume', 'set-balance', 'set-volume-full',
-	  'seek' and 'cfg' player commands implemented.
-
-2006-02-02 00:49  sg2
-
-	* 1. Hooks implemented.
-	  2. Moved commands module to libmpfc.
-	  3. Made play list and player context available for plugins.
-
-2006-01-08 12:31  sg2
-
-	* MPFC 1.3.7 RC1 release.
-
-2006-01-08 11:40  sg2
-
-	* 'action' player command added.
-
-2006-01-07 18:20  sg2
-
-	* Resampling of audio stream which doesn't fit into output plugin
-	  capabilities implemented.
-
-2006-01-07 18:19  sg2
-
-	* Fixed troubles with amd64.
-
-2006-01-06 17:23  sg2
-
-	* Improved compatibility with cue plugin (now it can be used
-	  without 'cue://' specification).
-
-2006-01-05 23:36  sg2
-
-	* 1. Song redirection implemented.
-	  2. Song projection implemented.
-	  3. Input plugin 'inp_is_our_file' function added.
-
-2006-01-02 01:13  sg2
-
-	* Fixed logger bug (long messages have been displayed incorrectly.)
-
-2005-12-02 20:50  sg2
-
-	* Fixed amd64 bug.
-
-2005-09-12 07:11  sg2
-
-	* MPFC 1.3.6 release.
-
-2005-09-10 19:51  sg2
-
-	* Improved AudioCD plugin.
-
-2005-09-09 22:40  sg2
-
-	* 'goback' after cursor positioning with mouse and 'view follows
-	  song' support implemented.
-
-2005-09-09 22:12  sg2
-
-	* 1. Audiocd plugin tracks skipping bug is fixed.
-	  2. Extended plugins interface to allow input plugins tell output
-	  ones what kind of mixer they want to use.
-
-2005-09-04 18:41  sg2
-
-	* ALSA mixer proper element choosing patch by Heikki Orsila.
-
-2005-08-28 20:33  sg2
-
-	* ALSA recover from broken pipe done.
-
-2005-08-27 23:22  sg2
-
-	* Made configure script printing enabled/disabled plugins summary.
-
-2005-08-27 22:49  sg2
-
-	* 1. Made 'search-nocase' 1 by default
-	  2. Added 'view-follows-cur-song' option
-	  3. Added 'time_long_fw' and 'time_long_bw' actions
-	  4. Added list of configuration options in the documentation
-
-2005-08-25 21:39  sg2
-
-	* ID3 frames size bug fixed.
-
-2005-08-21 22:38  sg2
-
-	* ALSA plugin improved.
-
-2005-03-28 09:29  sg2
-
-	* Optimized mp3 header reading by skipping ID3 tag immediately
-	  (really speeds
-	  up get_info on songs with lengthy ID3 tags).
-
-2005-02-22 23:34  sg2
-
-	* Player command message implemented.
-
-2005-02-21 18:36  sg2
-
-	* Changed source head format.
-
-2005-02-21 16:44  sg2
-
-	* Fix after previous commit.
-
-2005-02-21 16:38  sg2
-
-	* Removed non-essential plugins.
-
-2005-02-21 16:07  sg2
-
-	* Removed legacy subdirectories.
-
-2005-02-21 15:59  sg2
-
-	* Addition to the previous commit.
-
-2005-02-21 14:47  sg2
-
-	* General plugins support implemented.
-
-2005-02-14 20:58  sg2
-
-	* Fixed bug: current output plugin was not selected in plugins
-	  manager.
-
-2005-02-14 20:43  sg2
-
-	* Disk writer encoding capability implemented.
-
-2005-02-14 16:55  sg2
-
-	* Fixed bug: play is paused, we change output plugin and start
-	  playing (caused
-	  hang up because outp_resume applied to the new output plugin)
-
-2004-11-10 13:55  sg2
-
-	* MPFC 1.3.5 release.
-
-2004-11-08 15:10  sg2
-
-	* Info read/write thread implemented.
-	  Made 'inp_save_info' function return the success code.
-
-2004-11-08 15:10  sg2
-
-	* Info read/write thread implemented.
-
-2004-11-03 23:43  sg2
-
-	* Screen messing up bug fixed.
-
-2004-11-03 16:17  sg2
-
-	* Moved ALSA plugin error output to the logger.
-
-2004-11-01 15:17  sg2
-
-	* Multiview dialog and list box support implemented.
-	  Plugins manager and configuration written.
-
-2004-10-25 14:07  sg2
-
-	* ChangeLog and NEWS updated.
-
-2004-10-25 12:37  sg2
-
-	* Releasing 1.3.4.
-
-2004-10-24 10:04  sg2
-
-	* Backspace bug fixed.
-
-2004-10-24 08:58  sg2
-
-	* implemeted pkg-config stuff for writing plugins.
-
-2004-10-21 13:00  sg2
-
-	* Fixed many bugs.
-
-2004-10-17 10:12  sg2
-
-	* Fixed aterm backspace bug.
-
-2004-10-17 10:00  sg2
-
-	* *** empty log message ***
-
-2004-10-17 10:00  sg2
-
-	* force-terminal-bg option added
-
-2004-10-15 20:43  sg2
-
-	* Mouse initialization bug fixed.
-
-2004-10-15 20:33  sg2
-
-	* *** empty log message ***
-
-2004-10-14 08:07  sg2
-
-	* Implemeted "+=" and "-=" from command line.
-
-2004-10-14 07:34  sg2
-
-	* Documentation updated.
-
-2004-10-11 07:06  sg2
-
-	* Updated translations.
-
-2004-10-11 06:23  sg2
-
-	* Plugin structure changed.
-
-2004-10-06 22:04  sg2
-
-	* rcfiles load improved.
-
-2004-09-30 08:11  sg2
-
-	* Key bindings implemented.
-
-2004-09-29 08:48  sg2
-
-	* MPFC 1.3.2
-
-2004-09-26 17:09  sg2
-
-	* Log level implemented.
-
-2004-09-26 16:10  sg2
-
-	* System configuration file installation through autoconf and
-	  automake implemented.
-
-2004-09-26 13:40  sg2
-
-	* Implemented signal handlers.
-
-2004-09-26 12:25  sg2
-
-	* Logger improved.
-
-2004-09-24 20:19  sg2
-
-	* Scrolling logger implemented.
-
-2004-09-22 20:12  sg2
-
-	* Logger and logger view implemented.
-
-2004-09-21 04:41  sg2
-
-	* xterm resize bug fixed.
-
-2004-09-20 21:15  sg2
-
-	* Updated documentation.
-
-2004-09-20 17:57  sg2
-
-	* Virtual file system implemented.
-
-2004-09-18 13:50  sg2
-
-	* ALSA volume bug fixed.
-
-2004-09-15 06:50  sg2
-
-	* Rcfile building utility is written.
-
-2004-09-15 06:29  sg2
-
-	* Updated translations.
-
-2004-09-15 06:28  sg2
-
-	* Improved configuration.
-
-2004-09-13 13:10  sg2
-
-	* Improved alsa plugin.
-
-2004-09-13 07:35  sg2
-
-	* Fixed bug in alsa plugin.
-
-2004-09-13 05:11  sg2
-
-	* Some translations updated.
-
-2004-09-12 21:46  sg2
-
-	* Added items describing window library key bindings into help
-	  screen.
-
-2004-09-12 16:12  sg2
-
-	* 1. Setting default configuration list variables values.
-	  2. Made it possible to set variables while parent lists are not
-	  yet created.
-
-2004-09-11 15:16  sg2
-
-	* 1. Optimized windows visibility information building.
-	  2. Fixed window bar.
-
-2004-09-06 07:25  sg2
-
-	* Edit box history implemented.
-
-2004-08-31 13:23  sg2
-
-	* Improved the window styles configurability.
-
-2004-08-29 16:49  sg2
-
-	* Updated keyboard module.
-
-2004-08-29 01:01  sg2
-
-	* Fast jumping to dialog items implemented.
-
-2004-08-28 16:37  sg2
-
-	* Fixed some bugs with song info production.
-
-2004-08-28 16:06  sg2
-
-	* Written a proper PLS file loading and improved the streaming
-	  capabilities.
-
-2004-08-26 22:05  sg2
-
-	* Implemented info dialog.
-
-2004-08-25 15:47  sg2
-
-	* Some optimization done in window invalidation.
-
-2004-08-25 15:28  sg2
-
-	* Combo box implemented.
-
-2004-08-19 14:07  sg2
-
-	* Implemented full-featured edit box, file box, check box and radio
-	  button;
-	  used them in player dialogs.
-
-2004-08-17 14:37  sg2
-
-	* Vertical and horizontal boxes implemented.
-
-2004-08-16 09:29  sg2
-
-	* Optimized window painting.
-
-2004-08-13 21:46  sg2
-
-	* A simple version of edit box implemented.
-
-2004-08-13 17:48  sg2
-
-	* 'wnd_pos_visible' rewrittern.
-
-2004-08-13 14:41  sg2
-
-	* Changed key representation.
-
-2004-08-13 13:19  sg2
-
-	* Implemented dialog and button window classes.
-
-2004-08-11 14:50  sg2
-
-	* 1. Introduced window classes.
-	  2. Made messages with text identifiers.
-
-2004-08-07 21:47  sg2
-
-	* Merged libmpfcwnd into the base MPFC source and used it instead
-	  of the
-	  old window library.
-
-2004-05-22 17:25  sg2
-
-	* esd output plugin added.
-
-2004-04-29 10:20  sg2
-
-	* Updated documentation.
-
-2004-04-29 10:15  sg2
-
-	* ALSA plugin added.
-
-2004-04-29 09:59  sg2
-
-	* Improved work under xterm.
-
-2004-04-23 19:35  sg2
-
-	* Oops... The same bug.
-
-2004-04-23 19:29  sg2
-
-	* Fixed bug with displaying `loop' label.
-
-2004-03-24 06:36  sg2
-
-	* Added random numbers generator initialization.
-
-2004-03-16 09:57  sg2
-
-	* A bug with file name fixed.
-
-2004-03-11 18:31  sg2
-
-	* Improvements to the file browser (search mode and saving previous
-	  position)
-
-2004-03-11 12:55  sg2
-
-	* Another bug with info management fixed.
-
-2004-03-11 10:29  sg2
-
-	* Another mp3 info saving bug fixed.
-
-2004-03-11 09:22  sg2
-
-	* A bug with saving mp3 info fixed.
-
-2004-03-10 19:25  sg2
-
-	* Bug with not playing streamed audio fixed.
-
-2004-02-29 19:15  sg2
-
-	* Some bugs fixed.
-
-2004-02-28 19:02  sg2
-
-	* Some bugs fixed.
-
-2004-02-21 19:44  sg2
-
-	* Moved to version 1.2-2
-
-2004-02-21 16:25  sg2
-
-	* Bug with saving info in song being played is fixed.
-
-2004-02-12 11:12  sg2
-
-	* Made help screen for browser and equalizer.
-
-2004-02-11 18:59  sg2
-
-	* Printing optimizations done.
-
-2004-02-11 16:42  sg2
-
-	* Sorting on load done.
-
-2004-02-11 08:51  sg2
-
-	* Documentation updated.
-
-2004-02-10 17:44  sg2
-
-	* Updated russification.
-
-2004-02-10 17:30  sg2
-
-	* Made normal stuff with linking against libraries plus some
-	  bugfixes.
-
-2004-02-09 13:06  sg2
-
-	* Recorder input plugin added.
-
-2004-02-09 12:29  sg2
-
-	* Writing support added for AudioCD and radio.
-
-2004-02-08 14:45  sg2
-
-	* Improved browser: implemented song info mode plus some other
-	  features.
-
-2004-02-08 10:03  sg2
-
-	* Some bugs fixed.
-
-2004-02-07 21:06  sg2
-
-	* Strings are allocated by portions now.
-
-2004-02-07 20:54  sg2
-
-	* Fixed bug in variables saving.
-
-2004-02-07 20:48  sg2
-
-	* Length getting function is rewritten.
-
-2004-02-07 15:16  sg2
-
-	* Changed char arrays to pointr where it is possible and
-	  restructured
-	  plugins.
-
-2004-02-02 11:30  sg2
-
-	* 1. Made one shared libmpfc library instead of many static
-	  libraries.
-	  2. Written charset plugins.
-
-2004-01-31 17:00  sg2
-
-	* Proper song length obtaining.
-
-2004-01-31 14:31  sg2
-
-	* Made a plugin management functions.
-
-2004-01-31 12:19  sg2
-
-	* Current audio parameters (bitrate, sample rate and number of
-	  channels)
-	  displaying implemented.
-
-2004-01-17 21:35  sg2
-
-	* TiMidi plugin introduced.
-
-2004-01-14 10:26  sg2
-
-	* A little bug in edit box fixed.
-
-2004-01-07 11:41  sg2
-
-	* Fixed a little bug with songs which info wasn't reloaded after
-	  undoing
-	  their removing.
-
-2004-01-06 21:09  sg2
-
-	* Moved to 1.1.1 version.
-
-2004-01-02 08:47  sg2
-
-	* Removed possibility to exit file browser by escape.
-
-2004-01-01 22:15  sg2
-
-	* File browser tool implemented.
-
-2003-12-31 09:55  sg2
-
-	* Bug with equalizer in mp3 plugin fixed (it didn't apply)
-
-2003-12-31 09:48  sg2
-
-	* Fixed a bug with effects (they were not applied)
-
-2003-12-28 14:44  sg2
-
-	* Some bugs fixed.
-
-2003-12-28 14:10  sg2
-
-	* A bug with info string overflow fixed.
-
-2003-12-21 17:15  sg2
-
-	* Documentation updated.
-
-2003-12-21 17:12  sg2
-
-	* 1. Smooth CD playing.
-	  2. Mouse in xterm enabled.
-
-2003-12-21 12:17  sg2
-
-	* Variable controlling dsp device name added.
-
-2003-12-20 21:33  sg2
-
-	* Added mouse support in equalizer window.
-
-2003-12-18 17:19  sg2
-
-	* Song info writer thread module implemented.
-
-2003-12-18 09:40  sg2
-
-	* Writing track in ID3 enabled.
-
-2003-12-17 19:42  sg2
-
-	* Added track number support in ID3V1 tags.
-
-2003-12-15 19:01  sg2
-
-	* Bugs in ID3 fixed.
-
-2003-11-27 17:33  sg2
-
-	* Updated russification.
-
-2003-11-27 17:30  sg2
-
-	* Updated info page.
-
-2003-11-27 11:59  sg2
-
-	* CDDB submit function implemented.
-
-2003-11-23 17:07  sg2
-
-	* Some features implemented.
-
-2003-11-20 16:25  sg2
-
-	* Mouse support implemented.
-
-2003-11-14 20:11  sg2
-
-	* Fixed some bugs with undoing object removing.
-
-2003-11-14 19:45  sg2
-
-	* Improved objects support.
-
-2003-11-11 12:21  sg2
-
-	* Special input plugin functions support and clear ID3 tags in mp3
-	  plugin
-	  function implemented.
-
-2003-11-09 18:07  sg2
-
-	* Local info reload implemented.
-
-2003-11-09 18:00  sg2
-
-	* Some bugs in ID3 support fixed.
-
-2003-11-09 15:08  sg2
-
-	* Grouped info editing implemented.
-
-2003-11-08 20:19  sg2
-
-	* Own ID3 tags support implemented.
-
-2003-11-01 19:15  sg2
-
-	* Edit box C-u, C-k and C-y operations implemented.
-
-2003-11-01 06:14  sg2
-
-	* A bug with moving selection fixed.
-
-2003-10-31 19:11  sg2
-
-	* 1. Bug with skipping songs fixed.
-	  2. Configuration variables information updated.
-
-2003-10-31 18:59  sg2
-
-	* Some little bugs fixed.
-
-2003-10-22 16:09  sg2
-
-	* Written documentation in Texinfo format.
-
-2003-10-17 14:53  sg2
-
-	* Network support added.
-
-2003-10-05 19:29  sg2
-
-	* Changed '_' in variables names to '-'.
-
-2003-10-02 17:19  sg2
-
-	* General file finder interface written.
-	  Plugins reload implemented.
-
-2003-10-02 15:58  sg2
-
-	* Russification updated.
-
-2003-10-02 09:03  sg2
-
-	* Normal file adder implemented.
-
-2003-09-30 06:36  sg2
-
-	* Time jumping one-level undo implemented.
-
-2003-09-29 16:52  sg2
-
-	* Configuration variables setting handlers support implemented.
-
-2003-09-27 15:15  sg2
-
-	* Advaned search implemented.
-
-2003-09-27 13:05  sg2
-
-	* Play list search with regular expressions support implemented.
-
-2003-09-27 05:50  sg2
-
-	* Play list marks support implemented.
-
-2003-09-27 05:06  sg2
-
-	* Now undo removes currently playing song.
-
-2003-09-26 07:01  sg2
-
-	* 1. Changed bool to bool_t
-	  2. Fixed bugs in adding songs
-
-2003-09-11 14:56  sg2
-
-	* CDDB support implemented.
-
-2003-09-07 17:28  sg2
-
-	* Saving play status and bounds to cfg file on exit.
-
-2003-09-07 17:17  sg2
-
-	* OggVorbis song info saving.
-
-2003-09-06 20:18  sg2
-
-	* Outer commands execution implemented.
-
-2003-09-06 13:13  sg2
-
-	* Play bounds specification support implemented.
-
-2003-09-03 19:19  sg2
-
-	* Showing remaining song time instead of current option
-	  implemented.
-
-2003-09-03 19:06  sg2
-
-	* Manual song title format specification option implemented.
-
-2003-09-03 18:21  sg2
-
-	* Option to convert underscores to spaces in song titles
-	  implemented.
-
-2003-09-03 16:17  sg2
-
-	* Addition to the previous.
-
-2003-09-02 19:24  sg2
-
-	* Audio parameters information is included to song info.
-
-2003-08-30 19:47  sg2
-
-	* Added a feature to start playing from last stop.
-
-2003-08-16 20:47  sg2
-
-	* Balance regulation implemented.
-
-2003-08-15 17:45  sg2
-
-	* Undo support for play list operations implemented.
-
-2003-08-13 13:58  sg2
-
-	* 1. Implemented combo box.
-	  2. Implemented feature to set any genres.
-
-2003-08-12 13:07  sg2
-
-	* Implemented OggVorbis input plugin (without saving info feature).
-
-2003-08-11 17:13  sg2
-
-	* *** empty log message ***
-
-2003-08-11 16:51  sg2
-
-	* Disk writer output plugin implemented.
-
-2003-08-11 13:13  sg2
-
-	* Fixed bugs etc.
-
-2003-08-09 14:00  sg2
-
-	* Advanced variables manager implemented.
-
-2003-08-08 15:03  sg2
-
-	* Correct get song current time function implemented.
-
-2003-08-06 10:35  sg2
-
-	* Edit boxes history implemented.
-
-2003-08-05 12:51  sg2
-
-	* A bug in sorting fixed.
-
-2003-08-05 09:20  sg2
-
-	* Play list parts moving implemented.
-
-2003-08-04 12:50  sg2
-
-	* Added colored UI support.
-
-2003-08-03 08:37  sg2
-
-	* Added feature of setting key bindings through configuration
-	  variables.
-
-2003-08-02 22:10  sg2
-
-	* Key bindings implemented.
-
-2003-08-01 13:23  sg2
-
-	* Some minor changes.
-
-2003-08-01 12:55  sg2
-
-	* Radio plugin implemented.
-
-2003-08-01 10:44  sg2
-
-	* Implemented feature for adding objects from command line.
-
-2003-08-01 09:46  sg2
-
-	* Improved Audio-CD support (pause and seek included).
-
-2003-07-29 13:29  sg2
-
-	* Audio CD Input plugin implemented.
-
-2003-07-27 20:16  sg2
-
-	* A little change.
-
-2003-07-27 19:45  sg2
-
-	* Added support for effect plugins and echo effect plugin
-	  implemented.
-
-2003-07-27 08:30  sg2
-
-	* Simple variables manager implemented.
-
-2003-07-27 08:15  sg2
-
-	* Added feature of saving play list on exit.
-
-2003-07-27 08:08  sg2
-
-	* Added shuffle and loop play modes.
-
-2003-07-26 16:14  sg2
-
-	* Improved equalizer support. Saving parameters and loading presets
-	  implemented.
-
-2003-07-12 18:27  sg2
-
-	* Safe functions for plugins are written.
-
-2003-07-12 16:04  sg2
-
-	* Equalizer support added.
-
-2003-07-06 13:11  sg2
-
-	* Added ID3 v2 support.
-
-2003-07-04 13:26  sg2
-
-	* Some text is written in README.
-
-2003-07-04 13:23  sg2
-
-	* Updated russification.
-
-2003-07-04 12:07  sg2
-
-	* Written manual page for mpfc.
-
-2003-07-04 09:51  sg2
-
-	* Russification updated.
-
-2003-07-03 16:38  sg2
-
-	* Some less reasonable changes made.
-
-2003-07-03 14:48  sg2
-
-	* Some small bugs fixed.
-
-2003-07-03 14:46  sg2
-
-	* Added normal mp3 plugin!
-
-2003-05-09 14:58  sg2
-
-	* Fixed bug when currently playing song index in play list was not
-	  changing
-	  when sorting.
-
-2003-05-03 12:47  sg2
-
-	* 1) Added possibility to enable/disable full file name displaying
-	  in song info
-	  editor.
-	  2) Sorting by file name implemented.
-
-2003-05-03 09:53  sg2
-
-	* Some improvements done.
-
-2003-05-02 19:51  sg2
-
-	* A little fix in song info editor.
-
-2003-05-02 17:02  sg2
-
-	* Fixed some bugs in ID3 tag editor.
-
-2003-05-02 16:30  sg2
-
-	* Fixed bug with updating root window when other windows are
-	  displayed.
-
-2003-04-29 15:45  sg2
-
-	* Added configuration variables handling stuff.
-
-2003-04-28 06:31  sg2
-
-	* Help screen added.
-
-2003-04-27 17:32  sg2
-
-	* Added file info editor.
-
-2003-04-20 16:41  sg2
-
-	* Added codepages conversion.
-
-2003-04-20 08:17  sg2
-
-	* Initial revision
-
-2003-04-20 08:17  
-
-	* New repository initialized by cvs2svn.
-

mpfc-1.3.8.1.tar.bz2/NEWS Deleted

mpfc-1.3.8.1.tar.bz2/build_rcfile.pl Deleted

mpfc-1.3.8.1.tar.bz2/libmpfc/charset.c Deleted

@@ -1,292 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. libcharset functions implementation.
- * $Id: charset.c 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include "types.h"
-#include "charset.h"
-#include "pmng.h"
-
-/* Output string memory portion size */
-#define CS_PORTION_SIZE 64
-
-/* Convert string between charsets */
-char *cs_convert( char *str, char *cs_in, char *cs_out, pmng_t *pmng )
-{
-	cs_info_t in_info, out_info;
-	cs_output_t out_str;
-
-	/* Check input */
-	if (str == NULL || pmng == NULL || cs_in == NULL || cs_out == NULL)
-		return NULL;
-
-	/* Get information about specified charsets */
-	cs_get_info(cs_in, &in_info, pmng);
-	cs_get_info(cs_out, &out_info, pmng);
-
-	/* Check that these charsets are correct */
-	if (in_info.m_id == CS_UNKNOWN || out_info.m_id == CS_UNKNOWN)
-		return NULL;
-
-	/* Expand input charset if it is automatic */
-	if (csp_get_flags(in_info.m_csp, in_info.m_index) & CSP_AUTO)
-	{
-		cs_in = csp_expand_auto(in_info.m_csp, str, in_info.m_index);
-		if (cs_in == NULL)
-			return NULL;
-		cs_get_info(cs_in, &in_info, pmng);
-		if (in_info.m_id == CS_UNKNOWN)
-			return NULL;
-	}
-
-	/* Initialize output string */
-	out_str.m_str = NULL;
-	out_str.m_allocated = out_str.m_len = 0;
-
-	/* Process input string */
-	for ( ;; )
-	{
-		dword ch, unicode;
-		
-		/* Obtain next character */
-		ch = cs_get_next_ch(&str, &in_info);
-
-		/* Convert it between charsets */
-		unicode = cs_to_unicode(ch, &in_info);
-		cs_unicode2str(&out_str, unicode, &out_info);
-		if (!ch)
-			break;
-	}
-	out_str.m_str = (char *)realloc(out_str.m_str, out_str.m_len);
-	return out_str.m_str;
-} /* End of 'cs_convert' function */
-
-/* Get charset info */
-void cs_get_info( char *name, cs_info_t *info, pmng_t *pmng )
-{
-	/* Fill info with start values */
-	info->m_id = CS_UNKNOWN;
-	info->m_csp = NULL;
-	info->m_index = -1;
-	
-	/* Find charset among internal */
-	if (!strcasecmp(name, "UTF-8"))
-	{
-		info->m_id = CS_UTF8;
-		return;
-	}
-	/* Find charset in plugins */
-	else
-	{
-		info->m_csp = pmng_find_charset(pmng, name, &info->m_index);
-		if (info->m_csp != NULL)
-			info->m_id = CS_1_BYTE;
-	}
-} /* End of 'cs_get_info' function */
-
-/* Get next character from string */
-dword cs_get_next_ch( char **str, cs_info_t *info )
-{
-	/* In one-byte charset move 1 byte further */
-	if (info->m_id == CS_1_BYTE)
-	{
-		char ch = **str;
-		(*str) ++;
-		return (dword)ch;
-	}
-	/* UTF-8 */
-	else if (info->m_id == CS_UTF8)
-	{
-		byte first = (byte)(**str);
-		int bytes = cs_utf8_get_num_bytes(first), bits;
-		dword ch;
-		int shift = 6 * (bytes - 1);
-
-		/* Check errors */
-		if (bytes < 0)
-			return 0;
-
-		/* Get lower bits of first bytes (containing data) */
-		bits = (bytes == 1) ? bytes : bytes + 1;
-		ch = ((byte)first & (0xFF >> bits)) << shift;
-		shift -= (8 - bits);
-		(*str) ++;
-		while (shift > 0)
-		{
-			ch |= (((byte)(**str) & 0x3F));
-			shift -= 6;
-			(*str) ++;
-		}
-		return ch;
-	}
-	return 0;
-} /* End of 'cs_get_next_ch' function */
-
-/* Convert character code to unicode */
-dword cs_to_unicode( dword ch, cs_info_t *info )
-{
-	if (info->m_id == CS_UNKNOWN)
-		return 0;
-	else if (info->m_id != CS_1_BYTE)
-		return ch;
-	else
-	{
-		/* Get from plugin */
-		return csp_get_code(info->m_csp, ch, info->m_index);
-	}
-	return 0;
-} /* End of 'cs_to_unicode' function */
-
-/* Convert unicode to character code */
-dword cs_from_unicode( dword unicode, cs_info_t *info )
-{
-	if (unicode < 128)
-		return unicode;
-	 
-	if (info->m_id == CS_UNKNOWN)
-		return 0;
-	else if (info->m_id != CS_1_BYTE)
-		return unicode;
-	else
-	{
-		int ch;
-
-		/* Find character with specified code */
-		for ( ch = 128; ch < 256; ch ++ )
-		{
-			if (csp_get_code(info->m_csp, ch, info->m_index) == unicode)
-				return ch;
-		}
-	}
-	return ' ';
-} /* End of 'cs_from_unicode' function */
-
-/* Add a unicode character to output string */
-void cs_unicode2str( cs_output_t *str, dword unicode, cs_info_t *info )
-{
-	dword ch;
-	
-	if (str == NULL || info == NULL)
-		return;
-
-	/* Convert from unicode */
-	ch = cs_from_unicode(unicode, info);
-
-	/* Case of 1-byte charset */
-	if (info->m_id == CS_1_BYTE)
-	{
-		cs_append2out(str, (char)ch);
-	}
-	/* UTF-8 */
-	else if (info->m_id == CS_UTF8)
-	{
-		int bytes, bits = 32;
-		dword code = unicode;
-
-		/* Get number of significant bits */
-		while (!(code & 0x80000000) && (bits > 0))
-		{
-			bits --;
-			code <<= 1;
-		}
-		if (bits <= 7)
-		{
-			cs_append2out(str, (char)unicode);
-		}
-		else
-		{
-			byte utf_code6;
-			int first_byte = 5;
-			
-			/* Convert to UTF bytes */
-			code = unicode;
-			for ( ;; )
-			{
-				if (bits > 6)
-				{
-					utf_codefirst_byte = (0x80 | (code & 0x3F));
-					bits -= 6;
-					first_byte --;
-					code >>= 6;
-				}
-				else
-				{
-					utf_codefirst_byte = ((0xFF << (bits + 1)) | code);
-					break;
-				}
-			}
-
-			/* Write to output */
-			for ( ; first_byte < 6; first_byte ++ )
-				cs_append2out(str, (char)(utf_codefirst_byte));
-		}
-	}
-} /* End of 'cs_unicode2str' function */
-
-/* Reallocate memory for output string */
-void cs_reallocate( cs_output_t *str, int new_len )
-{
-	int new_allocated;
-	
-	if (str == NULL)
-		return;
-
-	new_allocated = new_len;
-	while (new_allocated % CS_PORTION_SIZE)
-		new_allocated ++;
-	str->m_str = (char *)realloc(str->m_str, new_allocated);
-} /* End of 'cs_reallocate' function */
-
-/* Append character to output string */
-void cs_append2out( cs_output_t *str, char ch )
-{
-	if (str == NULL)
-		return;
-
-	cs_reallocate(str, str->m_len + 1);
-	str->m_strstr->m_len ++ = ch;
-} /* End of 'cs_append2out' function */
-
-/* Get number of bytes occupied by symbol in UTF-8 charset (looking
- * at its first byte) */
-int cs_utf8_get_num_bytes( byte first )
-{
-	if (!(first & 0x80))
-		return 1;
-	else if (!(first & 0x40))
-		return 0;
-	else if (!(first & 0x20))
-		return 2;
-	else if (!(first & 0x10))
-		return 3;
-	else if (!(first & 0x08))
-		return 4;
-	else if (!(first & 0x04))
-		return 5;
-	else if (!(first & 0x02))
-		return 6;
-	else
-		return 0;
-} /* End of 'cs_utf8_get_num_bytes' function */
-
-/* End of 'charset.c' file */
-

mpfc-1.3.8.1.tar.bz2/libmpfc/file.c Deleted

@@ -1,252 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. File library functions implementation.
- * $Id: file.c 307 2011-03-13 11:58:47Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include "types.h"
-#include "file_http.h"
-#include "file_reg.h"
-
-/* Open a file */
-file_t *file_open( char *filename, char *mode, logger_t *log )
-{
-	file_t *f;
-	
-	/* Allocate memory for file object */
-	f = (file_t *)malloc(sizeof(file_t));
-	if (f == NULL)
-		return NULL;
-
-	/* Save parameters */
-	f->m_name = strdup(filename);
-	f->m_log = log;
-	f->m_data = NULL;
-	
-	/* Get file type from its name and call respective open function */
-	f->m_type = file_get_type(filename);
-	switch (f->m_type)
-	{
-	case FILE_TYPE_REGULAR:
-		return freg_open(f, mode);
-	case FILE_TYPE_HTTP:
-		return fhttp_open(f, mode);
-	}
-	file_close(f);
-	return NULL;
-} /* End of 'file_open' function */
-
-/* Close file */
-int file_close( file_t *f )
-{
-	int ret = 0;
-	
-	if (f != NULL)
-	{
-		switch (f->m_type)
-		{
-		case FILE_TYPE_REGULAR:
-			ret = freg_close(f);
-			break;
-		case FILE_TYPE_HTTP:
-			ret = fhttp_close(f);
-			break;
-		default:
-			ret = 0;
-		}
-			
-		if (f->m_name != NULL)
-			free(f->m_name);
-		free(f);
-	}
-	return ret;
-} /* End of 'file_close' function */
-
-/* Read from file */
-size_t file_read( void *buf, size_t size, size_t nmemb, file_t *f )
-{
-	if (f == NULL)
-		return 0;
-
-	switch (f->m_type)
-	{
-	case FILE_TYPE_REGULAR:
-		return freg_read(buf, size, nmemb, f);
-	case FILE_TYPE_HTTP:
-		return fhttp_read(buf, size, nmemb, f);
-	}
-	return 0;
-} /* End of 'file_read' function */
-
-/* Write to file */
-size_t file_write( void *buf, size_t size, size_t nmemb, file_t *f )
-{
-	if (f == NULL)
-		return 0;
-
-	switch (f->m_type)
-	{
-	case FILE_TYPE_REGULAR:
-		return freg_write(buf, size, nmemb, f);
-	case FILE_TYPE_HTTP:
-		return fhttp_write(buf, size, nmemb, f);
-	}
-	return 0;
-} /* End of 'file_write' function */
-
-/* Seek file */
-int file_seek( file_t *f, long offset, int whence )
-{
-	if (f == NULL)
-		return 0;
-
-	switch (f->m_type)
-	{
-	case FILE_TYPE_REGULAR:
-		return freg_seek(f, offset, whence);
-	case FILE_TYPE_HTTP:
-		return fhttp_seek(f, offset, whence);
-	}
-	return 0;
-} /* End of 'file_seek' function */
-
-/* Tell file position */
-long file_tell( file_t *f )
-{
-	if (f == NULL)
-		return 0;
-
-	switch (f->m_type)
-	{
-	case FILE_TYPE_REGULAR:
-		return freg_tell(f);
-	case FILE_TYPE_HTTP:
-		return fhttp_tell(f);
-	}
-	return 0;
-} /* End of 'file_tell' function */
-
-/* Get file type */
-byte file_get_type( char *name )
-{
-	if (!strncmp(name, "http://", 7))
-		return FILE_TYPE_HTTP;
-	return FILE_TYPE_REGULAR;
-} /* End of 'file_get_type' function */
-
-/* Set minimal buffer size */
-void file_set_min_buf_size( file_t *f, int size )
-{
-	if (f == NULL)
-		return;
-	
-	switch (f->m_type)
-	{
-	case FILE_TYPE_REGULAR:
-		break;
-	case FILE_TYPE_HTTP:
-		fhttp_set_min_buf_size(f, size);
-		break;
-	}
-} /* End of 'file_set_min_buf_size' function */
-
-/* Get content type */
-char *file_get_content_type( file_t *f )
-{
-	if (f == NULL)
-		return NULL;
-	
-	switch (f->m_type)
-	{
-	case FILE_TYPE_REGULAR:
-		return NULL;
-	case FILE_TYPE_HTTP:
-		return fhttp_get_content_type(f);
-	}
-    return NULL;
-} /* End of 'file_get_content_type' function */
-
-/* Write line to file */
-void file_puts( char *s, file_t *f )
-{
-	if (f == NULL)
-		return;
-	
-	switch (f->m_type)
-	{
-	case FILE_TYPE_REGULAR:
-		return freg_puts(s, f);
-	case FILE_TYPE_HTTP:
-		return fhttp_puts(s, f);
-	}
-} /* End of 'file_puts' function */
-
-/* Get line from file */
-char *file_gets( char *s, int size, file_t *f )
-{
-	if (f == NULL)
-		return NULL;
-	
-	switch (f->m_type)
-	{
-	case FILE_TYPE_REGULAR:
-		return freg_gets(s, size, f);
-	case FILE_TYPE_HTTP:
-		return fhttp_gets(s, size, f);
-	}
-	return NULL;
-} /* End of 'file_gets' function */
-
-/* Check for end of file */
-bool_t file_eof( file_t *f )
-{
-	if (f == NULL)
-		return FALSE;
-	
-	switch (f->m_type)
-	{
-	case FILE_TYPE_REGULAR:
-		return freg_eof(f);
-	case FILE_TYPE_HTTP:
-		return fhttp_eof(f);
-	}
-	return FALSE;
-} /* End of 'file_eof' function */
-
-/* Get string from file */
-str_t *file_get_str( file_t *f )
-{
-	if (f == NULL)
-		return NULL;
-	
-	switch (f->m_type)
-	{
-	case FILE_TYPE_REGULAR:
-		return freg_get_str(f);
-	case FILE_TYPE_HTTP:
-		return fhttp_get_str(f);
-	}
-	return NULL;
-} /* End of 'file_get_str' function */
-
-/* End of 'file.c' file */
-

mpfc-1.3.8.1.tar.bz2/libmpfc/file_http.c Deleted

@@ -1,476 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. File library http files managament functions 
- * implementation.
- * $Id: file_http.c 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <stdio.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include <stdlib.h>
-#define __USE_GNU
-#include <string.h>
-#include <unistd.h>
-#include "types.h"
-#include "file.h"
-#include "file_http.h"
-#include "mystring.h"
-
-/* Get file data */
-#define FHTTP_GET_DATA(data, file) \
-	file_http_data_t *(data) = (file_http_data_t *)((file)->m_data)
-
-/* Open a file */
-file_t *fhttp_open( file_t *f, char *mode )
-{
-	int i;
-	file_http_data_t *data;
-	struct hostent *he;
-	struct sockaddr_in their_addr;
-	char str1024;
-	char *header = NULL, *ph = NULL;
-	int n, end, hs, code;
-	char *name, *host_name, *file_name;
-	int port;
-	int read_size;
-
-	/* Allocate memory for additional data */
-	f->m_data = (void *)malloc(sizeof(*data));
-	data = (file_http_data_t *)(f->m_data);
-	memset(data, 0, sizeof(*data));
-	data->m_tid = -1;
-	data->m_sock = -1;
-
-	/* Initialize buffer */
-	data->m_real_size = 1048576;
-	data->m_buf_size = data->m_real_size >> 1;
-	data->m_buf = (byte *)malloc(data->m_real_size);
-	data->m_read_size = 0;
-	data->m_portion_size = 1024;
-	data->m_actual_ptr = data->m_buf;
-	data->m_min_buf_size = 0;
-	data->m_file_pos = 0;
-
-	/* Connect to host and get file header */
-	for ( name = strdup(f->m_name);; ) 
-	{
-		/* Parse URL */
-		fhttp_parse_url(name, &host_name, &file_name, &port);
-
-		/* Get host address */
-		logger_message(f->m_log, 1, _("Getting address of host %s"), host_name);
-		he = gethostbyname(host_name);
-		if (he == NULL)
-		{
-			goto close;
-		}
-		logger_message(f->m_log, 1, _("OK"));
-
-		/* Initialize socket and connect */
-		data->m_sock = socket(AF_INET, SOCK_STREAM, 0);
-		if (data->m_sock < 0)
-			goto close;
-		their_addr.sin_family = AF_INET;
-		their_addr.sin_port = htons(port);
-		their_addr.sin_addr = *((struct in_addr *)he->h_addr);
-		memset(&(their_addr.sin_zero), 0, 8);
-		logger_message(f->m_log, 1, _("Connecting to %s"), host_name);
-		if (connect(data->m_sock, (struct sockaddr *)&their_addr, 
-					sizeof(struct sockaddr)) < 0)
-			goto close;
-		logger_message(f->m_log, 1, _("OK"));
-
-		/* Send request for file we need */
-		logger_message(f->m_log, 1, _("Sending request for file %s"),
-				file_name);
-		snprintf(str, sizeof(str), 
-				"GET /%s HTTP/1.0\r\nHost: %s\r\nUser-Agent: mpfc/1.0"
-				"\r\n\r\n", file_name, host_name);
-		if (send(data->m_sock, str, strlen(str) + 1, 0) < 0)
-			goto close;
-
-		/* Get HTTP header */
-		logger_message(f->m_log, 1, _("Getting HTTP header"));
-		ph = header = (char *)malloc(hs = data->m_portion_size);
-		for ( read_size = 0;; )
-		{
-			/* Receive portion of data and break if header is complete */
-			n = recv(data->m_sock, ph, data->m_portion_size - read_size, 0);
-			read_size += n;
-			ph += n;
-			if (n <= 0 || fhttp_header_complete(header, read_size) >= 0)
-				break;
-
-			/* Reallocate memory */
-			if (read_size >= hs)
-			{
-				hs += data->m_portion_size;
-				header = (char *)realloc(header, hs);
-				ph = header + hs - data->m_portion_size;
-			}
-		}
-
-		/* If last recv received nothing and header is not complete - error */
-		end = fhttp_header_complete(header, read_size);
-		if (n <= 0 && end < 0)
-			goto close;
-		
-		/* Analyze header */
-		code = fhttp_get_return(header, read_size);
-		if (code == 200)
-		{
-			char *str;
-			
-			/* Save some parameters */
-			free(name);
-			data->m_file_name = file_name;
-			data->m_host_name = host_name;
-			str = fhttp_get_field(header, read_size, "Content-Type");
-			if (str != NULL)
-				data->m_content_type = strdup(str);
-			else
-				data->m_content_type = NULL;
-
-			/* Copy rest of data to buffer */
-			data->m_read_size = read_size - end - 1;
-			memcpy(data->m_buf, &headerend + 1, data->m_read_size);
-			free(header);
-			logger_message(f->m_log, 1, _("OK"));
-			break;
-		}
-		else if (code / 100 == 3)
-		{
-			char *str;
-
-			free(name);
-			free(host_name);
-			free(file_name);
-			str = fhttp_get_field(header, hs, "Location");
-			if (str == NULL)
-				name = strdup(str);
-			else
-				name = strdup("");
-			free(header);
-			logger_message(f->m_log, 1, _("Redirect to %s"), name);
-			continue;
-		}
-close:
-		if (header != NULL)
-			free(header);
-		free(name);
-		free(file_name);
-		free(host_name);
-		logger_message(f->m_log, 1, _("Failure"));
-		file_close(f);
-		return NULL;
-	}
-
-	/* Create a mutex for synchronizing buffer operations */
-	pthread_mutex_init(&data->m_mutex, NULL);
-
-	/* Create a thread that will be receive data */
-	data->m_end_thread = FALSE;
-	data->m_finished = FALSE;
-	data->m_eof = FALSE;
-	pthread_create(&data->m_tid, NULL, fhttp_thread, f);
-	return f;
-} /* End of 'fhttp_open' function */
-
-/* Close file */
-int fhttp_close( file_t *f )
-{
-	FHTTP_GET_DATA(data, f);
-
-	if (data != NULL)
-	{
-		if (data->m_tid >= 0)
-		{
-			data->m_end_thread = TRUE;
-			pthread_join(data->m_tid, NULL);
-		}
-		pthread_mutex_destroy(&data->m_mutex);
-		if (data->m_content_type != NULL)
-			free(data->m_content_type);
-		if (data->m_buf != NULL)
-			free(data->m_buf);
-		if (data->m_host_name != NULL)
-			free(data->m_host_name);
-		if (data->m_file_name != NULL)
-			free(data->m_file_name);
-		if (data->m_sock >= 0)
-			close(data->m_sock);
-		free(data);
-	}
-	return 0;
-} /* End of 'fhttp_close' function */
-
-/* Read from file */
-size_t fhttp_read( void *buf, size_t size, size_t nmemb, file_t *f )
-{
-	int s;
-	
-	FHTTP_GET_DATA(data, f);
-
-	/* No data available */
-	size *= nmemb;
-	if (!data->m_min_buf_size)
-	{
-		while (!data->m_read_size && !data->m_finished)
-			usleep(1);
-	}
-	else if (data->m_read_size <= (data->m_min_buf_size >> 2))
-	{
-		int pp;
-		
-		/* Data is over */
-		if (data->m_finished)
-			return 0;
-		
-		/* Wait */
-		pp = data->m_read_size * 100 / data->m_min_buf_size;
-		logger_message(f->m_log, 1, _("Filling buffer: %d%% done"), pp);
-		while (data->m_read_size <= data->m_min_buf_size && !data->m_finished)
-		{
-			int p = data->m_read_size * 100 / data->m_min_buf_size;
-			if ((p / 10) != (pp / 10))
-				logger_message(f->m_log, 1, _("Filling buffer: %d%% done"), p);
-			pp = p;
-			util_wait();
-		}
-	}
-
-	/* Lock mutex */
-	pthread_mutex_lock(&data->m_mutex);
-
-	/* Read data */
-	s = size < data->m_read_size ? size : data->m_read_size;
-	memcpy(buf, data->m_actual_ptr, s);
-	data->m_actual_ptr += s;
-	data->m_read_size -= s;
-	if (data->m_actual_ptr - data->m_buf >= data->m_buf_size)
-	{
-		memmove(data->m_buf, data->m_actual_ptr, data->m_read_size);
-		data->m_actual_ptr = data->m_buf;
-	}
-
-	/* Unlock mutex */
-	pthread_mutex_unlock(&data->m_mutex);
-	data->m_file_pos += s;
-	return s;
-} /* End of 'fhttp_read' function */
-
-/* Write to file */
-size_t fhttp_write( void *buf, size_t size, size_t nmemb, file_t *f )
-{
-	return 0;
-} /* End of 'fhttp_write' function */
-
-/* Seek file */
-int fhttp_seek( file_t *f, long offset, int whence )
-{
-//	fhttp_close(f);
-//	fhttp_open(f, "");
-	return offset;
-} /* End of 'fhttp_seek' function */
-
-/* Tell file position */
-long fhttp_tell( file_t *f )
-{
-	FHTTP_GET_DATA(data, f);
-	return data->m_file_pos;
-} /* End of 'fhttp_tell' function */
-
-/* Thread function */
-void *fhttp_thread( void *arg )
-{
-	file_t *f = (file_t *)arg;
-	FHTTP_GET_DATA(data, f);
-	int n;
-
-	for ( ; !data->m_end_thread; )
-	{
-		/* Lock buffer */
-		pthread_mutex_lock(&data->m_mutex);
-
-		/* Determine amount of data we must read */
-		n = data->m_buf_size - data->m_read_size;
-		if (n > data->m_portion_size)
-			n = data->m_portion_size;
-		if (!n)
-		{
-			pthread_mutex_unlock(&data->m_mutex);
-			usleep(1);
-			continue;
-		}
-
-		/* Read socket */
-		n = recv(data->m_sock, &data->m_actual_ptrdata->m_read_size, n, 0);
-		data->m_read_size += n;
-		pthread_mutex_unlock(&data->m_mutex);
-		if (n <= 0)
-			break;
-	}
-	data->m_tid = -1;
-	data->m_finished = TRUE;
-	return NULL;
-} /* End of 'fhttp_thread' function */
-
-/* Check if HTTP header is complete and return its end offset */
-int fhttp_header_complete( char *header, int size )
-{
-	int i;
-
-	for ( i = 3; i < size; i ++ )
-		if (headeri - 3 == '\r' && headeri - 2 == '\n' &&
-				headeri - 1 == '\r' && headeri == '\n')
-			return i;
-	return -1;
-} /* End of 'fhttp_header_complete' function */
-
-/* Set minimal buffer size */
-void fhttp_set_min_buf_size( file_t *f, int size )
-{
-	FHTTP_GET_DATA(data, f);
-	data->m_min_buf_size = size;
-} /* End of 'fhttp_set_min_buf_size' function */
-
-/* Get content type */
-char *fhttp_get_content_type( file_t *f )
-{
-	FHTTP_GET_DATA(data, f);
-	return data->m_content_type;
-} /* End of 'fhttp_get_content_type' function */
-
-/* Parse URL */
-void fhttp_parse_url( char *url, char **host_name, char **file_name, 
-		int *port )
-{
-	int i, port_delim, name_delim;
-
-	/* Skip 'http://' */
-	url += 7;
-
-	/* Find first ':' and first '/' */
-	for ( i = 0, port_delim = name_delim = -1; urli; i ++ )
-	{
-		if (urli == ':' && port_delim < 0)
-			port_delim = i;
-		else if (urli == '/' && name_delim < 0)
-			name_delim = i;
-	}
-
-	/* Get port number */
-	if (port_delim >= 0)
-		*port = atoi(&urlport_delim + 1);
-	else
-	{
-		*port = 80;
-		port_delim = (name_delim < 0) ? i : name_delim;
-	}
-
-	/* Get host and file names */
-	*host_name = strndup(url, port_delim);
-	*file_name = strdup(name_delim < 0 ? "" : &urlname_delim + 1);
-} /* End of 'fhttp_parse_url' function */
-
-/* Get HTTP response return value */
-int fhttp_get_return( char *header, int size )
-{
-	char ret4, *s;
-
-	s = strchr(header, ' ');
-	memcpy(ret, s + 1, 3);
-	ret3 = 0;
-	return atoi(ret);
-} /* End of 'fhttp_get_return' function */
-
-/* Get HTTP header field */
-char *fhttp_get_field( char *header, int size, char *field )
-{
-	char str256, *s1, *s2;
-	int len;
-
-	len = snprintf(str, sizeof(str), "\r\n%s: ", field);
-	s1 = strcasestr(header, str);
-	if (s1 == NULL)
-	{
-		len = snprintf(str, sizeof(str), "\r\n%s:", field);
-		s1 = strcasestr(header, str);
-		if (s1 == NULL)
-			return NULL;
-	}
-	s2 = strchr(s1 + 1, '\r');
-	if (s2 == NULL)
-		return NULL;
-	return strndup(s1 + len, s2 - s1 - len);
-} /* End of 'fhttp_get_field' function */
-
-/* Write a line to file */
-void fhttp_puts( char *s, file_t *f )
-{
-	file_write(s, strlen(s), 1, f);
-} /* End of 'fhttp_puts' function */
-
-/* Get line from file */
-char *fhttp_gets( char *s, int size, file_t *f )
-{
-	int i;
-	FHTTP_GET_DATA(data, f);
-
-	/* Read file until reach new line or end of file */
-	for ( i = 0; i < size - 1; i ++ )
-	{
-		int j = file_read(&si, 1, 1, f);
-		if (!j || !si || si == '\n')
-		{
-			if (!j)
-				i --;
-			break;
-		}
-	}
-	si + 1 = 0;
-	if (!(*s))
-		data->m_eof = TRUE;
-	return s;
-} /* End of 'fhttp_gets' function */
-
-/* Check for end of file */
-bool_t fhttp_eof( file_t *f )
-{
-	FHTTP_GET_DATA(data, f);
-	return data->m_eof;
-} /* End of 'fhttp_eof' function */
-
-/* Get string from file */
-str_t *fhttp_get_str( file_t *f )
-{
-	char s1024;
-	str_t *str;
-	FHTTP_GET_DATA(data, f);
-
-	fhttp_gets(s, sizeof(s), f);
-	return str_new(s);
-} /* End of 'fhttp_get_str' function */
-
-/* End of 'http.c' file */
-

mpfc-1.3.8.1.tar.bz2/libmpfc/file_http.h Deleted

@@ -1,116 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Interface for file library http files managament 
- * functions.
- * $Id: file_http.h 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_FILE_HTTP_H__
-#define __SG_MPFC_FILE_HTTP_H__
-
-#include "types.h"
-#include "file.h"
-#include "mystring.h"
-
-/* HTTP file additional data */
-typedef struct tag_file_http_data_t
-{
-	/* File and host names */
-	char *m_file_name, *m_host_name;
-
-	/* Socket descriptor */
-	int m_sock;
-
-	/* Buffer */
-	byte *m_buf, *m_actual_ptr;
-	int m_real_size, m_buf_size;
-	int m_read_size;
-	int m_portion_size;
-	int m_min_buf_size;
-
-	/* Content type */
-	char *m_content_type;
-
-	/* Current file position */
-	int m_file_pos;
-
-	/* Thread data */
-	pthread_t m_tid;
-	pthread_mutex_t m_mutex;
-	bool_t m_end_thread;
-	bool_t m_finished;
-	bool_t m_eof;
-} file_http_data_t;
-
-/* Open a file */
-file_t *fhttp_open( file_t *f, char *mode );
-
-/* Close file */
-int fhttp_close( file_t *f );
-
-/* Read from file */
-size_t fhttp_read( void *buf, size_t size, size_t nmemb, file_t *f );
-
-/* Write to file */
-size_t fhttp_write( void *buf, size_t size, size_t nmemb, file_t *f );
-
-/* Write a line to file */
-void fhttp_puts( char *s, file_t *f );
-
-/* Get line from file */
-char *fhttp_gets( char *s, int size, file_t *f );
-
-/* Get string from file */
-str_t *fhttp_get_str( file_t *f );
-
-/* Check for end of file */
-bool_t fhttp_eof( file_t *f );
-
-/* Seek file */
-int fhttp_seek( file_t *f, long offset, int whence );
-
-/* Tell file position */
-long fhttp_tell( file_t *f );
-
-/* Set minimal buffer size */
-void fhttp_set_min_buf_size( file_t *f, int size );
-
-/* Get content type */
-char *fhttp_get_content_type( file_t *f );
-
-/* Thread function */
-void *fhttp_thread( void *arg );
-
-/* Check if HTTP header is complete and return its end offset */
-int fhttp_header_complete( char *header, int size );
-
-/* Parse URL */
-void fhttp_parse_url( char *url, char **host_name, char **file_name, 
-		int *port );
-
-/* Get HTTP response return value */
-int fhttp_get_return( char *header, int size );
-
-/* Get HTTP header field */
-char *fhttp_get_field( char *header, int size, char *field );
-
-#endif
-
-/* End of 'http.h' file */
-

mpfc-1.3.8.1.tar.bz2/libmpfc/file_reg.c Deleted

@@ -1,148 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. File library regular files managament functions 
- * implementation.
- * $Id: file_reg.c 262 2006-06-06 10:08:04Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "types.h"
-#include "file.h"
-#include "file_reg.h"
-#include "mystring.h"
-
-/* Get file data */
-#define FREG_GET_DATA(data, file) \
-	file_reg_data_t *(data) = (file_reg_data_t *)((file)->m_data)
-
-/* Open a file */
-file_t *freg_open( file_t *f, char *mode )
-{
-	file_reg_data_t *data;
-	
-	/* Allocate memory for additional data */
-	f->m_data = malloc(sizeof(*data));
-	data = (file_reg_data_t *)(f->m_data);
-	memset(data, 0, sizeof(*data));
-
-	/* Try to open file */
-	data->m_fd = fopen(f->m_name, mode);
-	if (data->m_fd == NULL)
-	{
-		file_close(f);
-		return NULL;
-	}
-	return f;
-} /* End of 'freg_open' function */
-
-/* Close file */
-int freg_close( file_t *f )
-{
-	int ret = 0;
-	FREG_GET_DATA(data, f);
-
-	if (data != NULL)
-	{
-		if (data->m_fd != NULL)
-			ret = fclose(data->m_fd);
-		free(data);
-	}
-	return ret;
-} /* End of 'freg_close' function */
-
-/* Read from file */
-size_t freg_read( void *buf, size_t size, size_t nmemb, file_t *f )
-{
-	FREG_GET_DATA(data, f);
-
-	if (data != NULL && data->m_fd != NULL)
-		return fread(buf, size, nmemb, data->m_fd);
-	else
-		return 0;
-} /* End of 'freg_read' function */
-
-/* Write to file */
-size_t freg_write( void *buf, size_t size, size_t nmemb, file_t *f )
-{
-	FREG_GET_DATA(data, f);
-
-	if (data != NULL && data->m_fd != NULL)
-		return fwrite(buf, size, nmemb, data->m_fd);
-	else
-		return 0;
-} /* End of 'freg_write' function */
-
-/* Seek file */
-int freg_seek( file_t *f, long offset, int whence )
-{
-	FREG_GET_DATA(data, f);
-
-	if (data != NULL && data->m_fd != NULL)
-		return fseek(data->m_fd, offset, whence);
-	else
-		return 0;
-} /* End of 'freg_seek' function */
-
-/* Tell file position */
-long freg_tell( file_t *f )
-{
-	FREG_GET_DATA(data, f);
-
-	if (data != NULL && data->m_fd != NULL)
-		return ftell(data->m_fd);
-	else
-		return 0;
-} /* End of 'freg_tell' function */
-
-/* Write a line to file */
-void freg_puts( char *s, file_t *f )
-{
-	FREG_GET_DATA(data, f);
-	fputs(s, data->m_fd);
-} /* End of 'freg_puts' function */
-
-/* Get line from file */
-char *freg_gets( char *s, int size, file_t *f )
-{
-	FREG_GET_DATA(data, f);
-	return fgets(s, size, data->m_fd);
-} /* End of 'freg_gets' function */
-
-/* Check for end of file */
-bool_t freg_eof( file_t *f )
-{
-	FREG_GET_DATA(data, f);
-	return feof(data->m_fd);
-} /* End of 'freg_eof' function */
-
-/* Get string from file */
-str_t *freg_get_str( file_t *f )
-{
-	char s1024 = "";
-	FREG_GET_DATA(data, f);
-
-	if (fgets(s, sizeof(s), data->m_fd) == NULL)
-		return NULL;
-	return str_new(s);
-} /* End of 'freg_get_str' function */
-
-/* End of 'reg.c' file */
-

mpfc-1.3.8.1.tar.bz2/libmpfc/file_reg.h Deleted

@@ -1,71 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Interface for file library regular files managament 
- * functions.
- * $Id: file_reg.h 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_FILE_REG_H__
-#define __SG_MPFC_FILE_REG_H__
-
-#include "types.h"
-#include "file.h"
-#include "mystring.h"
-
-/* Regular file additional data */
-typedef struct tag_file_reg_data_t
-{
-	/* File descriptor */
-	FILE *m_fd;
-} file_reg_data_t;
-
-/* Open a file */
-file_t *freg_open( file_t *f, char *mode );
-
-/* Close file */
-int freg_close( file_t *f );
-
-/* Read from file */
-size_t freg_read( void *buf, size_t size, size_t nmemb, file_t *f );
-
-/* Write to file */
-size_t freg_write( void *buf, size_t size, size_t nmemb, file_t *f );
-
-/* Write a line to file */
-void freg_puts( char *s, file_t *f );
-
-/* Get line from file */
-char *freg_gets( char *s, int size, file_t *f );
-
-/* Get string from file */
-str_t *freg_get_str( file_t *f );
-
-/* Check for end of file */
-bool_t freg_eof( file_t *f );
-
-/* Seek file */
-int freg_seek( file_t *f, long offset, int whence );
-
-/* Tell file position */
-long freg_tell( file_t *f );
-
-#endif
-
-/* End of 'reg.h' file */
-

mpfc-1.3.8.1.tar.bz2/libmpfc/genre_list.c Deleted

@@ -1,150 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Genres list management functions implementation.
- * $Id: genre_list.c 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include "types.h"
-#include "error.h"
-#include "genre_list.h"
-
-/* Create a new genre list */
-genre_list_t *glist_new( void )
-{
-	genre_list_t *l;
-
-	/* Try to allocate memory */
-	l = (genre_list_t *)malloc(sizeof(genre_list_t));
-	if (l == NULL)
-	{
-	//	error_set_code(ERROR_NO_MEMORY);
-		return NULL;
-	}
-
-	/* Initialize list */
-	l->m_list = NULL;
-	l->m_size = 0;
-	return l;
-} /* End of 'glist_new' function */
-
-/* Free genre list */
-void glist_free( genre_list_t *l )
-{
-	if (l != NULL)
-	{
-		if (l->m_list != NULL)
-		{
-			int i;
-			
-			for ( i = 0; i < l->m_size; i ++ )
-				free(l->m_listi.m_name);
-			free(l->m_list);
-		}
-		free(l);
-	}
-} /* End of 'glist_free' function */
-
-/* Add genre to list */
-void glist_add( genre_list_t *l, char *name, byte data )
-{
-	if (l == NULL)
-		return;
-
-	l->m_list = (struct tag_glist_item_t *)realloc(l->m_list,
-				sizeof(*(l->m_list)) * (l->m_size + 1));
-	l->m_listl->m_size.m_name = strdup(name);
-	l->m_listl->m_size ++.m_data = data;
-} /* End of 'glist_add' function */
-
-/* Get genre name */
-char *glist_get_name( genre_list_t *l, int id )
-{
-	if (l == NULL || id < 0 || id >= l->m_size)
-		return NULL;
-	return l->m_listid.m_name;
-} /* End of 'glist_get_name' function */
-
-/* Get genre name by its id */
-char *glist_get_name_by_id( genre_list_t *l, int id )
-{
-	int i;
-
-	if (l == NULL)
-		return NULL;
-
-	for ( i = 0; i < l->m_size; i ++ )
-		if (l->m_listi.m_data == id)
-			return l->m_listi.m_name;
-	return NULL;
-} /* End of 'glist_get_name_by_id' function */
-
-/* Convert genre string to id */
-int glist_str2num( char *str )
-{
-	int num = -1;
-
-	if (str == NULL)
-		return -1;
-
-	for ( ; *str; str ++ )
-	{
-		if (*str >= '0' && *str <= '9')
-		{
-			if (num == -1)
-				num = (*str - '0');
-			else
-			{
-				num *= 10;
-				num += (*str - '0');
-			}
-		}
-		else if (*str == '(' && num < 0)
-			continue;
-		else if (*str == ')' && num >= 0)
-			return num;
-		else
-			return -1;
-	}
-	return num;
-} /* End of 'glist_str2num' function */
-
-/* Get genre id by its name */
-byte glist_get_id_by_name( genre_list_t *l, char *name )
-{
-	int id, i;
-	
-	if (l == NULL || name == NULL)
-		return 0xFF;
-
-	/* If name is in fact number - return it */
-	id = glist_str2num(name);
-	if (id >= 0)
-		return id;
-	
-	/* Search for genre with such name */
-	for ( i = 0; i < l->m_size; i ++ )
-		if (!strcmp(l->m_listi.m_name, name))
-			return l->m_listi.m_data;
-	return 0xFF;
-} /* End of 'glist_get_id_by_name' function */
-
-/* End of 'genre_list.c' file */
-

mpfc-1.3.8.1.tar.bz2/libmpfc/id3.c Deleted

@@ -1,839 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. ID3 tags handling library functions implementation.
- * $Id: id3.c 308 2011-03-13 12:16:29Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unicode/ucnv.h>
-#include "types.h"
-#include "myid3.h"
-
-/* Create a new empty tag */
-id3_tag_t *id3_new( void )
-{
-	id3_tag_t *tag;
-
-	/* Allocate memory */
-	tag = (id3_tag_t *)malloc(sizeof(id3_tag_t));
-	if (tag == NULL)
-		return NULL;
-
-	/* Initialize tags data */
-	id3_v1_new(&tag->m_v1);
-	id3_v2_new(&tag->m_v2);
-	tag->m_version = 2;
-
-	/* Return tag */
-	return tag;
-} /* End of 'id3_new' function */
-	
-/* Read tag from file */
-id3_tag_t *id3_read( char *filename, byte *tags_present )
-{
-	file_t *fd;
-	id3_tag_t *tag;
-	byte id3;
-	bool_t has_v1 = FALSE, has_v2 = FALSE;
-
-	/* Try to open file */
-	fd = file_open(filename, "rb", NULL);
-	if (fd == NULL)
-		return NULL;
-
-	/* Find tags */
-	file_read(id, 1, 3, fd);
-	if (!strncmp(id, "ID3", 3))
-		has_v2 = TRUE;
-	file_seek(fd, -ID3_V1_TOTAL_SIZE, SEEK_END);
-	file_read(id, 1, 3, fd);
-	if (!strncmp(id, "TAG", 3))
-		has_v1 = TRUE;
-
-	/* Report what tags are present */
-	if (tags_present)
-	{
-		(*tags_present) = 0;
-		if (has_v1)
-			(*tags_present) |= ID3_V1_PRESENT;
-		if (has_v2)
-			(*tags_present) |= ID3_V2_PRESENT;
-	}
-
-	/* No tag found */
-	if (!has_v1 && !has_v2)
-	{
-		file_close(fd);
-		return NULL;
-	}
-
-	/* Allocate memory for tag */
-	tag = (id3_tag_t *)malloc(sizeof(id3_tag_t));
-	if (tag == NULL)
-		return NULL;
-	tag->m_version = (has_v2 ? 2 : 1);
-
-	/* Read tags */
-	if (has_v1)
-		id3_v1_read(&tag->m_v1, fd);
-	else
-		id3_v1_new(&tag->m_v1);
-	if (has_v2)
-		id3_v2_read(&tag->m_v2, fd);
-	else
-		id3_v2_new(&tag->m_v2);
-	
-	/* Close file */
-	file_close(fd);
-	return tag;
-} /* End of 'id3_read' function */
-
-/* Save tag to file */
-bool_t id3_write( id3_tag_t *tag, char *filename )
-{
-	bool_t ret1, ret2;
-
-	if (tag == NULL || filename == NULL)
-		return FALSE;
-
-	/* Write tags */
-	ret1 = id3_v1_write(&tag->m_v1, filename);
-	ret2 = id3_v2_write(&tag->m_v2, filename);
-	return (ret1 || ret2);
-} /* End of 'id3_write' function */
-
-/* Extract next frame from tag */
-void id3_next_frame( id3_tag_t *tag, id3_frame_t *frame )
-{
-	if (tag == NULL)
-		return;
-
-	if (tag->m_version == 1)
-		id3_v1_next_frame(&tag->m_v1, frame);
-	else
-		id3_v2_next_frame(&tag->m_v2, frame);
-} /* End of 'id3_next_frame' function */
-
-/* Set frame value */
-void id3_set_frame( id3_tag_t *tag, char *name, char *val, char *cs )
-{
-	if (tag == NULL || name == NULL || val == NULL)
-		return;
-
-	/* Set frame to tags */
-	id3_v1_set_frame(&tag->m_v1, name, val);
-	id3_v2_set_frame(&tag->m_v2, name, val, cs);
-} /* End of 'id3_set_frame' function */
-
-/* Free tag */
-void id3_free( id3_tag_t *tag )
-{
-	if (tag == NULL)
-		return;
-
-	if (tag->m_v1.m_stream != NULL)
-		free(tag->m_v1.m_stream);
-	if (tag->m_v2.m_stream != NULL)
-		free(tag->m_v2.m_stream);
-	free(tag);
-} /* End of 'id3_free' function */
-
-/* Free frame */
-void id3_free_frame( id3_frame_t *f )
-{
-	if (f != NULL && f->m_val != NULL)
-		free(f->m_val);
-} /* End of 'id3_free_frame' function */
-
-/* Create an empty ID3V1 */
-void id3_v1_new( id3_tag_data_t *tag )
-{
-	/* Allocate memory for stream */
-	tag->m_stream = (byte *)malloc(tag->m_stream_len = ID3_V1_TOTAL_SIZE);
-	if (tag->m_stream == NULL)
-		return;
-
-	/* Fill stream */
-	memcpy(tag->m_stream, "TAG", 3);
-	memset(tag->m_stream + 3, ' ', tag->m_stream_len - 3);
-
-	/* Set frames data */
-	tag->m_frames_start = tag->m_stream + ID3_V1_TITLE_OFFSET;
-	tag->m_cur_frame = tag->m_frames_start;
-} /* End of 'id3_v1_new' function */
-
-/* Create an empty ID3V2 */
-void id3_v2_new( id3_tag_data_t *tag )
-{
-	/* Allocate memory for stream */
-	tag->m_stream_len = ID3_HEADER_SIZE;
-	tag->m_stream = (byte *)malloc(tag->m_stream_len);
-	if (tag->m_stream == NULL)
-		return;
-
-	/* Fill stream */
-	memset(tag->m_stream, 0, tag->m_stream_len);
-	memcpy(tag->m_stream, "ID3", 3);
-	*(tag->m_stream + 3) = 4;
-
-	/* Set frames data */
-	tag->m_frames_start = tag->m_stream + ID3_HEADER_SIZE;
-	tag->m_cur_frame = tag->m_frames_start;
-} /* End of 'id3_v2_new' function */
-
-/* Read ID3V1 */
-void id3_v1_read( id3_tag_data_t *tag, file_t *fd )
-{
-	/* Seek to tag start */
-	file_seek(fd, -128, SEEK_END);
-	
-	/* Create an empty tag at first */
-	id3_v1_new(tag);
-
-	/* Read data from file */
-	file_read(tag->m_stream, 1, tag->m_stream_len, fd);
-} /* End of 'id3_v1_read' function */
-
-/* Read ID3V2 */
-void id3_v2_read( id3_tag_data_t *tag, file_t *fd )
-{
-	byte flags;
-	int real_size, ext_size, v2_version;
-	byte headerID3_HEADER_SIZE;
-
-	/* Seek to tag start */
-	file_seek(fd, 0, SEEK_SET);
-
-	/* Read header */
-	file_read(header, 1, ID3_HEADER_SIZE, fd);
-	tag->m_v2_version = *((char *)(header + 3));
-	flags = *(header + 5);
-	real_size = ID3_CONVERT_FROM_SYNCHSAFE(*(dword *)(header + 6));
-
-	/* Calculate real size */
-	real_size += ID3_HEADER_SIZE;
-	if (flags & ID3_HAS_FOOTER)
-		real_size += ID3_FOOTER_SIZE;
-
-	/* Allocate memory for stream and read it */
-	tag->m_stream_len = real_size;
-	tag->m_stream = (byte *)malloc(real_size);
-	if (tag->m_stream == NULL)
-		return;
-	memcpy(tag->m_stream, header, ID3_HEADER_SIZE);
-	file_read(tag->m_stream + ID3_HEADER_SIZE, 1, 
-			tag->m_stream_len - ID3_HEADER_SIZE, fd);
-
-	/* Get extended header size */
-	if (flags & ID3_HAS_EXT_HEADER)
-	{
-		ext_size = ID3_CONVERT_FROM_SYNCHSAFE(*(dword *)(tag->m_stream + 
-						ID3_HEADER_SIZE));
-	}
-	else
-		ext_size = 0;
-
-	/* Set frames information */
-	tag->m_frames_start = tag->m_cur_frame = 
-		tag->m_stream + ID3_HEADER_SIZE + ext_size;
-} /* End of 'id3_v2_read' function */
-
-/* Save ID3V1 tag to file */
-bool_t id3_v1_write( id3_tag_data_t *tag, char *filename )
-{
-	FILE *fd;
-	char magic3;
-
-	/* Open file */
-	fd = fopen(filename, "r+b");
-	if (fd == NULL)
-	{
-		return FALSE;
-	}
-
-	/* Determine if there exists tag */
-	fseek(fd, -ID3_V1_TOTAL_SIZE, SEEK_END);
-	if (fread(magic, 1, 3, fd) != 3)
-	{
-		fclose(fd);
-		return FALSE;
-	}
-	if (strncmp(magic, "TAG", 3))
-		fseek(fd, 0, SEEK_END);
-	else
-		fseek(fd, -3, SEEK_CUR);
-
-	/* Write tag */
-	if (fwrite(tag->m_stream, 1, ID3_V1_TOTAL_SIZE, fd) != ID3_V1_TOTAL_SIZE)
-	{
-		fclose(fd);
-		return FALSE;
-	}
-
-	/* Close file */
-	fclose(fd);
-	return TRUE;
-} /* End of 'id3_v1_write' function */
-
-/* Save ID3V2 tag to file */
-bool_t id3_v2_write( id3_tag_data_t *tag, char *filename )
-{
-	FILE *fd;
-	int file_size;
-	byte *data;
-	byte magic4;
-	int prev_size;
-	int size = tag->m_stream_len;
-
-	/* Open file */
-	fd = fopen(filename, "rb");
-	if (fd == NULL)
-		return FALSE;
-
-	/* Get information about current tag */
-	if (fread(magic, 1, 3, fd) != 3)
-	{
-		fclose(fd);
-		return FALSE;
-	}
-	prev_size = 0;
-	if (magic0 == 'I' && magic1 == 'D' && magic2 == '3')
-	{
-		byte s4;
-		byte f;
-		fseek(fd, 5, SEEK_SET);
-		if (fread(&f, 1, 1, fd) != 1 || fread(&s, 1, 4, fd) != 4)
-		{
-			fclose(fd);
-			return FALSE;
-		}
-		prev_size = s3 | (s2 << 7) | (s1 << 14) | (s0 << 21);
-		prev_size += 10;
-		if (f & 16)
-			prev_size += 10;
-	}
-
-	/* Get file size */
-	fseek(fd, 0, SEEK_END);
-	file_size = ftell(fd) - prev_size;
-	data = (byte *)malloc(file_size + size + 10);
-	if (data == NULL)
-	{
-		fclose(fd);
-		return FALSE;
-	}
-
-	/* Fill data */
-	fseek(fd, prev_size, SEEK_SET);
-	if (fread(&datasize, 1, file_size, fd) != file_size)
-	{
-		fclose(fd);
-		free(data);
-		return FALSE;
-	}
-	memcpy(data, tag->m_stream, size);
-	fclose(fd);
-
-	/* Write file */
-	fd = fopen(filename, "wb");
-	if (fd == NULL)
-	{
-		free(data);
-		return FALSE;
-	}
-	if (fwrite(data, 1, file_size + size, fd) != file_size + size)
-	{
-		fclose(fd);
-		free(data);
-		return FALSE;
-	}
-	fclose(fd);
-	free(data);
-	return TRUE;
-} /* End of 'id3_v2_write' function */
-
-/* Read next frame in ID3V1 */
-void id3_v1_next_frame( id3_tag_data_t *tag, id3_frame_t *frame )
-{
-	frame->m_version = 1;
-	frame->m_encoding = ID3_LATIN1;
-	switch (tag->m_cur_frame - tag->m_stream)
-	{
-	case ID3_V1_TITLE_OFFSET:
-		strcpy(frame->m_name, ID3_FRAME_TITLE);
-		id3_copy2frame(frame, &tag->m_cur_frame, ID3_V1_TITLE_SIZE);
-		break;
-	case ID3_V1_ARTIST_OFFSET:
-		strcpy(frame->m_name, ID3_FRAME_ARTIST);
-		id3_copy2frame(frame, &tag->m_cur_frame, ID3_V1_ARTIST_SIZE);
-		break;
-	case ID3_V1_ALBUM_OFFSET:
-		strcpy(frame->m_name, ID3_FRAME_ALBUM);
-		id3_copy2frame(frame, &tag->m_cur_frame, ID3_V1_ALBUM_SIZE);
-		break;
-	case ID3_V1_YEAR_OFFSET:
-		strcpy(frame->m_name, ID3_FRAME_YEAR);
-		id3_copy2frame(frame, &tag->m_cur_frame, ID3_V1_YEAR_SIZE);
-		break;
-	case ID3_V1_COMMENT_OFFSET:
-		strcpy(frame->m_name, ID3_FRAME_COMMENT);
-		id3_copy2frame(frame, &tag->m_cur_frame, ID3_V1_COMMENT_SIZE);
-		break;
-	case ID3_V1_TRACK_OFFSET:
-		strcpy(frame->m_name, ID3_FRAME_TRACK);
-		frame->m_val = (char *)malloc(4);
-		snprintf(frame->m_val, 4, "%d", (int)*(tag->m_cur_frame));
-		tag->m_cur_frame += ID3_V1_TRACK_SIZE;
-		break;
-	case ID3_V1_GENRE_OFFSET:
-		strcpy(frame->m_name, ID3_FRAME_GENRE);
-		frame->m_val = (char *)malloc(4);
-		snprintf(frame->m_val, 4, "%d", (int)*(tag->m_cur_frame));
-		tag->m_cur_frame += ID3_V1_GENRE_SIZE;
-		break;
-	default:
-		strcpy(frame->m_name, ID3_FRAME_FINISHED);
-		frame->m_val = NULL;
-		break;
-	}
-} /* End of 'id3_v1_next_frame' function */
-
-/* Read next frame in ID3V2 */
-void id3_v2_next_frame( id3_tag_data_t *tag, id3_frame_t *frame )
-{
-	long size;
-	word flags;
-
-	/* Check if any frames are left in stream */
-	frame->m_version = 2;
-	frame->m_encoding = ID3_LATIN1;
-	if (!ID3_IS_VALID_FRAME_NAME(tag->m_cur_frame) || 
-			(tag->m_cur_frame - tag->m_stream >= tag->m_stream_len))
-	{
-		strcpy(frame->m_name, ID3_FRAME_FINISHED);
-		frame->m_val = NULL;
-		return;
-	}
-
-	/* Read frame header */
-	memcpy(frame->m_name, tag->m_cur_frame, 4);
-	frame->m_name4 = 0;
-	tag->m_cur_frame += 4;
-	size = id3_read_frame_size(tag->m_cur_frame, tag->m_v2_version);
-	tag->m_cur_frame += 4;
-	flags = *(word *)tag->m_cur_frame;
-	tag->m_cur_frame += 2;
-
-	/* Handle flags */
-	if (flags & ID3_FRAME_GROUPING)
-	{
-		tag->m_cur_frame ++;
-		size --;
-	}
-	if (flags & ID3_FRAME_ENCRYPTION)
-	{
-		tag->m_cur_frame ++;
-		size --;
-	}
-	if (flags & ID3_FRAME_DATA_LEN)
-	{
-		tag->m_cur_frame += 4;
-		size -= 4;
-	}
-
-	/* Alias frame name */
-	if (!strcmp(frame->m_name, "TDRC"))
-		strcpy(frame->m_name, ID3_FRAME_YEAR);
-
-	/* Check bounds */
-	if (tag->m_cur_frame + size > tag->m_stream + tag->m_stream_len ||
-			tag->m_cur_frame < tag->m_stream || size < 0)
-	{
-		strcpy(frame->m_name, ID3_FRAME_FINISHED);
-		frame->m_val = NULL;
-		return;
-	}
-
-	/* Save frame value */
-	if (size)
-	{
-		frame->m_encoding = *(tag->m_cur_frame);
-		tag->m_cur_frame ++;
-	}
-	id3_copy2frame(frame, &tag->m_cur_frame, size ? size - 1 : size);
-} /* End of 'id3_next_frame_v2' function */
-
-/* Set frame value in ID3V1 */
-void id3_v1_set_frame( id3_tag_data_t *tag, char *name, char *val )
-{
-	if (!strcmp(name, ID3_FRAME_TITLE))
-		strncpy(tag->m_stream + ID3_V1_TITLE_OFFSET, val, ID3_V1_TITLE_SIZE);
-	else if (!strcmp(name, ID3_FRAME_ARTIST))
-		strncpy(tag->m_stream + ID3_V1_ARTIST_OFFSET, val, ID3_V1_ARTIST_SIZE);
-	else if (!strcmp(name, ID3_FRAME_ALBUM))
-		strncpy(tag->m_stream + ID3_V1_ALBUM_OFFSET, val, ID3_V1_ALBUM_SIZE);
-	else if (!strcmp(name, ID3_FRAME_YEAR))
-		strncpy(tag->m_stream + ID3_V1_YEAR_OFFSET, val, ID3_V1_YEAR_SIZE);
-	else if (!strcmp(name, ID3_FRAME_COMMENT))
-		strncpy(tag->m_stream + ID3_V1_COMMENT_OFFSET, val, 
-				ID3_V1_COMMENT_SIZE);
-	else if (!strcmp(name, ID3_FRAME_TRACK))
-	{
-		byte g;
-		g = atoi(val);
-		*(tag->m_stream + ID3_V1_TRACK_OFFSET) = g;
-	}
-	else if (!strcmp(name, ID3_FRAME_GENRE))
-	{
-		byte g;
-		g = atoi(val + 1);
-		*(tag->m_stream + ID3_V1_GENRE_OFFSET) = g;
-	}
-} /* End of 'id3_v1_set_frame' function */
-
-/* Set frame value in ID3V2 */
-void id3_v2_set_frame( id3_tag_data_t *tag, char *name, char *val, char *cs )
-{
-	byte *p;
-	bool_t found, finished;
-	int len = strlen(val), diff, diff1, diff2, was_len, size, 
-		new_size = (len) ? len + 1 : 0;
-
-	/* Set frame position to the beginning */
-	p = tag->m_frames_start;
-	diff1 = tag->m_frames_start - tag->m_stream;
-	diff2 = tag->m_cur_frame - tag->m_stream;
-
-	/* Search for specified frame */
-	for ( found = finished = FALSE; !found && !finished; )
-	{
-		char *id;
-		
-		/* Read frame header */
-		id = p;
-		size = id3_read_frame_size(p + 4, tag->m_v2_version);
-
-		/* Frames finished */
-		if (!ID3_IS_VALID_FRAME_NAME(id) || 
-				(p - tag->m_stream >= tag->m_stream_len))
-			finished = TRUE;
-		/* Compare frame ID with needed */
-		else if (!strncmp(id, name, 4))
-			found = TRUE;
-		/* Move to the next frame */
-		else
-			p += (10 + size);
-	}
-
-	/* Update existing frame */
-	diff = p - tag->m_stream;
-	was_len = tag->m_stream_len;
-	if (found)
-	{
-		/* Shift tag */
-		if (size < new_size)
-		{
-			tag->m_stream_len += (new_size - size);
-			tag->m_stream = (byte *)realloc(tag->m_stream, tag->m_stream_len);
-			p = tag->m_stream + diff;
-			memmove(p + new_size + 10, p + size + 10, 
-					was_len - diff - size - 10);
-		}
-		else if (size > new_size)
-		{
-			memmove(p + new_size + 10, p + size + 10, 
-					was_len - diff - size - 10);
-			tag->m_stream_len += (new_size - size);
-			tag->m_stream = (byte *)realloc(tag->m_stream, tag->m_stream_len);
-			p = tag->m_stream + diff;
-		}
-		
-		/* Write */
-		memset(p, 0, new_size + 10);
-		memcpy(p, name, 4);
-		id3_write_frame_size(p + 4, new_size, tag->m_v2_version);
-		if (cs != NULL && !strcasecmp(cs, "utf-8") && len > 0)
-			*(p + 10) = ID3_UTF8;
-		memcpy(p + 11, val, len);
-		*(dword *)(tag->m_stream + 6) = 
-			ID3_CONVERT_TO_SYNCHSAFE(tag->m_stream_len - 
-				((ID3_GET_FLAGS(tag) & ID3_HAS_FOOTER) ? 20 : 10));
-	}
-	/* Create new frame */
-	else if (finished)
-	{
-		/* Reallocate memory */
-		tag->m_stream_len += (new_size + 10);
-		tag->m_stream = (byte *)realloc(tag->m_stream, tag->m_stream_len);
-
-		/* Shift data */
-		p = tag->m_stream + diff;
-		memmove(p + new_size + 10, p, was_len - diff);
-
-		/* Write frame */
-		memset(p, 0, new_size + 10);
-		memcpy(p, name, 4);
-		id3_write_frame_size(p + 4, new_size, tag->m_v2_version);
-		if (cs != NULL && !strcasecmp(cs, "utf-8") && len > 0)
-			*(p + 10) = ID3_UTF8;
-		memcpy(p + 11, val, len);
-		*(dword *)(tag->m_stream + 6) = 
-			ID3_CONVERT_TO_SYNCHSAFE(tag->m_stream_len - 
-				((ID3_GET_FLAGS(tag) & ID3_HAS_FOOTER) ? 20 : 10));
-	}
-
-	/* Update frames info */
-	tag->m_frames_start = tag->m_stream + diff1;
-	tag->m_cur_frame = tag->m_stream + diff2;
-} /* End of 'id3_v2_set_frame' function */
-
-/* Remove ending spaces in string */
-void id3_rem_end_spaces( char *str, int len )
-{
-	for ( len --; len >= 0 && strlen == ' '; len -- );
-	strlen + 1 = 0;
-} /* End of 'id3_rem_end_spaces' function */
-
-/* Convert a unicode string to UTF-8 and copy it to frame */
-#define ID3_BOM_BE 0xFEFF
-#define ID3_BOM_LE 0xFFFE
-#define IS_BOM(x) ((x) == ID3_BOM_BE || (x) == ID3_BOM_LE)
-void id3_copy_unicode_to_frame( id3_frame_t *f, byte **ptr, int size, int bom )
-{
-	UConverter* cnv = NULL;
-	UErrorCode err = 0;
-	UChar* in_buf = NULL;
-	char* out_buf = NULL;
-	size_t out_size, in_size, i;
-
-	/* Create converter */
-	cnv = ucnv_open("UTF-8", &err);
-	if (!cnv)
-	{
-		util_log("Fatal error: utf-8 converter creation failed: %s\n",
-				u_errorName(err));
-		goto cleanup;
-	}
-
-	/* Allocate */
-	in_size = size / 2;
-	in_buf = malloc(sizeof(UChar) * (in_size + 1));
-	if (!in_buf)
-	{
-		util_log("Fatal error: memory allocation failed\n");
-		goto cleanup;
-	}
-	out_size = in_size * ucnv_getMaxCharSize(cnv) + 1;
-	out_buf = malloc(out_size);
-	if (!out_buf)
-	{
-		util_log("Fatal error: memory allocation failed\n");
-		goto cleanup;
-	}
-
-	/* Fill uchars */
-	for ( i = 0; i < in_size; i ++ )
-	{
-		byte hi;
-		byte lo;
-
-		hi = *(*ptr)++;
-		lo = *(*ptr)++;
-		in_bufi = (bom == ID3_BOM_LE ? (lo << 8) | hi : (hi << 8) | lo);
-	}
-	in_bufin_size = 0;
-
-	/* Convert to UTF-8 */
-	out_size = ucnv_fromUChars(cnv, out_buf, out_size, in_buf, -1, &err);
-	if (U_FAILURE(err))
-	{
-		util_log("Fatal error: utf-8 converting failed: %s\n",
-				u_errorName(err));
-		goto cleanup;
-	}
-
-	f->m_val = out_buf;
-
-cleanup:
-	if (in_buf)
-		free(in_buf);
-	if (cnv)
-		ucnv_close(cnv);
-}
-
-/* Copy string to frame */
-void id3_copy2frame( id3_frame_t *f, byte **ptr, int size )
-{	
-	byte pos = 0;
-	int i;
-	bool_t zeros_block = FALSE;
-	int bom = 0;
-	
-	if (f == NULL)
-		return;
-
-	/* Check for track in v1 frame */
-	if (f->m_version == 1 && !strcmp(f->m_name, ID3_FRAME_COMMENT) &&
-			(*ptr)28 == 0 && (*ptr)29 != 0)
-		size --;
-
-	/* Detect unicode value */
-	if (size >= 2 && 
-			(bom = (((*ptr)0 << 8) | ((*ptr)1))) && IS_BOM(bom))
-	{
-		(*ptr) += 2;
-		id3_copy_unicode_to_frame(f, ptr, size - 2, bom);
-	}
-	else
-	{
-		/* Seek to the last string in frame */
-		for ( i = 0; i < size; i ++ )
-		{
-			if (!(*ptr)i)
-				zeros_block = TRUE;
-			else if (zeros_block)
-			{
-				pos = i;
-				zeros_block = FALSE;
-			}
-		}
-		size -= pos;
-		(*ptr) += pos;
-
-		/* Allocate memory */
-		f->m_val = (char *)malloc(size + 1);
-
-		/* Copy */
-		memcpy(f->m_val, (char *)(*ptr), size);
-		id3_rem_end_spaces(f->m_val, size);
-
-		/* Shift frame pointer */
-		(*ptr) += size;
-	}
-} /* End of 'id3_copy2frame' function */
-
-/* Remove tags from file */
-void id3_remove( char *filename )
-{
-	FILE *fd;
-	byte *buf;
-	int file_size;
-
-	fd = fopen(filename, "rb");
-	if (fd == NULL)
-		return;
-	fseek(fd, 0, SEEK_END);
-	file_size = ftell(fd);
-	buf = (byte *)malloc(file_size);
-	if (buf == NULL)
-	{
-		fclose(fd);
-		return;
-	}
-	fseek(fd, 0, SEEK_SET);
-	if (fread(buf, 1, file_size, fd) != file_size)
-	{
-		fclose(fd);
-		return;
-	}
-	fclose(fd);
-
-	/* Find and remove ID3V2 */
-	if (file_size >= 10 && !strncmp(buf, "ID3", 3))
-	{
-		dword size;
-		int v2_version;
-
-		/* Get ID3V2 size */
-		v2_version = *(char *)(buf + 3);
-		size = ID3_CONVERT_FROM_SYNCHSAFE(*(dword *)(buf + 6));
-
-		/* Calculate real size */
-		size += ID3_HEADER_SIZE;
-		if (*(buf + 5) & ID3_HAS_FOOTER)
-			size += ID3_FOOTER_SIZE;
-		
-		/* Remove tag */
-		memmove(buf, buf + size, file_size - size);
-		file_size -= size;
-	}
-
-	/* Find and remove ID3V1 */
-	if (file_size >= ID3_V1_TOTAL_SIZE && 
-			!strncmp(buf + file_size - ID3_V1_TOTAL_SIZE, "TAG", 3))
-		file_size -= ID3_V1_TOTAL_SIZE;
-
-	/* Save */
-	fd = fopen(filename, "wb");
-	if (fd == NULL)
-	{
-		free(buf);
-		return;
-	}
-	if (fwrite(buf, 1, file_size, fd) != file_size)
-	{
-		fclose(fd);
-		free(buf);
-		return;
-	}
-
-	fclose(fd);
-	free(buf);
-} /* End of 'id3_remove' function */
-
-/* Set genre frame */
-void id3_set_genre( id3_tag_t *tag, char *val, byte id, char *cs )
-{
-	char str20;
-	
-	if (tag == NULL || val == NULL)
-		return;
-
-	/* Set frame to tags */
-	sprintf(str, "(%d)", id);
-	id3_v1_set_frame(&tag->m_v1, ID3_FRAME_GENRE, str);
-	id3_v2_set_frame(&tag->m_v2, ID3_FRAME_GENRE, val, cs);
-} /* End of 'id3_set_genre' function */
-
-/* Read frame size */
-int id3_read_frame_size( char *buf, int v2_version )
-{
-	if (buf == NULL)
-		return 0;
-	if (v2_version >= 4)
-		return ID3_CONVERT_FROM_SYNCHSAFE(*(dword *)buf);
-	else
-		return ID3_SWAP_BYTES(*(dword *)buf);
-} /* End of 'id3_frame_read_size' function */
-
-/* Write frame size */
-void id3_write_frame_size( char *buf, int size, int v2_version )
-{
-	if (buf == NULL)
-		return;
-	if (v2_version >= 4)
-		*(dword *)buf = ID3_CONVERT_TO_SYNCHSAFE(size);
-	else
-		*(dword *)buf = ID3_SWAP_BYTES(size);
-} /* End of 'id3_write_frame_size' function */
-
-/* End of 'id3.c' file */
-

mpfc-1.3.8.1.tar.bz2/libmpfc/plugin_charset.c Deleted

@@ -1,96 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Charset plugin management functions implementation.
- * $Id: plugin_charset.c 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <dlfcn.h>
-#include <stdlib.h>
-#include <string.h>
-#include "types.h"
-#include "csp.h"
-#include "pmng.h"
-#include "util.h"
-
-/* Initialize charset plugin */
-plugin_t *csp_init( char *name, struct tag_pmng_t *pmng )
-{
-	csp_data_t pd;
-	plugin_t *p;
-
-	/* Create plugin */
-	memset(&pd, 0, sizeof(pd));
-	p = plugin_init(pmng, name, PLUGIN_TYPE_CHARSET, sizeof(cs_plugin_t), 
-			PLUGIN_DATA(&pd));
-	if (p == NULL)
-		return NULL;
-
-	/* Set other fields */
-	CHARSET_PLUGIN(p)->m_pd = pd;
-	p->m_pd = PLUGIN_DATA(&CHARSET_PLUGIN(p)->m_pd);
-	return p;
-} /* End of 'csp_init' function */
-
-/* Get number of supported character sets */
-int csp_get_num_sets( cs_plugin_t *p )
-{
-	if (p != NULL && p->m_pd.m_get_num_sets != NULL)
-		return p->m_pd.m_get_num_sets();
-	else
-		return 0;
-} /* End of 'csp_get_num_sets' function */
-
-/* Get charset name */
-char *csp_get_cs_name( cs_plugin_t *p, int index )
-{
-	if (p != NULL && p->m_pd.m_get_cs_name != NULL)
-		return p->m_pd.m_get_cs_name(index);
-	else
-		return NULL;
-} /* End of 'csp_get_cs_name' function */
-
-/* Get symbol code */
-dword csp_get_code( cs_plugin_t *p, byte ch, int index )
-{
-	if (p != NULL && p->m_pd.m_get_code != NULL)
-		return p->m_pd.m_get_code(ch, index);
-	else
-		return 0;
-} /* End of 'csp_get_code' function */
-
-/* Expand automatic charset */
-char *csp_expand_auto( cs_plugin_t *p, char *sample_str, int index )
-{
-	if (p != NULL && p->m_pd.m_expand_auto != NULL)
-		return p->m_pd.m_expand_auto(sample_str, index);
-	else
-		return NULL;
-} /* End of 'csp_expand_auto' function */
-
-/* Get charset flags */
-dword csp_get_flags( cs_plugin_t *p, int index )
-{
-	if (p != NULL && p->m_pd.m_get_flags != NULL)
-		return p->m_pd.m_get_flags(index);
-	else
-		return 0;
-} /* End of 'csp_get_flags' function */
-
-/* End of 'csp.c' file */
-

mpfc-1.3.8.1.tar.bz2/libmpfc/plugin_effect.c Deleted

@@ -1,60 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Fffect plugin management functions implementation.
- * $Id: plugin_effect.c 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <dlfcn.h>
-#include <stdlib.h>
-#include <string.h>
-#include "types.h"
-#include "ep.h"
-#include "pmng.h"
-#include "util.h"
-
-/* Initialize effect plugin */
-plugin_t *ep_init( char *name, pmng_t *pmng )
-{
-	ep_data_t pd;
-	plugin_t *p;
-
-	/* Create plugin */
-	memset(&pd, 0, sizeof(pd));
-	p = plugin_init(pmng, name, PLUGIN_TYPE_EFFECT, sizeof(effect_plugin_t), 
-			PLUGIN_DATA(&pd));
-	if (p == NULL)
-		return NULL;
-
-	/* Set other fields */
-	EFFECT_PLUGIN(p)->m_pd = pd;
-	p->m_pd = PLUGIN_DATA(&EFFECT_PLUGIN(p)->m_pd);
-	return p;
-} /* End of 'ep_init' function */
-
-/* Apply plugin to audio data */
-int ep_apply( effect_plugin_t *p, byte *data, int len, 
-	   			int fmt, int freq, int channels )
-{
-	if (p != NULL && (p->m_pd.m_apply != NULL))
-		return p->m_pd.m_apply(data, len, fmt, freq, channels);
-	return len;
-} /* End of 'ep_apply' function */
-
-/* End of 'ep.c' file */
-

mpfc-1.3.8.1.tar.bz2/libmpfc/plugin_input.c Deleted

@@ -1,342 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Input plugin management functions implementation.
- * $Id: plugin_input.c 307 2011-03-13 11:58:47Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <dlfcn.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include "types.h"
-#include "inp.h"
-#include "mystring.h"
-#include "plugin.h"
-#include "pmng.h"
-#include "song.h"
-#include "util.h"
-
-/* Initialize input plugin */
-plugin_t *inp_init( char *name, pmng_t *pmng )
-{
-	inp_data_t pd;
-	plugin_t *p;
-
-	/* Create plugin */
-	memset(&pd, 0, sizeof(pd));
-	p = plugin_init(pmng, name, PLUGIN_TYPE_INPUT, sizeof(in_plugin_t), 
-			PLUGIN_DATA(&pd));
-	if (p == NULL)
-		return NULL;
-
-	/* Set other fields */
-	p->m_destructor = inp_free;
-	INPUT_PLUGIN(p)->m_pd = pd;
-	p->m_pd = PLUGIN_DATA(&INPUT_PLUGIN(p)->m_pd);
-	return p;
-} /* End of 'inp_init' function */
-
-/* Input plugin destructor */
-void inp_free( plugin_t *p )
-{
-	inp_data_t *pd = &INPUT_PLUGIN(p)->m_pd;
-
-	if (pd->m_spec_funcs != NULL)
-	{
-		int i;
-
-		for ( i = 0; i < pd->m_num_spec_funcs; i ++ )
-			if (pd->m_spec_funcsi.m_title != NULL)
-				free(pd->m_spec_funcsi.m_title);
-		free(pd->m_spec_funcs);
-	}
-} /* End of 'inp_free' function */
-
-/* Start playing function */
-bool_t inp_start( in_plugin_t *p, char *filename, file_t *fd )
-{
-	if (p == NULL)
-		return FALSE;
-	if (p->m_pd.m_start_with_fd != NULL)
-		return p->m_pd.m_start_with_fd(filename, fd);
-	else if (p->m_pd.m_start != NULL)
-		return p->m_pd.m_start(filename);
-	return FALSE;
-} /* End of 'inp_start' function */
-
-/* End playing function */
-void inp_end( in_plugin_t *p )
-{
-	if (p != NULL && (p->m_pd.m_end != NULL))
-		p->m_pd.m_end();
-} /* End of 'inp_end' function */
-
-/* Get song information function */
-song_info_t *inp_get_info( in_plugin_t *p, char *file_name, int *len )
-{
-	if (p != NULL && (p->m_pd.m_get_info != NULL))
-	{
-		song_info_t *si = p->m_pd.m_get_info(file_name, len);
-		if (si != NULL)
-		{
-			si_convert_cs(si, cfg_get_var(plugin_get_root_cfg(PLUGIN(p)),
-						"charset-output"), plugin_get_pmng(PLUGIN(p)));
-		}
-		return si;
-	}
-	*len = 0;
-	return NULL;
-} /* End of 'inp_get_info' function */
-	
-/* Save song information function */
-bool_t inp_save_info( in_plugin_t *p, char *file_name, song_info_t *info )
-{
-	bool_t ret = FALSE;
-	if (p != NULL && (p->m_pd.m_save_info != NULL) && info != NULL)
-	{
-		/* Convert charset */
-		char *was_cs = (info->m_charset == NULL ? NULL : 
-				strdup(info->m_charset));
-		pmng_t *pmng = plugin_get_pmng(PLUGIN(p));
-		
-		si_convert_cs(info, cfg_get_var(pmng_get_cfg(pmng), 
-					"charset-save-info"), pmng);
-		ret = p->m_pd.m_save_info(file_name, info);
-		si_convert_cs(info, was_cs, pmng);
-		if (was_cs != NULL)
-			free(was_cs);
-	}
-	return ret;
-} /* End of 'inp_save_info' function */
-	
-/* Get supported file formats */
-void inp_get_formats( in_plugin_t *p, char *extensions, char *content_type )
-{
-	if (p != NULL && (p->m_pd.m_get_formats != NULL))
-		p->m_pd.m_get_formats(extensions, content_type);
-	else
-	{
-		if (extensions != NULL)
-			strcpy(extensions, "");
-		if (content_type != NULL)
-			strcpy(content_type, "");
-	}
-} /* End of 'inp_get_formats' function */
-	
-/* Get stream function */
-int inp_get_stream( in_plugin_t *p, void *buf, int size )
-{
-	if (p != NULL && (p->m_pd.m_get_stream != NULL))
-		return p->m_pd.m_get_stream(buf, size);
-	return 0;
-} /* End of 'inp_get_stream' function */
-
-/* Seek song */
-void inp_seek( in_plugin_t *p, int seconds )
-{
-	if (p != NULL && (p->m_pd.m_seek != NULL))
-		p->m_pd.m_seek(seconds);
-} /* End of 'inp_seek' function */
-
-/* Get song audio parameters */
-void inp_get_audio_params( in_plugin_t *p, int *channels, 
-							int *frequency, dword *fmt, int *bitrate )
-{
-	if (p != NULL && (p->m_pd.m_get_audio_params != NULL))
-		p->m_pd.m_get_audio_params(channels, frequency, fmt, bitrate);
-	else 
-	{
-		*channels = 0;
-		*frequency = 0;
-		*fmt = 0;
-		*bitrate = 0;
-	}
-} /* End of 'inp_get_audio_params' function */
-
-/* Set equalizer parameters */
-void inp_set_eq( in_plugin_t *p )
-{
-	if (p != NULL && (p->m_pd.m_set_eq != NULL))
-		p->m_pd.m_set_eq();
-} /* End of 'inp_set_eq' function */
-
-/* Get plugin flags */
-dword inp_get_flags( in_plugin_t *p )
-{
-	dword flags;
-
-	flags = inp_get_plugin_flags(p);
-	if (flags != 0)
-		return flags;
-	if (p != NULL)
-		return p->m_pd.m_flags;
-	return 0;
-} /* End of 'inp_get_flags' function */
-
-/* Pause playing */
-void inp_pause( in_plugin_t *p )
-{
-	if (p != NULL && (p->m_pd.m_pause != NULL))
-		p->m_pd.m_pause();
-} /* End of 'inp_pause' function */
-
-/* Resume playing */
-void inp_resume( in_plugin_t *p )
-{
-	if (p != NULL && (p->m_pd.m_resume != NULL))
-		p->m_pd.m_resume();
-} /* End of 'inp_resume' function */
-
-/* Get current time */
-int inp_get_cur_time( in_plugin_t *p )
-{
-	if (p != NULL && (p->m_pd.m_get_cur_time != NULL))
-		return p->m_pd.m_get_cur_time();
-	return -1;
-} /* End of 'inp_get_cur_time' function */
-
-/* Get number of special functions */
-int inp_get_num_specs( in_plugin_t *p )
-{
-	if (p != NULL)
-		return p->m_pd.m_num_spec_funcs;
-	return 0;
-} /* End of 'inp_get_num_specs' function */
-
-/* Get special function title */
-char *inp_get_spec_title( in_plugin_t *p, int index )
-{
-	if (p != NULL && index >= 0 && index < p->m_pd.m_num_spec_funcs &&
-			p->m_pd.m_spec_funcs != NULL)
-		return p->m_pd.m_spec_funcsindex.m_title;
-	return NULL;
-} /* End of 'inp_get_spec_title' function */
-
-/* Get special function flags */
-dword inp_get_spec_flags( in_plugin_t *p, int index )
-{
-	if (p != NULL && index >= 0 && index < p->m_pd.m_num_spec_funcs &&
-			p->m_pd.m_spec_funcs != NULL)
-		return p->m_pd.m_spec_funcsindex.m_flags;
-	return 0;
-} /* End of 'inp_get_spec_flags' function */
-
-/* Call special function */
-void inp_spec_func( in_plugin_t *p, int index, char *filename )
-{
-	if (p != NULL && p->m_pd.m_spec_funcs != NULL && index >= 0 && 
-			index < p->m_pd.m_num_spec_funcs && 
-			p->m_pd.m_spec_funcsindex.m_func != NULL)
-		p->m_pd.m_spec_funcsindex.m_func(filename);
-} /* End of 'inp_spec_func' function */
-
-/* Set song title */
-str_t *inp_set_song_title( in_plugin_t *p, char *filename )
-{
-	if (filename == NULL)
-		return NULL;
-	
-	if (p != NULL && p->m_pd.m_set_song_title != NULL)
-		return p->m_pd.m_set_song_title(filename);
-	else
-		return str_new(util_short_name(filename));
-} /* End of 'inp_set_song_title' function */
-
-/* Set next song name */
-void inp_set_next_song( in_plugin_t *p, char *name )
-{
-	if (p != NULL && p->m_pd.m_set_next_song != NULL)
-		p->m_pd.m_set_next_song(name);
-} /* End of 'inp_set_next_song' function */
-
-/* Open directory */
-void *inp_vfs_opendir( in_plugin_t *p, char *name )
-{
-	if (p != NULL && p->m_pd.m_vfs_opendir != NULL)
-		return p->m_pd.m_vfs_opendir(name);
-	else
-		return NULL;
-} /* End of 'inp_vfs_opendir' function */
-
-/* Close directory */
-void inp_vfs_closedir( in_plugin_t *p, void *dir )
-{
-	if (p != NULL && p->m_pd.m_vfs_closedir != NULL)
-		p->m_pd.m_vfs_closedir(dir);
-} /* End of 'inp_vfs_closedir' function */
-
-/* Read directory entry */
-char *inp_vfs_readdir( in_plugin_t *p, void *dir )
-{
-	if (p != NULL && p->m_pd.m_vfs_readdir != NULL)
-		return p->m_pd.m_vfs_readdir(dir);
-	else
-		return NULL;
-} /* End of 'inp_vfs_readdir' function */
-
-/* Get file parameters */
-int inp_vfs_stat( in_plugin_t *p, char *name, struct stat *sb )
-{
-	if (p != NULL && p->m_pd.m_vfs_stat != NULL)
-		return p->m_pd.m_vfs_stat(name, sb);
-	else
-		return EACCES;
-} /* End of 'inp_vfs_stat' function */
-
-/* Get mixer type */
-plugin_mixer_type_t inp_get_mixer_type( in_plugin_t *p )
-{
-	if (p != NULL && p->m_pd.m_get_mixer_type != NULL)
-		return p->m_pd.m_get_mixer_type();
-	else
-		return PLUGIN_MIXER_DEFAULT;
-} /* End of 'inp_get_mixer_type' function */
-
-/* Check file type */
-bool_t inp_is_our_file( in_plugin_t *p, char *filename )
-{
-	if (p != NULL && p->m_pd.m_is_our_file != NULL)
-		return p->m_pd.m_is_our_file(filename);
-	else
-		return FALSE;
-} /* End of 'inp_is_our_file' function */
-
-/* Redirect file */
-char *inp_redirect( in_plugin_t *p, char *filename, inp_redirect_params_t *rp )
-{
-	if (p != NULL && p->m_pd.m_redirect != NULL)
-		return p->m_pd.m_redirect(filename, rp);
-	else
-		return NULL;
-} /* End of 'inp_redirect' function */
-
-/* Get plugin flags */
-dword inp_get_plugin_flags( in_plugin_t *p )
-{
-	if (p != NULL && p->m_pd.m_get_plugin_flags != NULL)
-		return p->m_pd.m_get_plugin_flags();
-	else
-		return 0;
-} /* End of 'inp_redirect' function */
-
-/* End of 'inp.c' file */
-

mpfc-1.3.8.1.tar.bz2/libmpfc/plugin_output.c Deleted

@@ -1,176 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Output plugin management functions implementation.
- * $Id: plugin_output.c 248 2006-01-07 18:20:44Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <dlfcn.h>
-#include <stdlib.h>
-#include <string.h>
-#include "types.h"
-#include "inp.h"
-#include "outp.h"
-#include "pmng.h"
-#include "song.h"
-#include "util.h"
-
-/* Initialize output plugin */
-plugin_t *outp_init( char *name, pmng_t *pmng )
-{
-	outp_data_t pd;
-	plugin_t *p;
-
-	/* Create plugin */
-	memset(&pd, 0, sizeof(pd));
-	p = plugin_init(pmng, name, PLUGIN_TYPE_OUTPUT, sizeof(out_plugin_t), 
-			PLUGIN_DATA(&pd));
-	if (p == NULL)
-		return NULL;
-
-	/* Set other fields */
-	OUTPUT_PLUGIN(p)->m_pd = pd;
-	p->m_pd = PLUGIN_DATA(&OUTPUT_PLUGIN(p)->m_pd);
-	return p;
-} /* End of 'outp_init' function */
-
-/* Plugin start function */
-bool_t outp_start( out_plugin_t *p )
-{
-	if (p != NULL && (p->m_pd.m_start != NULL))
-		return p->m_pd.m_start();
-	return FALSE;
-} /* End of 'outp_start' function */
-
-/* Plugin end function */
-void outp_end( out_plugin_t *p )
-{
-	if (p != NULL && (p->m_pd.m_end != NULL))
-		p->m_pd.m_end();
-} /* End of 'outp_end' function */
-
-/* Set channels number function */
-void outp_set_channels( out_plugin_t *p, int ch )
-{
-	if (p != NULL && (p->m_pd.m_set_channels != NULL))
-		p->m_pd.m_set_channels(ch);
-} /* End of 'outp_set_channels' function */
-
-/* Set frequency function */
-void outp_set_freq( out_plugin_t *p, int freq )
-{
-	if (p != NULL && (p->m_pd.m_set_freq != NULL))
-		p->m_pd.m_set_freq(freq);
-} /* End of 'outp_set_freq' function */
-
-/* Set format function */
-void outp_set_fmt( out_plugin_t *p, dword fmt )
-{
-	if (p != NULL && (p->m_pd.m_set_fmt != NULL))
-		p->m_pd.m_set_fmt(fmt);
-} /* End of 'outp_set_fmt' function */
-	
-/* Get real channels number */
-int outp_get_channels( out_plugin_t *p )
-{
-	if (p != NULL && (p->m_pd.m_get_channels != NULL))
-		return p->m_pd.m_get_channels();
-	else
-		return -1;
-} /* End of 'outp_get_channels' function */
-
-/* Get real frequenry */
-int outp_get_freq ( out_plugin_t *p )
-{
-	if (p != NULL && (p->m_pd.m_get_channels != NULL))
-		return p->m_pd.m_get_freq();
-	else
-		return -1;
-} /* End of 'outp_get_freq ' function */
-
-/* Get real format */
-dword outp_get_fmt( out_plugin_t *p )
-{
-	if (p != NULL && (p->m_pd.m_get_fmt != NULL))
-		return p->m_pd.m_get_fmt();
-	else
-		return 0xFFFFFFFF;
-} /* End of 'outp_get_fmt' function */
-
-/* Play stream function */
-void outp_play( out_plugin_t *p, void *buf, int size )
-{
-	if (p != NULL && (p->m_pd.m_play != NULL))
-		p->m_pd.m_play(buf, size);
-} /* End of 'outp_play' function */
-
-/* Flush function */
-void outp_flush( out_plugin_t *p )
-{
-	if (p != NULL && (p->m_pd.m_flush != NULL))
-		p->m_pd.m_flush();
-} /* End of 'outp_flush' function */
-
-/* Pause playing */
-void outp_pause( out_plugin_t *p )
-{
-	if (p != NULL && (p->m_pd.m_pause != NULL))
-		p->m_pd.m_pause();
-} /* End of 'outp_pause' function */
-
-/* Resume playing */
-void outp_resume( out_plugin_t *p )
-{
-	if (p != NULL && (p->m_pd.m_resume != NULL))
-		p->m_pd.m_resume();
-} /* End of 'outp_resume' function */
-
-/* Set volume */
-void outp_set_volume( out_plugin_t *p, int left, int right )
-{
-	if (p != NULL && (p->m_pd.m_set_volume != NULL))
-		p->m_pd.m_set_volume(left, right);
-} /* End of 'outp_set_volume' function */
-
-/* Get volume */
-void outp_get_volume( out_plugin_t *p, int *left, int *right )
-{
-	if (p != NULL && (p->m_pd.m_get_volume != NULL))
-		p->m_pd.m_get_volume(left, right);
-	else
-		*left = *right = 0;
-} /* End of 'outp_get_volume' function */
-
-/* Set mixer type */
-void outp_set_mixer_type( out_plugin_t *p, plugin_mixer_type_t type )
-{
-	if (p != NULL && (p->m_pd.m_set_mixer_type != NULL))
-		p->m_pd.m_set_mixer_type(type);
-} /* End of 'out_set_mixer_type' function */
-
-/* Get plugin flags */
-dword outp_get_flags( out_plugin_t *p )
-{
-	if (p != NULL)
-		return p->m_pd.m_flags;
-	else
-		return 0;
-} /* End of 'outp_get_flags' function */
-
-/* End of 'outp.c' file */
-

mpfc-1.3.8.1.tar.bz2/libmpfc/vfs.c Deleted

@@ -1,630 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Virtual file system functions implementation.
- * $Id: vfs.c 307 2011-03-13 11:58:47Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <ctype.h>
-#include <dirent.h>
-#include <fnmatch.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include "types.h"
-#include "inp.h"
-#include "pmng.h"
-#include "vfs.h"
-#include "util.h"
-
-/* Check if symbol is a special pattern symbol */
-#define VFS_SYM_SPECIAL(ch, space_is_special) \
-		((ch) == '*' || (ch) == '?' || (ch) == '' || (ch) == '' || \
-				(ch) == '~' || ((space_is_special) && (ch) == ' '))
-
-/* Initialize VFS */
-vfs_t *vfs_init( pmng_t *pmng )
-{
-	vfs_t *vfs;
-
-	/* Allocate memory */
-	vfs = (vfs_t *)malloc(sizeof(*vfs));
-	if (vfs == NULL)
-		return NULL;
-	memset(vfs, 0, sizeof(*vfs));
-
-	/* Set fields */
-	vfs->m_pmng = pmng;
-	return vfs;
-} /* End of 'vfs_init' function */
-
-/* Free VFS */
-void vfs_free( vfs_t *vfs )
-{
-	assert(vfs);
-	free(vfs);
-} /* End of 'vfs_free' function */
-
-/* List files matching pattern */
-void vfs_glob( vfs_t *vfs, char *pattern, vfs_callback_t callback, void *data,
-		int max_level, vfs_glob_flags_t flags )
-{
-	char *full_pattern;
-	in_plugin_t *inp;
-	str_t *abs_pattern;
-	vfs_glob_list_t *list, *new_list, *matches;
-	str_t *prefix;
-	int bare_slash = FALSE;
-	bool_t not_fixed_vfs = FALSE;
-
-	/* Get plugin */
-	full_pattern = pattern;
-	inp = vfs_plugin_from_prefix(vfs, pattern, &pattern);
-	prefix = str_substring_cptr(full_pattern, 0, pattern - full_pattern - 1);
-	
-	/* Convert name to absolute */
-	abs_pattern = vfs_pattern2absolute(vfs, inp, pattern);
-	if (abs_pattern == NULL)
-		return;
-	if (STR_AT(abs_pattern, STR_LEN(abs_pattern) - 1) == '/' &&
-			STR_LEN(abs_pattern) > 1)
-		str_delete_char(abs_pattern, STR_LEN(abs_pattern) - 1);
-	bare_slash = (STR_LEN(abs_pattern) == 1);
-	str_insert_str(abs_pattern, prefix, 0);
-
-	/* If plugin does not have fixed VFS we must use NOPATTERN flag */
-	if (VFS_INP_HAS(inp) && (inp_get_flags(inp) & INP_VFS_NOT_FIXED))
-	{
-		flags |= VFS_GLOB_NOPATTERN;
-		not_fixed_vfs = TRUE;
-	}
-
-	/* Create list of files matching pattern */
-	if (!bare_slash && !not_fixed_vfs &&
-			(!(flags & VFS_GLOB_NOPATTERN) || STR_LEN(prefix) > 0) &&
-			(file_get_type(pattern) == FILE_TYPE_REGULAR))
-	{
-		int index1, index2;
-		char *s, *ap;
-
-		/* Start from root directory */
-		list = vfs_glob_list_new();
-		vfs_glob_list_add(list, str_cat_cptr(str_dup(prefix), "/"));
-		index1 = STR_LEN(prefix);
-
-		/* Go into sub-directories */
-		ap = STR_TO_CPTR(abs_pattern);
-		for ( ;; )
-		{
-			str_t *cur_pattern;
-			struct vfs_glob_list_item_t *dir;
-			bool_t finish = FALSE;
-
-			/* Get part of the pattern respecting to current directory level */
-			s = strchr(&apindex1 + 1, '/');
-			if (s == NULL)
-			{
-				index2 = STR_LEN(abs_pattern);
-				finish = TRUE;
-			}
-			else
-				index2 = (s - ap);
-			cur_pattern = str_substring(abs_pattern, index1 + 1, index2 - 1);
-
-			/* Find files matching pattern */
-			new_list = vfs_glob_list_new();
-			for ( dir = list->m_head; dir != NULL; dir = dir->m_next )
-			{
-				vfs_dir_t *dh;
-				vfs_file_t fd;
-
-				/* Enumerate files in directory */
-				vfs_file_desc_init(vfs, &fd, STR_TO_CPTR(dir->m_name), inp);
-				dh = vfs_opendir(vfs, &fd);
-				if (dh == NULL)
-				{
-					logger_error(VFS_LOGGER(vfs), 1, 
-							_("Unable to read directory %s"), fd.m_full_name);
-					continue;
-				}
-				for ( ;; )
-				{
-					bool_t matches = FALSE;
-
-					/* Get file name */
-					char *name = vfs_readdir(dh);
-					if (name == NULL)
-						break;
-
-					/* Check if file matches */
-					if (!strcmp(name, ".") || !strcmp(name, ".."))
-						matches = (!strcmp(STR_TO_CPTR(cur_pattern), name));
-					else
-						matches = (!fnmatch(STR_TO_CPTR(cur_pattern), 
-									name, FNM_PERIOD));
-					if (matches)
-					{
-						vfs_glob_list_add(new_list, 
-								vfs_cat_dir_and_name(dir->m_name, name));
-					}
-				}
-				vfs_closedir(dh);
-			}
-
-			/* Move to next directory */
-			vfs_glob_list_free(list);
-			str_free(cur_pattern);
-			index1 = index2;
-			list = new_list;
-
-			/* Finish */
-			if (finish)
-			{
-				matches = new_list;
-				break;
-			}
-		}
-	}
-	else
-	{
-		matches = vfs_glob_list_new();
-		vfs_glob_list_add(matches, str_dup(abs_pattern));
-	}
-
-	/* Visit the files */
-	vfs_glob_list_sort(matches);
-	vfs_visit_matches(vfs, inp, matches, callback, data, 0, max_level, flags);
-
-	/* Free memory */
-	vfs_glob_list_free(matches);
-	str_free(prefix);
-	str_free(abs_pattern);
-} /* End of 'vfs_glob' function */
-
-/* Visit glob match */
-void vfs_visit_match( vfs_t *vfs, vfs_file_t *file, vfs_callback_t callback, 
-		void *data, int level, int max_level, vfs_glob_flags_t flags )
-{
-	struct stat st;
-	int ret;
-
-	/* Check recursion level */
-	if (level > max_level)
-		return;
-
-	/* Get file parameters */
-	if (file->m_stat_return != 0)
-	{
-		logger_error(VFS_LOGGER(vfs), 1,
-				_("Unable to stat file %s"), file->m_full_name);
-		return;
-	}
-	st = file->m_stat;
-	
-	/* Call callback function */
-	if (((flags & VFS_GLOB_RETURN_DIRS) || !S_ISDIR(st.st_mode)) && 
-			(!(flags & VFS_GLOB_AT_LEVEL_ONLY) || (level == max_level)) && 
-			callback != NULL)
-	{
-		if (flags & VFS_GLOB_OUTPUT_ESCAPED)
-		{
-			vfs_file_t escaped_file;
-			vfs_file_escape(&escaped_file, file, 
-					flags & VFS_GLOB_SPACE_IS_SPECIAL);
-			callback(&escaped_file, data);
-			free(escaped_file.m_full_name);
-		}
-		else
-			callback(file, data);
-	}
-
-	/* In case of directory visit its children */
-	if ((level < max_level) && S_ISDIR(st.st_mode))
-	{
-		vfs_dir_t *dh;
-		vfs_glob_list_t *list;
-		dh = vfs_opendir(vfs, file);
-		if (dh == NULL)
-		{
-			logger_error(VFS_LOGGER(vfs), 1,
-					_("Unable to read directory %s"), file->m_full_name);
-			return;
-		}
-
-		/* Build list of files */
-		list = vfs_glob_list_new();
-		for ( ;; )
-		{
-			str_t *dir_name, *full_name;
-			char *name = vfs_readdir(dh);
-			if (name == NULL)
-				break;
-			if (!(flags & VFS_GLOB_RETURN_SPEC_LINKS) &&
-					(!strcmp(name, ".") || !strcmp(name, "..") ||
-					(vfs && cfg_get_var_bool(vfs->m_pmng->m_cfg_list, "skip-hidden-files") && 
-					 (*name) == '.')))
-				continue;
-
-			dir_name = str_new(file->m_full_name);
-			vfs_glob_list_add(list, vfs_cat_dir_and_name(dir_name, name));
-			str_free(dir_name);
-		}
-		vfs_closedir(dh);
-
-		/* Visit children */
-		vfs_glob_list_sort(list);
-		vfs_visit_matches(vfs, /*file->m_inp*/NULL, list, callback, data, 
-				level + 1, max_level, flags);
-		vfs_glob_list_free(list);
-	}
-} /* End of 'vfs_visit_match' function */
-
-/* Visit list of matches */
-void vfs_visit_matches( vfs_t *vfs, in_plugin_t *inp, vfs_glob_list_t *list,
-		vfs_callback_t callback, void *data, 
-		int level, int max_level, vfs_glob_flags_t flags )
-{
-	struct vfs_glob_list_item_t *file;
-	for ( file = list->m_head; file != NULL; file = file->m_next )
-	{
-		vfs_file_t fd;
-		vfs_file_desc_init(vfs, &fd, STR_TO_CPTR(file->m_name), inp);
-		vfs_visit_match(vfs, &fd, callback, data, level, max_level, flags);
-	}
-} /* End of 'vfs_visit_matches' function */
-
-/* Initialize file descriptor structure */
-void vfs_file_desc_init( vfs_t *vfs, vfs_file_t *file, char *full_name, 
-		in_plugin_t *inp )
-{
-	memset(file, 0, sizeof(*file));
-	file->m_full_name = full_name;
-	file->m_extension = util_extension(full_name);
-	file->m_short_name = util_short_name(full_name);
-
-	/* We know plugin, so we are sure that plugin prefix is specified */
-	if (inp != NULL)
-		file->m_name = strchr(full_name, '/') + 2;
-	/* Find plugin from prefix */
-	else
-		inp = vfs_plugin_from_prefix(vfs, full_name, &file->m_name);
-	/* If there is no prefix - determine plugin from file name */
-	if (inp == NULL && vfs != NULL)
-		inp = pmng_search_format(vfs->m_pmng, file->m_name, file->m_extension);
-	file->m_inp = inp;
-
-	/* Get file parameters */
-	file->m_stat_return = vfs_stat(file, &file->m_stat);
-} /* End of 'vfs_file_desc_init' function */
-
-/* Escape special symbols in file name */
-void vfs_file_escape( vfs_file_t *dest, vfs_file_t *src, 
-		bool_t space_is_special )
-{
-	int num_special = 0;
-	int prefix_len, src_len, i, j;
-	char *s, *full_name;
-	assert(dest);
-	assert(src);
-
-	/* Calculate number of special symbols */
-	for ( s = src->m_name; *s; s ++ )
-		if (VFS_SYM_SPECIAL(*s, space_is_special))
-			num_special ++;
-
-	/* Initialize name */
-	src_len = strlen(src->m_full_name);
-	prefix_len = src->m_name - src->m_full_name;
-	full_name = (char *)malloc(src_len + num_special + 1);
-	for ( i = 0, j = 0; i <= src_len; i ++ )
-	{
-		if ((i >= prefix_len) && 
-				VFS_SYM_SPECIAL(src->m_full_namei, space_is_special))
-			full_namej ++ = '\\';
-		full_namej ++ = src->m_full_namei;
-	}
-
-	/* Initialize file descriptor */
-	memcpy(dest, src, sizeof(*src));
-	dest->m_full_name = full_name;
-	dest->m_name = full_name + (src->m_name - src->m_full_name);
-	dest->m_short_name = util_short_name(full_name);
-	dest->m_extension = util_extension(full_name);
-} /* End of 'vfs_file_escape' function */
-
-/* Get input plugin from the plugin prefix. Also return file name without
- * prefix */
-in_plugin_t *vfs_plugin_from_prefix( vfs_t *vfs, char *full_name, char **name )
-{
-	plugin_t *inp;
-
-	if (vfs == NULL || vfs->m_pmng == NULL)
-	{
-		(*name) = full_name;
-		return NULL;
-	}
-
-	/* Skip until plugin name */
-	(*name) = full_name;
-	while (isalnum(**name) || (**name) == '_' || (**name) == '-')
-		(*name) ++;
-
-	/* No plugin prefix found */
-	if (strncmp(*name, "://", 3))
-	{
-		(*name) = full_name;
-		return NULL;
-	}
-
-	/* Search for this plugin */
-	(**name) = 0;
-	inp = pmng_search_by_name(vfs->m_pmng, full_name, PLUGIN_TYPE_INPUT);
-	(**name) = ':';
-	if (inp == NULL)
-		(*name) = full_name;
-	else
-		(*name) += 3;
-	return INPUT_PLUGIN(inp);
-} /* End of 'vfs_plugin_from_prefix' function */
-
-/* Returns absolute path of this pattern */
-str_t *vfs_pattern2absolute( vfs_t *vfs, in_plugin_t *inp, char *pattern )
-{
-	str_t *abs_pattern;
-
-	/* Do things for regular files only */
-	if (file_get_type(pattern) != FILE_TYPE_REGULAR)
-		return str_new(pattern);
-
-	/* Pattern is not absolute */
-	if ((*pattern) != '/')
-	{
-		/* Insert home directory */
-		if ((*pattern) == '~')
-		{
-			char *user_name, *name_end;
-			char was_end;
-
-			/* Extract user name */
-			user_name = pattern + 1;
-			name_end = user_name;
-			while ((*name_end) && (*name_end) != '/')
-				name_end ++;
-			was_end = *name_end;
-			(*name_end) = 0;
-
-			/* Create resulting string */
-			abs_pattern = str_new(util_get_home_dir(user_name));
-			(*name_end) = was_end;
-			str_cat_cptr(abs_pattern, name_end);
-		}
-		/* Insert current directory */
-		else
-		{
-			char dirMAX_FILE_NAME;
-			abs_pattern = str_new(vfs_getcwd(vfs, inp, dir, sizeof(dir)));
-			if (STR_AT(abs_pattern, STR_LEN(abs_pattern) - 1) != '/')
-				str_cat_cptr(abs_pattern, "/");
-			str_cat_cptr(abs_pattern, pattern);
-		}
-	}
-	else
-		abs_pattern = str_new(pattern);
-	return abs_pattern;
-} /* End of 'vfs_pattern2absolute' function */
-
-/* Open directory */
-vfs_dir_t *vfs_opendir( vfs_t *vfs, vfs_file_t *file )
-{
-	vfs_dir_t *dir;
-
-	/* Initialize directory */
-	dir = (vfs_dir_t *)malloc(sizeof(*dir));
-	dir->m_vfs = vfs;
-	dir->m_inp = file->m_inp;
-	if (VFS_INP_HAS(dir->m_inp))
-		dir->m_data = inp_vfs_opendir(dir->m_inp, file->m_name);
-	else
-		dir->m_data = (void *)opendir(file->m_name);
-	if (dir->m_data == NULL)
-	{
-		free(dir);
-		return NULL;
-	}
-	return dir;
-} /* End of 'vfs_opendir' function */
-
-/* Close directory */
-void vfs_closedir( vfs_dir_t *dir )
-{
-	assert(dir);
-	assert(dir->m_data);
-	if (VFS_INP_HAS(dir->m_inp))
-		inp_vfs_closedir(dir->m_inp, dir->m_data);
-	else
-		closedir((DIR *)dir->m_data);
-	free(dir);
-} /* End of 'vfs_opendir' function */
-
-/* Read next name from directory */
-char *vfs_readdir( vfs_dir_t *dir )
-{
-	assert(dir);
-	assert(dir->m_data);
-	if (VFS_INP_HAS(dir->m_inp))
-		return inp_vfs_readdir(dir->m_inp, dir->m_data);
-	else
-	{
-		struct dirent *de = readdir((DIR *)(dir->m_data));
-		if (de == NULL)
-			return NULL;
-		return de->d_name;
-	}
-} /* End of 'vfs_readdir' function */
-
-/* Get file parameters */
-int vfs_stat( vfs_file_t *file, struct stat *st )
-{
-	if (file_get_type(file->m_name) != FILE_TYPE_REGULAR)
-	{
-		memset(st, 0, sizeof(*st));
-		st->st_mode = S_IFREG;
-		return 0;
-	}
-
-	if (VFS_INP_HAS(file->m_inp))
-		return inp_vfs_stat(file->m_inp, file->m_name, st);
-	else
-		return stat(file->m_name, st);
-} /* End of 'vfs_stat' function */
-
-/* Get current directory */
-char *vfs_getcwd( vfs_t *vfs, in_plugin_t *inp, char *dir, int size )
-{
-	if (VFS_INP_HAS(inp))
-	{
-		util_strncpy(dir, "/", size);
-		return dir;
-	}
-	else
-		return getcwd(dir, size);
-} /* End of 'vfs_getcwd' function */
-
-/* Initialize list */
-vfs_glob_list_t *vfs_glob_list_new( void )
-{
-	vfs_glob_list_t *list;
-
-	/* Allocate memory */
-	list = (vfs_glob_list_t *)malloc(sizeof(*list));
-	if (list == NULL)
-		return NULL;
-
-	/* Set fields */
-	list->m_head = list->m_tail = NULL;
-	return list;
-} /* End of 'vfs_glob_list_new' function */
-
-/* Free list */
-void vfs_glob_list_free( vfs_glob_list_t *list )
-{
-	struct vfs_glob_list_item_t *item, *next;
-
-	assert(list);
-	for ( item = list->m_head; item != NULL; )
-	{
-		next = item->m_next;
-		str_free(item->m_name);
-		free(item);
-		item = next;
-	}
-	free(list);
-} /* End of 'vfs_glob_list_free' function */
-
-/* Add a file to list */
-void vfs_glob_list_add( vfs_glob_list_t *list, str_t *name )
-{
-	struct vfs_glob_list_item_t *item;
-
-	assert(list);
-	assert(name);
-
-	/* Create item */
-	item = (struct vfs_glob_list_item_t *)malloc(sizeof(*item));
-	item->m_name = name;
-	item->m_next = NULL;
-
-	/* Insert item */
-	if (list->m_tail == NULL)
-		list->m_head = list->m_tail = item;
-	else
-	{
-		list->m_tail->m_next = item;
-		item->m_prev = list->m_tail;
-		list->m_tail = item;
-	}
-} /* End of 'vfs_glob_list_add' function */
-
-/* Sort list */
-void vfs_glob_list_sort( vfs_glob_list_t *list )
-{
-	struct vfs_glob_list_item_t *cur, *next, *item;
-	assert(list);
-
-	if (list->m_head == NULL)
-		return;
-
-	/* Sort */
-	for ( cur = list->m_head->m_next; cur != NULL; cur = next )
-	{
-		char *name = STR_TO_CPTR(cur->m_name);
-		next = cur->m_next;
-
-		/* Insert into list beginning */
-		if (strcasecmp(STR_TO_CPTR(list->m_head->m_name), name) > 0)
-		{
-			if (cur->m_next != NULL)
-				cur->m_next->m_prev = cur->m_prev;
-			if (cur->m_prev != NULL)
-				cur->m_prev->m_next = cur->m_next;
-			cur->m_prev = NULL;
-			cur->m_next = list->m_head;
-			list->m_head->m_prev = cur;
-			list->m_head = cur;
-		}
-		/* Find place for inserting */
-		else
-		{
-			for ( item = list->m_head->m_next; item != cur;
-					item = item->m_next )
-			{
-				if (strcasecmp(STR_TO_CPTR(item->m_name), name) > 0)
-				{
-					if (cur->m_next != NULL)
-						cur->m_next->m_prev = cur->m_prev;
-					if (cur->m_prev != NULL)
-						cur->m_prev->m_next = cur->m_next;
-
-					item->m_prev->m_next = cur;
-					cur->m_prev = item->m_prev;
-					item->m_prev = cur;
-					cur->m_next = item;
-					break;
-				}
-			}
-		}
-	}
-
-	/* Update tail */
-	for ( item = list->m_head; item->m_next != NULL; item = item->m_next);
-	list->m_tail = item;
-} /* End of 'vfs_glob_list_sort' function */
-
-/* Concatenate directory and file name */
-str_t *vfs_cat_dir_and_name( str_t *dir, char *name )
-{
-	str_t *res = str_dup(dir);
-	if (STR_AT(res, STR_LEN(res) - 1) != '/')
-		str_cat_cptr(res, "/");
-	str_cat_cptr(res, name);
-	return res;
-} /* End of 'vfs_cat_dir_and_name' function */
-
-/* End of 'vfs.c' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/charset Deleted

mpfc-1.3.8.1.tar.bz2/plugins/charset/Makefile.am Deleted

mpfc-1.3.8.1.tar.bz2/plugins/charset/Makefile.in Deleted

@@ -1,619 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/charset
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/mpfc-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$^/*$/.*$$,\1,'; \
-  sed_rest='s,^^/*/*,,'; \
-  sed_last='s,^.*/$^/*$$$,\1,'; \
-  sed_butlast='s,/*^/*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
-COMMON_LIBS = @COMMON_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURSES_LIBS = @CURSES_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
-GENCAT = @GENCAT@
-GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GPM_LIBS = @GPM_LIBS@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESOLV_LIBS = @RESOLV_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-ALL_PLUGINS = 
-SUBDIRS = @CHARSET_PLUGINS@
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/charset/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/charset/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
-
-
-# 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:

mpfc-1.3.8.1.tar.bz2/plugins/effect Deleted

mpfc-1.3.8.1.tar.bz2/plugins/effect/Makefile.am Deleted

mpfc-1.3.8.1.tar.bz2/plugins/effect/Makefile.in Deleted

@@ -1,619 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/effect
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/mpfc-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$^/*$/.*$$,\1,'; \
-  sed_rest='s,^^/*/*,,'; \
-  sed_last='s,^.*/$^/*$$$,\1,'; \
-  sed_butlast='s,/*^/*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
-COMMON_LIBS = @COMMON_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURSES_LIBS = @CURSES_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
-GENCAT = @GENCAT@
-GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GPM_LIBS = @GPM_LIBS@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESOLV_LIBS = @RESOLV_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-ALL_PLUGINS = 
-SUBDIRS = @EFFECT_PLUGINS@
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/effect/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/effect/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
-
-
-# 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:

mpfc-1.3.8.1.tar.bz2/plugins/input Deleted

mpfc-1.3.8.1.tar.bz2/plugins/input/Makefile.am Deleted

mpfc-1.3.8.1.tar.bz2/plugins/input/Makefile.in Deleted

@@ -1,619 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/input
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/mpfc-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$^/*$/.*$$,\1,'; \
-  sed_rest='s,^^/*/*,,'; \
-  sed_last='s,^.*/$^/*$$$,\1,'; \
-  sed_butlast='s,/*^/*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
-COMMON_LIBS = @COMMON_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURSES_LIBS = @CURSES_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
-GENCAT = @GENCAT@
-GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GPM_LIBS = @GPM_LIBS@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESOLV_LIBS = @RESOLV_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-ALL_PLUGINS = audiocd mp3 ogg wav flac cue
-SUBDIRS = @INPUT_PLUGINS@
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/input/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/input/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
-
-
-# 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:

mpfc-1.3.8.1.tar.bz2/plugins/input/audiocd Deleted

mpfc-1.3.8.1.tar.bz2/plugins/input/audiocd/Makefile.am Deleted

mpfc-1.3.8.1.tar.bz2/plugins/input/audiocd/Makefile.in Deleted

@@ -1,583 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/input/audiocd
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/mpfc-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(mylibdir)"
-LTLIBRARIES = $(mylib_LTLIBRARIES)
-libaudiocd_la_DEPENDENCIES =
-am_libaudiocd_la_OBJECTS = audiocd.lo cddb.lo
-libaudiocd_la_OBJECTS = $(am_libaudiocd_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libaudiocd_la_SOURCES)
-DIST_SOURCES = $(libaudiocd_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
-COMMON_LIBS = @COMMON_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURSES_LIBS = @CURSES_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
-GENCAT = @GENCAT@
-GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GPM_LIBS = @GPM_LIBS@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESOLV_LIBS = @RESOLV_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-mylib_LTLIBRARIES = libaudiocd.la
-mylibdir = $(libdir)/mpfc/input
-libaudiocd_la_SOURCES = audiocd.c audiocd.h cddb.c cddb.h
-libaudiocd_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@
-INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/input/audiocd/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/input/audiocd/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
-	}
-
-uninstall-mylibLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
-	done
-
-clean-mylibLTLIBRARIES:
-	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
-	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libaudiocd.la: $(libaudiocd_la_OBJECTS) $(libaudiocd_la_DEPENDENCIES) 
-	$(LINK) -rpath $(mylibdir) $(libaudiocd_la_OBJECTS) $(libaudiocd_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audiocd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cddb.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(mylibdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-mylibLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-mylibLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-mylibLTLIBRARIES
-
-
-# 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:

mpfc-1.3.8.1.tar.bz2/plugins/input/audiocd/audiocd.c Deleted

@@ -1,688 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Audio CD input plugin functions implementation.
- * $Id: audiocd.c 307 2011-03-13 11:58:47Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <limits.h>
-#include <linux/cdrom.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <sys/ioctl.h>
-#include <sys/fcntl.h>
-#include <sys/soundcard.h>
-#include "types.h"
-#include "audiocd.h"
-#include "cddb.h"
-#include "inp.h"
-#include "pmng.h"
-#include "song.h"
-#include "song_info.h"
-#include "util.h"
-#include "wnd.h"
-#include "wnd_checkbox.h"
-#include "wnd_combobox.h"
-#include "wnd_dialog.h"
-#include "wnd_editbox.h"
-
-/* Get track number from filename */
-#define acd_fname2trk(name) (strncmp(name, "/track", 6) ? -1 : \
-		atoi(&(name)6) - 1)
-
-/* Calculate track length */
-#define acd_get_trk_len(trk) \
-	((acd_tracks_infotrk.m_end.minute * 60 + acd_tracks_infotrk.m_end.second) - \
-	((acd_tracks_infotrk.m_start.minute * 60 + \
-	  acd_tracks_infotrk.m_start.second)))
-
-/* Get address in frames */
-#define ACD_LBA(msf)	(((msf).minute * 60 + (msf).second) * 75 + (msf).frame)
-#define CDA_MSF_OFFSET	150
-#define MIN(a, b)		((a) < (b) ? (a) : (b))
-#define MIN3(a, b, c)	MIN(MIN((a), (b)), (c))
-
-/* Plugins manager */
-pmng_t *acd_pmng = NULL;
-
-/* Tracks information array */
-struct acd_trk_info_t acd_tracks_infoACD_MAX_TRACKS;
-int acd_num_tracks = 0;
-static int acd_cur_track = -1, acd_cur_frame = -1;
-static bool_t acd_info_read = FALSE;
-
-/* Current time */
-static int acd_time = 0;
-
-/* Whether running first time? */
-static bool_t acd_first_time = TRUE;
-
-/* The next track */
-static char acd_next_songMAX_FILE_NAME = "";
-
-/* Audio device */
-static int audio_fd = -1;
-
-/* Logger */
-logger_t *acd_log = NULL;
-
-/* Plugin description */
-static char *acd_desc = "AudioCD playback plugin";
-
-/* Configuration list */
-cfg_node_t *acd_cfg = NULL;
-
-/* Plugin author */
-static char *acd_author = "Sergey E. Galanov <sgsoftware@mail.ru>";
-
-/* Whether we are in digital mode? */
-static bool_t acd_digital_mode = FALSE;
-
-/* Prepare cdrom for ioctls */
-static int acd_prepare_cd( void )
-{
-	int fd;
-	char *dev;
-
-	/* Get device name */
-	dev = cfg_get_var(acd_cfg, "device");
-	if (dev == NULL)
-		dev = "/dev/cdrom";
-	
-	/* Open device */
-	fd = open(dev, O_RDONLY|O_NONBLOCK);
-	if (fd < 0)
-		return fd;
-
-	/* Check drive */
-	if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) != CDS_DISC_OK)
-	{
-		close(fd);
-		return -1;
-	}
-	return fd;
-} /* End of 'acd_prepare_cd' function */
-
-/* Start play function */
-bool_t acd_start( char *filename )
-{
-	int fd, track;
-	struct cdrom_msf msf;
-	struct cdrom_subchnl info;
-	bool_t playing = FALSE;
-	int mixer_fd;
-	int format = AFMT_S16_LE, ch = 2, rate = 44100;
-
-	/* Query playing mode */
-	acd_digital_mode = cfg_get_var_bool(acd_cfg, "digital-mode");
-
-	/* Open device */
-	if ((fd = acd_prepare_cd()) < 0)
-		return FALSE;
-
-	/* Load tracks information */
-	acd_load_tracks(fd);
-
-	/* Get track number from filename */
-	track = acd_fname2trk(filename);
-	if (track < 0 || track >= acd_num_tracks || 
-			track > acd_tracks_infoacd_num_tracks - 1.m_number)
-		return FALSE;
-	acd_cur_track = track;
-	acd_cur_frame = ACD_LBA(acd_tracks_infoacd_cur_track.m_start);
-
-	/* Start playing */
-	if (!acd_digital_mode)
-	{
-		msf.cdmsf_min0 = acd_tracks_infotrack.m_start.minute;
-		msf.cdmsf_sec0 = acd_tracks_infotrack.m_start.second;
-		msf.cdmsf_frame0 = acd_tracks_infotrack.m_start.frame;
-		msf.cdmsf_min1 = acd_tracks_infotrack.m_end.minute;
-		msf.cdmsf_sec1 = acd_tracks_infotrack.m_end.second;
-		msf.cdmsf_frame1 = acd_tracks_infotrack.m_end.frame;
-		if (ioctl(fd, CDROMPLAYMSF, &msf) < 0)
-		{
-			close(fd);
-			return FALSE;
-		}
-	}
-	acd_time = 0;
-	acd_info_read = FALSE;
-	util_strncpy(acd_next_song, "", sizeof(acd_next_song));
-
-	/* Close device */
-	close(fd);
-
-	if (!acd_digital_mode)
-	{
-		/* Set recording source as cd */
-		mixer_fd = open("/dev/mixer", O_WRONLY);
-		if (mixer_fd >= 0)
-		{
-			int mask = SOUND_MASK_CD;
-			ioctl(mixer_fd, SOUND_MIXER_WRITE_RECSRC, &mask);
-			close(mixer_fd);
-		}
-
-		/* Open audio device (for reading audio data) */
-		audio_fd = open("/dev/dsp", O_RDONLY);
-		if (audio_fd >= 0)
-		{
-			ioctl(audio_fd, SNDCTL_DSP_SETFMT, &format);
-			ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &ch);
-			ioctl(audio_fd, SNDCTL_DSP_SPEED, &rate);
-		}
-	}
-	
-	/* Open audio device */
-	return TRUE;
-} /* End of 'acd_start' function */
-
-/* End playing function */
-void acd_end( void )
-{
-	int fd;
-
-	if (acd_digital_mode)
-		return;
-
-	/* Open device */
-	acd_time = 0;
-	acd_info_read = FALSE;
-	if ((fd = acd_prepare_cd()) < 0)
-		return;
-
-	/* Stop playing */
-	ioctl(fd, CDROMPAUSE, 0);
-
-	/* Close device */
-	close(fd);
-	cddb_free();
-
-	if (audio_fd >= 0)
-	{
-		close(audio_fd);
-		audio_fd = -1;
-	}
-} /* End of 'acd_end' function */
-
-/* Get length */
-static int acd_get_len( char *filename )
-{
-	int track;
-	
-	track = acd_fname2trk(filename);
-	if (track < 0 || track >= acd_num_tracks || 
-			track > acd_tracks_infoacd_num_tracks - 1.m_number)
-		return 0;
-	return acd_tracks_infotrack.m_len;
-} /* End of 'acd_get_len' function */
-
-/* Get stream in analog mode function */
-int acd_get_stream_analog( void *buf, int size )
-{
-	int fd;
-	struct cdrom_subchnl info;
-
-	/* Check if we are playing now */
-	if ((fd = acd_prepare_cd()) < 0)
-		return 0;
-	info.cdsc_format = CDROM_MSF;
-	if (ioctl(fd, CDROMSUBCHNL, &info) < 0)
-	{
-		close(fd);
-		return 0;
-	}
-	close(fd);
-	if (info.cdsc_audiostatus == CDROM_AUDIO_COMPLETED ||
-			info.cdsc_audiostatus == CDROM_AUDIO_ERROR)
-		return 0;
-	acd_time = (ACD_LBA(info.cdsc_absaddr.msf) - 
-		ACD_LBA(acd_tracks_infoacd_cur_track.m_start)) / 75;
-	if (ACD_LBA(info.cdsc_absaddr.msf) >=
-			ACD_LBA(acd_tracks_infoacd_cur_track.m_end) - 20)
-		return 0;
-
-	/* Read audio data */
-	if (audio_fd >= 0)
-	{
-		int ret_size = read(audio_fd, buf, size);
-		if (ret_size > 0)
-			size = ret_size;
-	}
-	return size;
-} /* End of 'acd_get_stream_analog' function */
-
-/* Get stream in digital mode function */
-int acd_get_stream_digital( void *buf, int size )
-{
-	int fd;
-	struct cdrom_read_audio cdra;
-	int last_frame;
-
-	/* Check if we are playing now */
-	if ((fd = acd_prepare_cd()) < 0)
-		return 0;
-
-	/* Check track boundaries */
-	last_frame = ACD_LBA(acd_tracks_infoacd_cur_track.m_end);
-	if (acd_cur_frame >= last_frame)
-	{
-		close(fd);
-		return 0;
-	}
-
-	acd_time = (acd_cur_frame - ACD_LBA(acd_tracks_infoacd_cur_track.m_start)) / 75;
-
-	memset(&cdra, 0, sizeof(cdra));
-	cdra.addr.lba = acd_cur_frame - CDA_MSF_OFFSET;
-	cdra.addr_format = CDROM_LBA;
-	cdra.buf = buf;
-	cdra.nframes = MIN3(8, size / CD_FRAMESIZE_RAW, last_frame - acd_cur_frame);
-	acd_cur_frame += cdra.nframes;
-	if (ioctl(fd, CDROMREADAUDIO, &cdra) != 0)
-	{
-		close(fd);
-		return -1;
-	}
-
-	close(fd);
-	return cdra.nframes * CD_FRAMESIZE_RAW;
-} /* End of 'acd_get_stream_digital' function */
-
-/* Get stream function */
-int acd_get_stream( void *buf, int size )
-{
-	if (acd_digital_mode)
-		return acd_get_stream_digital(buf, size);
-	else
-		return acd_get_stream_analog(buf, size);
-} /* End of 'acd_get_stream' function */
-
-/* Pause */
-void acd_pause( void )
-{
-	int fd;
-
-	if (acd_digital_mode)
-		return;
-
-	/* Open device */
-	if ((fd = acd_prepare_cd()) < 0)
-		return;
-
-	/* Pause */
-	if (ioctl(fd, CDROMPAUSE, 0) < 0)
-	{
-		close(fd);
-		return;
-	}
-
-	/* Close device */
-	close(fd);
-} /* End of 'acd_pause' function */
-
-/* Resume */
-void acd_resume( void )
-{
-	int fd;
-
-	if (acd_digital_mode)
-		return;
-
-	/* Open device */
-	if ((fd = acd_prepare_cd()) < 0)
-		return;
-
-	/* Pause */
-	if (ioctl(fd, CDROMRESUME, 0) < 0)
-	{
-		close(fd);
-		return;
-	}
-
-	/* Close device */
-	close(fd);
-} /* End of 'acd_resume' function */
-
-/* Seek */
-void acd_seek( int shift )
-{
-	int fd;
-	struct cdrom_subchnl info;
-	struct cdrom_msf msf;
-
-	if (acd_cur_track < 0 || acd_cur_track >= acd_num_tracks)
-		return;
-
-	/* Digital mode */
-	if (acd_digital_mode)
-	{
-		acd_cur_frame = ACD_LBA(acd_tracks_infoacd_cur_track.m_start) + shift * 75;
-		return;
-	}
-
-	/* Start playing from new position */
-	if ((fd = acd_prepare_cd()) < 0)
-		return;
-	shift = acd_tracks_infoacd_cur_track.m_start.minute * 60 + 
-		acd_tracks_infoacd_cur_track.m_start.second + shift;
-	msf.cdmsf_min0 = shift / 60;
-	msf.cdmsf_sec0 = shift % 60;
-	msf.cdmsf_frame0 = 0;
-	msf.cdmsf_min1 = acd_tracks_infoacd_cur_track.m_end.minute;
-	msf.cdmsf_sec1 = acd_tracks_infoacd_cur_track.m_end.second;
-	msf.cdmsf_frame1 = acd_tracks_infoacd_cur_track.m_end.frame;
-	if (ioctl(fd, CDROMPLAYMSF, &msf) < 0)
-	{
-		close(fd);
-		return;
-	}
-
-	/* Close device */
-	close(fd);
-} /* End of 'acd_seek' function */
-
-/* Get audio parameters */
-void acd_get_audio_params( int *ch, int *freq, dword *fmt, int *bitrate )
-{
-	*ch = 2;
-	*freq = 44100;
-	*fmt = 0;
-	*bitrate = 0;
-} /* End of 'acd_get_audio_params' function */
-
-/* Get current time */
-int acd_get_cur_time( void ) 
-{
-	return acd_time;
-} /* End of 'acd_get_cur_time' function */
-
-/* Get song info */
-song_info_t *acd_get_info( char *filename, int *len )
-{
-	int track;
-
-	/* Get length */
-	*len = acd_get_len(filename);
-
-	/* Get track number from filename */
-	track = acd_fname2trk(filename);
-	if (track < 0 || track >= acd_num_tracks || 
-			track > acd_tracks_infoacd_num_tracks - 1.m_number)
-		return NULL;
-
-	/* Read whole disc info */
-	if (!cddb_read())
-		return si_new();
-
-	/* Save info for specified track */
-	return cddb_get_trk_info(track);
-} /* End of 'acd_get_info' function */
-
-/* Save song info */
-bool_t acd_save_info( char *filename, song_info_t *info )
-{
-	int track;
-
-	/* Get track number from filename */
-	track = acd_fname2trk(filename);
-	if (track < 0 || track >= acd_num_tracks || 
-			track > acd_tracks_infoacd_num_tracks - 1.m_number)
-		return FALSE;
-
-	/* Save info */
-	return cddb_save_trk_info(track, info);
-} /* End of 'acd_save_info' function */
-
-/* Set next song name */
-void acd_set_next_song( char *name )
-{
-	if (name == NULL)
-		strcpy(acd_next_song, "");
-	else
-		util_strncpy(acd_next_song, name, sizeof(acd_next_song));
-} /* End of 'acd_set_next_song' function */
-
-/* Open directory */
-void *acd_opendir( char *name )
-{
-	acd_dir_data_t *data;
-	int fd;
-
-	/* Load tracks */
-	fd = acd_prepare_cd();
-	if (fd < 0)
-		return NULL;
-	acd_load_tracks(fd);
-	close(fd);
-	if (acd_num_tracks == 0)
-		return NULL;
-	
-	/* Create directory data */
-	data = (acd_dir_data_t *)malloc(sizeof(*data));
-	data->m_next_track = 0;
-	return data;
-} /* End of 'acd_opendir' function */
-
-/* Close directory */
-void acd_closedir( void *dir )
-{
-	assert(dir);
-	free(dir);
-} /* End of 'acd_closedir' function */
-
-/* Read directory entry */
-char *acd_readdir( void *dir )
-{
-	acd_dir_data_t *data = (acd_dir_data_t *)dir;
-
-	assert(dir);
-
-	/* Finish */
-	if (data->m_next_track >= acd_num_tracks)
-		return NULL;
-
-	/* Return next track name */
-	return acd_tracks_infodata->m_next_track ++.m_name;
-} /* End of 'acd_readdir' function */
-
-/* Get file parameters */
-int acd_stat( char *name, struct stat *sb )
-{
-	memset(sb, 0, sizeof(*sb));
-	if (!strcmp(name, "/"))
-	{
-		sb->st_mode = S_IFDIR;
-		return 0;
-	}
-	else if (!strncmp(name, "/track", 6))
-	{
-		int track = (name6 - '0') * 10 + (name7 - '0');
-		if (track >= 1 && track <= acd_num_tracks)
-		{
-			sb->st_mode = S_IFREG;
-			return 0;
-		}
-	}
-	return ENOENT;
-} /* End of 'acd_stat' function */
-
-/* Get plugin mixer type */
-plugin_mixer_type_t acd_get_mixer_type( void )
-{
-	return (cfg_get_var_bool(acd_cfg, "digital-mode") ? 
-			PLUGIN_MIXER_PCM : PLUGIN_MIXER_CD);
-} /* End of 'acd_get_mixer_type' function */
-
-/* Handle 'ok_clicked' message for configuration dialog */
-wnd_msg_retcode_t acd_on_configure( wnd_t *wnd )
-{
-	editbox_t *device_eb, *host_eb, *cat_eb, *email_eb;
-	checkbox_t *digital_cb;
-	
-	device_eb = EDITBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), "device"));
-	digital_cb = CHECKBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), "digital"));
-	host_eb = EDITBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), "host"));
-	cat_eb = EDITBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), "category"));
-	email_eb = EDITBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), "email"));
-	assert(device_eb && host_eb && cat_eb && email_eb);
-	cfg_set_var(acd_cfg, "device", EDITBOX_TEXT(device_eb));
-	cfg_set_var_bool(acd_cfg, "digital-mode", digital_cb->m_checked);
-	cfg_set_var(acd_cfg, "cddb-host", EDITBOX_TEXT(host_eb));
-	cfg_set_var(acd_cfg, "cddb-email", EDITBOX_TEXT(email_eb));
-	cfg_set_var(acd_cfg, "cddb-category", EDITBOX_TEXT(cat_eb));
-	return WND_MSG_RETCODE_OK;
-} /* End of 'acd_on_configure' function */
-
-/* Launch configuration dialog */
-void acd_configure( wnd_t *parent )
-{
-	dialog_t *dlg;
-	combo_t *category;
-	vbox_t *vbox;
-	int i;
-
-	dlg = dialog_new(parent, _("Configure AudioCD plugin"));
-	editbox_new_with_label(WND_OBJ(dlg->m_vbox), _("CD &device: "), 
-			"device", cfg_get_var(acd_cfg, "device"), 'd', 50);
-	checkbox_new(WND_OBJ(dlg->m_vbox), _("Use di&gital mode"), 
-			"digital", 'g', cfg_get_var_bool(acd_cfg, "digital-mode"));
-	vbox = vbox_new(WND_OBJ(dlg->m_vbox), _("CDDB parameters"), 0);
-	editbox_new_with_label(WND_OBJ(vbox), _("&Host: "), 
-			"host", cfg_get_var(acd_cfg, "cddb-host"), 'h', 50);
-	editbox_new_with_label(WND_OBJ(vbox), _("&Email: "), 
-			"email", cfg_get_var(acd_cfg, "cddb-email"), 'e', 50);
-	category = combo_new_with_label(WND_OBJ(vbox), _("Disc c&ategory: "),
-			"category", "", 'a', 50, cddb_num_cats + 1);
-	for ( i = 0; i < cddb_num_cats; i ++ )
-		combo_add_item(category, cddb_catsi);
-	editbox_set_text(EDITBOX_OBJ(category), 
-			cfg_get_var(acd_cfg, "cddb-category"));
-	wnd_msg_add_handler(WND_OBJ(dlg), "ok_clicked", acd_on_configure);
-	dialog_arrange_children(dlg);
-} /* End of 'acd_configure' function */
-
-/* Get plugin flags */
-dword acd_get_plugin_flags( void )
-{
-	dword flags;
-	flags = INP_OWN_SOUND | INP_VFS;
-
-	/* In digital mode we use output plugin */
-	if (cfg_get_var_bool(acd_cfg, "digital-mode"))
-		flags &= (~INP_OWN_SOUND);
-	return flags;
-} /* End of 'acd_get_plugin_flags' function */
-
-/* Exchange data with main program */
-void plugin_exchange_data( plugin_data_t *pd )
-{
-	pd->m_desc = acd_desc;
-	pd->m_author = acd_author;
-	pd->m_configure = acd_configure;
-	INP_DATA(pd)->m_start = acd_start;
-	INP_DATA(pd)->m_end = acd_end;
-	INP_DATA(pd)->m_get_stream = acd_get_stream;
-	INP_DATA(pd)->m_seek = acd_seek;
-	INP_DATA(pd)->m_get_audio_params = acd_get_audio_params;
-	INP_DATA(pd)->m_flags = INP_OWN_SOUND | INP_VFS;
-	INP_DATA(pd)->m_pause = acd_pause;
-	INP_DATA(pd)->m_resume = acd_resume;
-	INP_DATA(pd)->m_get_cur_time = acd_get_cur_time;
-	INP_DATA(pd)->m_get_info = acd_get_info;
-	INP_DATA(pd)->m_save_info = acd_save_info;
-	INP_DATA(pd)->m_set_song_title = acd_set_song_title;
-	INP_DATA(pd)->m_set_next_song = acd_set_next_song;
-	INP_DATA(pd)->m_vfs_opendir = acd_opendir;
-	INP_DATA(pd)->m_vfs_closedir = acd_closedir;
-	INP_DATA(pd)->m_vfs_readdir = acd_readdir;
-	INP_DATA(pd)->m_vfs_stat = acd_stat;
-	INP_DATA(pd)->m_get_mixer_type = acd_get_mixer_type;
-	INP_DATA(pd)->m_get_plugin_flags = acd_get_plugin_flags;
-	acd_pmng = pd->m_pmng;
-	acd_log = pd->m_logger;
-	acd_cfg = pd->m_cfg;
-
-	INP_DATA(pd)->m_num_spec_funcs = 2;
-	INP_DATA(pd)->m_spec_funcs = 
-		(inp_spec_func_t *)malloc(sizeof(inp_spec_func_t) * 
-								  INP_DATA(pd)->m_num_spec_funcs);
-	INP_DATA(pd)->m_spec_funcs0.m_title = strdup(_("Reload info from CDDB"));
-	INP_DATA(pd)->m_spec_funcs0.m_flags = 0;
-	INP_DATA(pd)->m_spec_funcs0.m_func = cddb_reload;
-	INP_DATA(pd)->m_spec_funcs1.m_title = strdup(_("Submit info to CDDB"));
-	INP_DATA(pd)->m_spec_funcs1.m_flags = INP_SPEC_SAVE_INFO;
-	INP_DATA(pd)->m_spec_funcs1.m_func = cddb_submit;
-} /* End of 'plugin_exchange_data' function */
-
-/* Set song title */
-str_t *acd_set_song_title( char *filename )
-{
-	int track = acd_fname2trk(filename);
-	str_t *title = str_new("");
-	str_printf(title, "Track %02d", track + 1);
-	return title;
-} /* End of 'acd_set_song_title' function */
-
-/* Load tracks information */
-void acd_load_tracks( int fd )
-{
-	int i;
-
-	/* Read tracks information */
-	if (acd_first_time || ioctl(fd, CDROM_MEDIA_CHANGED, 0))
-	{
-		struct cdrom_tochdr toc;
-		struct cdrom_tocentry entry;
-
-		ioctl(fd, CDROMREADTOCHDR, &toc);
-		acd_num_tracks = toc.cdth_trk1 - toc.cdth_trk0 + 1;
-		entry.cdte_format = CDROM_MSF;
-		for ( i = 0; i < acd_num_tracks; i ++ )
-		{
-			entry.cdte_track = i + toc.cdth_trk0;
-			ioctl(fd, CDROMREADTOCENTRY, &entry);
-			acd_tracks_infoi.m_start = entry.cdte_addr.msf;
-			acd_tracks_infoi.m_data = entry.cdte_ctrl & CDROM_DATA_TRACK;
-			acd_tracks_infoi.m_number = i + toc.cdth_trk0;
-			snprintf(acd_tracks_infoi.m_name, 
-					sizeof(acd_tracks_infoi.m_name), "track%02d", i + 1);
-		}
-		for ( i = 0; i < acd_num_tracks - 1; i ++ )
-		{
-			acd_tracks_infoi.m_end = acd_tracks_infoi + 1.m_start;
-			acd_tracks_infoi.m_len = acd_get_trk_len(i);
-		}
-		entry.cdte_track = CDROM_LEADOUT;
-		ioctl(fd, CDROMREADTOCENTRY, &entry);
-		acd_tracks_infoi.m_end = entry.cdte_addr.msf;
-		acd_tracks_infoi.m_len = acd_get_trk_len(i);
-		acd_first_time = FALSE;
-
-		/* Free CDDB info */
-		cddb_free();
-	}
-} /* End of 'acd_load_tracks' function */
-
-/* End of 'audiocd.c' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/input/audiocd/audiocd.h Deleted

@@ -1,88 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC AudioCD input plugin. Interface for main stuff.
- * $Id: audiocd.h 261 2006-06-06 10:00:32Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_AUDIOCD_H__
-#define __SG_MPFC_AUDIOCD_H__
-
-#include <linux/cdrom.h>
-#include "types.h"
-#include "logger.h"
-#include "mystring.h"
-#include "pmng.h"
-#include "song_info.h"
-
-/* The maximal number of tracks */
-#define ACD_MAX_TRACKS 100
-
-/* Tracks information array */
-extern struct acd_trk_info_t
-{
-	struct cdrom_msf0 m_start;
-	struct cdrom_msf0 m_end;
-	int m_len;
-	int m_number;
-	char m_nameMAX_FILE_NAME;
-	bool_t m_data;
-} acd_tracks_infoACD_MAX_TRACKS;
-extern int acd_num_tracks;
-//extern bool_t acd_info_read;
-
-/* Plugins manager */
-extern pmng_t *acd_pmng;
-
-/* Directory data structure */
-typedef struct
-{
-	int m_next_track;
-} acd_dir_data_t;
-
-/* Get track start frame offset */
-#define acd_get_trk_offset(t) \
-	((acd_tracks_infot.m_start.minute * 60 + \
-				acd_tracks_infot.m_start.second) * 75 + \
-				acd_tracks_infot.m_start.frame)
-
-/* Get disc length */
-#define acd_get_disc_len() \
-	(((acd_tracks_infoacd_num_tracks - 1.m_end.minute * 60 + \
-				acd_tracks_infoacd_num_tracks - 1.m_end.second) * 75 + \
-				acd_tracks_infoacd_num_tracks - 1.m_end.frame) / 75)
-
-/* Logger */
-extern logger_t *acd_log;
-
-/* Configuration list */
-extern cfg_node_t *acd_cfg;
-
-/* Get song info */
-song_info_t *acd_get_info( char *filename, int *len );
-
-/* Set song title */
-str_t *acd_set_song_title( char *filename );
-
-/* Load tracks information */
-void acd_load_tracks( int fd );
-
-#endif
-
-/* End of 'audiocd.h' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/input/audiocd/cddb.c Deleted

@@ -1,693 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC AudioCD input plugin. CDDB support functions 
- * implementation.
- * $Id: cddb.c 308 2011-03-13 12:16:29Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include "types.h"
-#include "audiocd.h"
-#include "cddb.h"
-#include "genre_list.h"
-#include "song_info.h"
-
-/* Maximal line length */
-#define CDDB_MAX_LINE_LEN 256
-
-#define CDDB_BUF_SIZE 65536
-#define CDDB_PORT 8880
-
-/* Data */
-static char **cddb_data = NULL;
-static int cddb_data_len = 0;
-static bool_t cddb_server_found = TRUE;
-
-/* Categories list */
-char *cddb_cats = { "blues", "classical", "country", "data", "folk",
-						"jazz", "misc", "newage", "reggae", "rock",
-						"soundtrack" };
-int cddb_num_cats = sizeof(cddb_cats) / sizeof(cddb_cats0);
-
-/* Initialize CDDB entry for currently playing disc */
-bool_t cddb_read( void )
-{
-	dword id;
-
-	/* Skip if already read */
-	if (cddb_data != NULL)
-		return TRUE;
-	
-	/* Calculate disc ID */
-	id = cddb_id();
-
-	/* Search for entry on local machine */
-	if (cddb_read_local(id))
-		return TRUE;
-//	else if (cddb_read_server(id))
-//		return TRUE;
-	return FALSE;
-} /* End of 'cddb_read' function */
-
-/* Fill song info for specified track */
-song_info_t *cddb_get_trk_info( int track )
-{
-	int i;
-	song_info_t *si;
-	char tr10;
-
-	if (cddb_data == NULL)
-		return si_new();
-
-	si = si_new();
-	for ( i = 0; i < cddb_data_len; i ++ )
-	{
-		char *str = cddb_datai;
-		int j;
-		
-		if (!strncmp(str, "DTITLE", 6))
-		{
-			for ( j = 0; strj && strj != '/'; j ++ );
-			if (strj == '/')
-			{
-				si_set_artist(si, &str7);
-				si->m_artistj - 8 = 0;
-			}
-			else
-			{
-				si_set_artist(si, &str7);
-				continue;
-			}
-			si_set_album(si, &strj + 2);
-		}	
-		else if (!strncmp(str, "DYEAR", 5))
-		{
-			si_set_year(si, &str6);
-		}
-		else if (!strncmp(str, "DGENRE", 6))
-		{
-			si_set_genre(si, &str7);
-		}
-		else if (!strncmp(str, "TTITLE", 6))
-		{
-			char t10;
-			int k;
-			
-			for ( j = 6, tk = 0 = 0; 
-					strj && strj >= '0' && strj <= '9'; 
-					tk ++ = strj, j ++ );
-			tk = 0;
-			if (track == atoi(t))
-				si_set_name(si, &strj + 1);
-		}
-	}
-	sprintf(tr, "%i", track + 1);
-	si_set_track(si, tr);
-	return si;
-} /* End of 'cddb_get_trk_info' function */
-
-/* Calculate disc ID */
-dword cddb_id( void )
-{
-	int i, t, n;
-	struct acd_trk_info_t *toc = acd_tracks_info;
-
-	for ( i = 0, n = 0; i < acd_num_tracks; i ++ )
-		n += cddb_sum(toci.m_start.minute * 60 + toci.m_start.second);
-	t = tocacd_num_tracks - 1.m_end.minute * 60 + 
-		tocacd_num_tracks - 1.m_end.second - 
-			(toc0.m_start.minute * 60 + toc0.m_start.second);
-	return ((n % 0xFF) << 24 | t << 8 | acd_num_tracks);
-} /* End of 'cddb_id' function */
-
-/* Find sum for disc ID */
-int cddb_sum( int n )
-{
-	int ret = 0;
-
-	while (n > 0)
-	{
-		ret += (n % 10);
-		n /= 10;
-	}
-	return ret;
-} /* End of 'cddb_sum' function */
-
-/* Search for CDDB entry on local machine */
-bool_t cddb_read_local( dword id )
-{
-	char fnMAX_FILE_NAME;
-	FILE *fd;
-
-	/* Construct file name and open it */
-	snprintf(fn, sizeof(fn), "%s/.mpfc/cddb/%x", getenv("HOME"), id);
-	fd = fopen(fn, "rt");
-	if (fd == NULL)
-		return FALSE;
-
-	/* Read data */
-	cddb_data_len = 0;
-	while (!feof(fd))
-	{
-		char s256;
-		
-		/* Reallocate memory for data */
-		if (cddb_data == NULL)
-			cddb_data = (char **)malloc(sizeof(char *) * (cddb_data_len + 1));
-		else
-			cddb_data = (char **)realloc(cddb_data, 
-					sizeof(char *) * (cddb_data_len + 1));
-
-		/* Read line */
-		if (fgets(s, CDDB_MAX_LINE_LEN, fd) == NULL)
-			break;
-		if (feof(fd))
-			break;
-		while (sstrlen(s) - 1 == '\n' || sstrlen(s) - 1 == '\r')
-			sstrlen(s) - 1 = 0;
-		cddb_datacddb_data_len ++ = strdup(s);
-	}
-
-	/* Close file */
-	fclose(fd);
-	return TRUE;
-} /* End of 'cddb_read_local' function */
-
-/* Search for CDDB entry on server */
-bool_t cddb_read_server( dword id )
-{
-	int sockfd = -1, i;
-	char bufCDDB_BUF_SIZE;
-	struct hostent *he;
-	struct sockaddr_in their_addr;
-	char hostMAX_FILE_NAME;
-	char category80;
-
-	if (!cddb_server_found)
-		return FALSE;
-
-	/* Get host name */
-	cddb_get_host_name(host);
-
-	/* Get host address */
-	logger_message(acd_log, 1, _("Getting address of %s"), host);
-	he = gethostbyname(host);
-	if (he == NULL)
-		goto close;
-
-	/* Initialize socket and connect */
-	logger_message(acd_log, 1, _("Connecting to %s"), host);
-	sockfd = socket(AF_INET, SOCK_STREAM, 0);
-	if (sockfd < 0)
-		goto close;
-	their_addr.sin_family = AF_INET;
-	their_addr.sin_port = htons(CDDB_PORT);
-	their_addr.sin_addr = *((struct in_addr *)he->h_addr);
-	memset(&(their_addr.sin_zero), 0, 8);
-	if (connect(sockfd, (struct sockaddr *)&their_addr, 
-				sizeof(struct sockaddr)) < 0)
-		goto close;
-
-	/* Communicate with server */
-	logger_message(acd_log, 1, _("Sending query to server"));
-	if (!cddb_server_recv(sockfd, buf, CDDB_BUF_SIZE - 1))
-		goto close;
-	snprintf(buf, sizeof(buf), "cddb hello %s %s mpfc 1.1\n", getenv("USER"), 
-			getenv("HOSTNAME"));
-	if (!cddb_server_send(sockfd, buf, CDDB_BUF_SIZE - 1))
-		goto close;
-	if (!cddb_server_recv(sockfd, buf, CDDB_BUF_SIZE - 1))
-		goto close;
-	snprintf(buf, sizeof(buf), "cddb query %x %i ", id, acd_num_tracks);
-	for ( i = 0; i < acd_num_tracks; i ++ )
-		snprintf(&bufstrlen(buf), sizeof(buf) - strlen(buf), 
-				"%i ", acd_get_trk_offset(i));
-	i --;
-	snprintf(&bufstrlen(buf), sizeof(buf) - strlen(buf),
-			"%i\n", acd_get_disc_len());
-	if (!cddb_server_send(sockfd, buf, CDDB_BUF_SIZE - 1))
-		goto close;
-	if (!cddb_server_recv(sockfd, buf, CDDB_BUF_SIZE - 1))
-		goto close;
-	if (strncmp(buf, "200", 3))
-		goto close;
-	sscanf(&buf4, "%s", category);
-	snprintf(buf, sizeof(buf), "cddb read %s %x\n", category, id);
-	if (!cddb_server_send(sockfd, buf, CDDB_BUF_SIZE - 1))
-		goto close;
-	if (!cddb_server_recv(sockfd, buf, CDDB_BUF_SIZE - 1))
-		goto close;
-	close(sockfd);
-
-	/* Convert to CDDB data */
-	cddb_server2data(buf);
-
-	/* Save data */
-	logger_message(acd_log, 1, _("Saving data"));
-	cddb_save_data(id);
-	logger_message(acd_log, 1, _("Success"));
-	return TRUE;
-close:
-	logger_error(acd_log, 1, _("Failed!"));
-	cddb_server_found = FALSE;
-	if (sockfd >= 0)
-		close(sockfd);
-	return FALSE;
-} /* End of 'cddb_read_server' function */
-
-/* Free stuff */
-void cddb_free( void )
-{
-	if (cddb_data != NULL)
-	{
-		int i;
-		
-		for ( i = 0; i < cddb_data_len; i ++ )
-			free(cddb_datai);
-		free(cddb_data);
-		cddb_data = NULL;
-	}
-	cddb_data_len = 0;
-	cddb_server_found = TRUE;
-} /* End of 'cddb_free' function */
-
-/* Send data to CDDB server */
-bool_t cddb_server_send( int fd, char *buf, int size )
-{
-	int n;
-
-	size = strlen(buf);
-	n = send(fd, buf, size, 0);
-	if (n < 0)
-		return FALSE;
-	return TRUE;
-} /* End of 'cddb_server_send' function */
-
-/* Receice data from CDDB server */
-bool_t cddb_server_recv( int fd, char *buf, int size )
-{
-	int n;
-
-	n = recv(fd, buf, size, 0);
-	if (n < 0)
-		return FALSE;
-	bufn = 0;
-	if (*buf != '2')
-		return FALSE;
-	return TRUE;
-} /* End of 'cddb_server_recv' function */
-
-/* Convert data received from server to our format */
-void cddb_server2data( char *buf )
-{
-	char str256;
-	int i;
-	bool_t start = FALSE;
-
-	/* Free at first */
-	cddb_free();
-
-	/* Add each string */
-	for ( stri = 0 = 0; *buf; buf ++ )
-	{
-		/* End of line */
-		if (*buf == '\n')
-		{
-			if (str0 == '#')
-				start = TRUE;
-			if (start)
-			{
-				if (cddb_data == NULL)
-					cddb_data = (char **)malloc(sizeof(char *) * 
-							(cddb_data_len + 1));
-				else
-					cddb_data = (char **)realloc(cddb_data, sizeof(char *) * 
-							(cddb_data_len + 1));
-				cddb_datacddb_data_len ++ = strdup(str);
-			}
-			stri = 0 = 0;
-		}
-		/* Copy next symbol */
-		else
-		{
-			if (*buf != '\r')
-			{
-				stri = *buf;
-				str++i = 0;
-			}
-		}
-	}
-} /* End of 'cddb_server2data' function */
-
-/* Save CDDB data */
-bool_t cddb_save_data( dword id )
-{
-	char fnMAX_FILE_NAME;
-	FILE *fd;
-	int i;
-
-	if (cddb_data == NULL)
-		return TRUE;
-
-	/* Construct file name and open it */
-	snprintf(fn, sizeof(fn), "%s/.mpfc/cddb/%x", getenv("HOME"), id);
-	fd = fopen(fn, "wt");
-	if (fd == NULL)
-	{
-		logger_error(acd_log, 1, _("Unable to open file %s for writing"), fn);
-		return FALSE;
-	}
-
-	/* Write data */
-	for ( i = 0; i < cddb_data_len; i ++ )
-		fprintf(fd, "%s\n", cddb_datai);
-
-	/* Close file */
-	fclose(fd);
-	return TRUE;
-} /* End of 'cddb_save_data' function */
-
-/* Save track info */
-bool_t cddb_save_trk_info( int track, song_info_t *info )
-{
-	dword id;
-	int i;
-
-	/* Calculate disc ID */
-	id = cddb_id();
-	
-	/* Create new CDDB data */
-	if (cddb_data == NULL)
-	{
-		char str256;
-
-		snprintf(str, sizeof(str), "# xcmd");
-		cddb_data_add(str, -1);
-		snprintf(str, sizeof(str), "#");
-		cddb_data_add(str, -1);
-		snprintf(str, sizeof(str), "# Track frame offsets:");
-		cddb_data_add(str, -1);
-		for ( i = 0; i < acd_num_tracks; i ++ )
-		{
-			snprintf(str, sizeof(str), "#        %i", acd_get_trk_offset(i));
-			cddb_data_add(str, -1);
-		}
-		snprintf(str, sizeof(str), "#");
-		cddb_data_add(str, -1);
-		snprintf(str, sizeof(str), 
-				"# Disc length: %i seconds", acd_get_disc_len());
-		cddb_data_add(str, -1);
-		snprintf(str, sizeof(str), "#");
-		cddb_data_add(str, -1);
-		snprintf(str, sizeof(str), "DISCID=%x", id);
-		cddb_data_add(str, -1);
-		snprintf(str, sizeof(str), 
-				"DTITLE=%s / %s", info->m_artist, info->m_album);
-		cddb_data_add(str, -1);
-		snprintf(str, sizeof(str), "DYEAR=%s", info->m_year);
-		cddb_data_add(str, -1);
-		snprintf(str, sizeof(str), "DGENRE=%s", info->m_genre);
-		cddb_data_add(str, -1);
-		for ( i = 0; i < acd_num_tracks; i ++ )
-		{
-			snprintf(str, sizeof(str), 
-					"TTITLE%i=%s", i, (i == track) ? info->m_name : "");
-			cddb_data_add(str, -1);
-		}
-		snprintf(str, sizeof(str), "EXTD=");
-		cddb_data_add(str, -1);
-		for ( i = 0; i < acd_num_tracks; i ++ )
-		{
-			snprintf(str, sizeof(str), "EXTT%i=", i);
-			cddb_data_add(str, -1);
-		}
-		snprintf(str, sizeof(str), "PLAYORDER=");
-		cddb_data_add(str, -1);
-	}
-	/* Or update existing */
-	else
-	{
-		char str256;
-		char title80;
-		bool_t dtitle = FALSE, dgenre = FALSE, dyear = FALSE, ttitle = FALSE;
-			
-		snprintf(title, sizeof(title), "TTITLE%i=", track);
-		for ( i = 0; i < cddb_data_len; i ++ )
-		{
-			if (!strncmp(cddb_datai, "DTITLE=", 7))
-			{
-				free(cddb_datai);
-				snprintf(str, sizeof(str),
-						"DTITLE=%s / %s", info->m_artist, info->m_album);
-				cddb_datai = strdup(str);
-				dtitle = TRUE;
-			}
-			else if (!strncmp(cddb_datai, "DGENRE=", 7))
-			{
-				free(cddb_datai);
-				snprintf(str, sizeof(str), "DGENRE=%s", info->m_genre);
-				cddb_datai = strdup(str);
-				dgenre = TRUE;
-			}
-			else if (!strncmp(cddb_datai, "DYEAR=", 6))
-			{
-				free(cddb_datai);
-				snprintf(str, sizeof(str), "DYEAR=%s", info->m_year);
-				cddb_datai = strdup(str);
-				dyear = TRUE;
-			}
-			else if (!strncmp(cddb_datai, title, strlen(title)))
-			{
-				free(cddb_datai);
-				snprintf(str, sizeof(str), "%s%s", title, info->m_name);
-				cddb_datai = strdup(str);
-				ttitle = TRUE;
-			}
-		}
-
-		/* If not found any of important fields - insert them */
-		if (!dtitle)
-		{
-			snprintf(str, sizeof(str),
-					"DTITLE=%s / %s", info->m_artist, info->m_album);
-			cddb_data_add(str, -1);
-		}
-		if (!dgenre)
-		{
-			snprintf(str, sizeof(str), "DGENRE=%s", info->m_genre);
-			cddb_data_add(str, -1);
-		}
-		if (!dyear)
-		{
-			snprintf(str, sizeof(str), "DYEAR=%s", info->m_year);
-			cddb_data_add(str, -1);
-		}
-		if (!ttitle)
-		{
-			snprintf(str, sizeof(str), "%s%s", title, info->m_name);
-			cddb_data_add(str, -1);
-		}
-	}
-
-	/* Save data */
-	return cddb_save_data(id);
-} /* End of 'cddb_save_trk_info' function */
-
-/* Add a string to data */
-void cddb_data_add( char *str, int index )
-{
-	/* Reallocate memory for data */
-	cddb_data = (char **)realloc(cddb_data, 
-				sizeof(char *) * (cddb_data_len + 1));
-
-	/* Add string */
-	cddb_datacddb_data_len ++ = strdup(str);
-} /* End of 'cddb_data_add' function */
-
-/* Reload info */
-void cddb_reload( char *filename )
-{
-	dword id;
-	
-	/* Free existing info */
-	cddb_server_found = TRUE;
-	free(cddb_data);
-	cddb_data = NULL;
-
-	/* Calculate disc ID */
-	id = cddb_id();
-
-	/* Read data from server */
-	cddb_read_server(id);
-} /* End of 'cddb_reload' function */
-
-/* Submit info to server */
-void cddb_submit( char *filename )
-{	
-	char *email, *category;
-	int sockfd = -1, i;
-	char bufCDDB_BUF_SIZE;
-	struct hostent *he;
-	struct sockaddr_in their_addr;
-	char hostMAX_FILE_NAME;
-	char *post_str;
-	
-	/* Check data */
-	if (cddb_data == NULL)
-	{
-		logger_error(acd_log, 1,
-				_("CDDB submit error: no existing info found"));
-		return;
-	}
-	
-	/* Check email and category (set through variables) */
-	email = cfg_get_var(acd_cfg, "cddb-email");
-	if (strlen(email) <= 1)
-	{
-		logger_error(acd_log, 1,
-				_("CDDB submit error: you must specify your email address"));
-		return;
-	}
-	category = cfg_get_var(acd_cfg, "cddb-category");
-	if (!cddb_valid_category(category))
-	{
-		logger_error(acd_log, 1,
-				_("CDDB submit error: you must specify your category"));
-		return;
-	}
-
-	/* Get host name */
-	cddb_get_host_name(host);
-
-	/* Get host address */
-	logger_message(acd_log, 1, _("Getting address of %s"), host);
-	he = gethostbyname(host);
-	if (he == NULL)
-		goto close;
-
-	/* Initialize socket and connect */
-	logger_message(acd_log, 1, _("Connecting to %s"), host);
-	sockfd = socket(AF_INET, SOCK_STREAM, 0);
-	if (sockfd < 0)
-		goto close;
-	their_addr.sin_family = AF_INET;
-	their_addr.sin_port = htons(CDDB_PORT);
-	their_addr.sin_addr = *((struct in_addr *)he->h_addr);
-	memset(&(their_addr.sin_zero), 0, 8);
-	if (connect(sockfd, (struct sockaddr *)&their_addr, 
-				sizeof(struct sockaddr)) < 0)
-		goto close;
-
-	/* Communicate with server */
-	logger_message(acd_log, 1, _("Posting data to server"));
-	post_str = cddb_make_post_string(email, category);
-	if (post_str == NULL)
-		goto close;
-	if (!cddb_server_send(sockfd, post_str, strlen(post_str)))
-	{
-		free(post_str);
-		goto close;
-	}
-
-	/* Get response */
-	logger_message(acd_log, 1, _("Getting response"));
-	if (!cddb_server_recv(sockfd, buf, CDDB_BUF_SIZE - 1))
-		goto close;
-	close(sockfd);
-	logger_message(acd_log, 1, "%s", buf);
-	return;
-	
-close:
-	logger_message(acd_log, 1, _("Failure!"));
-	if (sockfd >= 0)
-		close(sockfd);
-} /* End of 'cddb_submit' function */
-
-/* Get host name */
-void cddb_get_host_name( char *name )
-{
-	char *host = cfg_get_var(acd_cfg, "cddb-host");
-	if (host != NULL)
-		strcpy(name, host);
-	else
-		strcpy(name, "freedb.freedb.org");
-} /* End of 'cddb_get_host_name' function */
-
-/* Create string to submit to CDDB */
-char *cddb_make_post_string( char *email, char *category )
-{
-	char *buf;
-	dword id;
-	int i, size = 0;
-
-	/* Calculate disc id */
-	id = cddb_id();
-
-	/* Get needed buffer size */
-	for ( i = 0; i < cddb_data_len; i ++ )
-		if (cddb_datai != NULL)
-			size += strlen(cddb_datai) + 2; 
-
-	/* Allocate memory */
-	buf = (char *)malloc(size + 1024);
-	if (buf == NULL)
-		return NULL;
-
-	/* Fill buffer */
-	snprintf(buf, sizeof(buf),
-			"POST /~cddb/submit.cgi HTTP/1.0\r\nCategory: %s\r\n"
-			"Discid: %x\r\nUser-Mail: %s\r\nSubmut-Mode: submit\r\n"
-			"Charset: ISO-8859-1\r\n"
-			"X-Cddbd-Note: Sent by MPFC\r\n"
-			"Content-Length: %d\r\n\r\n",
-			category, id, email, size);
-	for ( i = 0; i < cddb_data_len; i ++ )
-	{
-		int last;
-
-		strcat(buf, cddb_datai);
-		last = strlen(buf);
-		buflast = '\r';
-		buflast + 1 = '\n';
-		buflast + 2 = 0;
-	}
-	return buf;
-} /* End of 'cddb_make_post_string' function */
-
-/* Check if specified category is valid */
-bool_t cddb_valid_category( char *cat )
-{
-	int i;
-	for ( i = 0; i < cddb_num_cats; i ++ )
-	{
-		if (!strcmp(cat, cddb_catsi))
-			return TRUE;
-	}
-	return FALSE;
-} /* End of 'cdbd_valid_category' function */
-
-/* End of 'cddb.c' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/input/audiocd/cddb.h Deleted

@@ -1,90 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC AudioCD input plugin. Interface for CDDB support functions.
- * $Id: cddb.h 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_AUDIOCD_CDDB_H__
-#define __SG_MPFC_AUDIOCD_CDDB_H__
-
-#include "types.h"
-#include "song_info.h"
-
-/* Categories list */
-extern char *cddb_cats;
-extern int cddb_num_cats;
-
-/* Initialize CDDB entry for currently playing disc */
-bool_t cddb_read( void );
-
-/* Free stuff */
-void cddb_free( void );
-
-/* Fill song info for specified track */
-song_info_t *cddb_get_trk_info( int track );
-
-/* Save track info */
-bool_t cddb_save_trk_info( int track, song_info_t *info );
-
-/* Search for CDDB entry on local machine */
-bool_t cddb_read_local( dword id );
-
-/* Search for CDDB entry on server */
-bool_t cddb_read_server( dword id );
-
-/* Calculate disc ID */
-dword cddb_id( void );
-
-/* Find sum for disc ID */
-int cddb_sum( int n );
-
-/* Send data to CDDB server */
-bool_t cddb_server_send( int fd, char *buf, int size );
-
-/* Receice data from CDDB server */
-bool_t cddb_server_recv( int fd, char *buf, int size );
-
-/* Convert data received from server to our format */
-void cddb_server2data( char *buf );
-
-/* Save CDDB data */
-bool_t cddb_save_data( dword id );
-
-/* Add a string to data */
-void cddb_data_add( char *str, int index );
-
-/* Reload info */
-void cddb_reload( char *filename );
-
-/* Submit info to server */
-void cddb_submit( char *filename );
-
-/* Create string to submit to CDDB */
-char *cddb_make_post_string( char *email, char *category );
-
-/* Get host name */
-void cddb_get_host_name( char *name );
-
-/* Check if specified category is valid */
-bool_t cddb_valid_category( char *cat );
-
-#endif
-
-/* End of 'cddb.h' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/input/cue Deleted

mpfc-1.3.8.1.tar.bz2/plugins/input/cue/Makefile.am Deleted

mpfc-1.3.8.1.tar.bz2/plugins/input/cue/Makefile.in Deleted

@@ -1,587 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/input/cue
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/mpfc-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(mylibdir)"
-LTLIBRARIES = $(mylib_LTLIBRARIES)
-libcue_la_DEPENDENCIES =
-am_libcue_la_OBJECTS = cue.lo cue_sheet.lo
-libcue_la_OBJECTS = $(am_libcue_la_OBJECTS)
-libcue_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libcue_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libcue_la_SOURCES)
-DIST_SOURCES = $(libcue_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
-COMMON_LIBS = @COMMON_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURSES_LIBS = @CURSES_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
-GENCAT = @GENCAT@
-GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GPM_LIBS = @GPM_LIBS@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESOLV_LIBS = @RESOLV_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = $(datadir)/locale
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-mylib_LTLIBRARIES = libcue.la
-mylibdir = $(libdir)/mpfc/input
-libcue_la_SOURCES = cue.c cue_sheet.c cue_sheet.h
-INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-libcue_la_LDFLAGS = -Xcompiler -nostartfiles 
-libcue_la_LIBADD = @COMMON_LIBS@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/input/cue/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/input/cue/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
-	}
-
-uninstall-mylibLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
-	done
-
-clean-mylibLTLIBRARIES:
-	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
-	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libcue.la: $(libcue_la_OBJECTS) $(libcue_la_DEPENDENCIES) 
-	$(libcue_la_LINK) -rpath $(mylibdir) $(libcue_la_OBJECTS) $(libcue_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cue.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cue_sheet.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(mylibdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-mylibLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-mylibLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-mylibLTLIBRARIES
-
-
-# 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:

mpfc-1.3.8.1.tar.bz2/plugins/input/cue/cue.c Deleted

@@ -1,385 +0,0 @@
-/******************************************************************
- * Copyright (C) 2005 by SG Software.
- *
- * SG MPFC. Cue format support plugin.
- * $Id$ 
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-//#include "config.h"
-#include <ctype.h>
-#define __MPFC_OUTER__
-#include <stdio.h>
-#include <stdlib.h>
-#define __USE_GNU
-#include <string.h>
-#include <sys/types.h>
-#include <libgen.h>
-#include <dirent.h>
-#include "types.h"
-#include "cue_sheet.h"
-#include "inp.h"
-#include "pmng.h"
-#include "util.h"
-
-/* Directory data type */
-typedef struct
-{
-	bool_t m_is_cue;
-	union
-	{
-		DIR *m_dir;
-		struct
-		{
-			cue_sheet_t *m_sheet;
-			char *m_cuename;
-			int m_cur_track;
-		} m_cue;
-	} m_data;
-} cue_dir_data_t;
-
-/* Plugins manager */
-static pmng_t *cue_pmng = NULL;
-
-/* Plugin description */
-static char *cue_desc = "Cue format support plugin";
-
-/* Plugin author */
-static char *cue_author = "Sergey E. Galanov <sgsoftware@mail.ru>";
-
-/* Logger */
-static logger_t *cue_log = NULL;
-
-/* Parse cue track name */
-bool_t cue_parse_track_name( char *name, char **cuename, int *track_num )
-{
-	char *dir_sep, *s, *cue_ext;
-	int tn;
-
-	logger_debug(cue_log, "cue: in cue_parse_track_name %s", name);
-
-	/* Parse */
-	dir_sep = strrchr(name, '/');
-	if (dir_sep == NULL)
-	{
-		logger_debug(cue_log, "cue: no directory separator");
-		return FALSE;
-	}
-
-	/* Check that 'directory' name has '.cue' extension */
-	cue_ext = strrchr(name, '.');
-	if (cue_ext == NULL || cue_ext > dir_sep)
-	{
-		logger_debug(cue_log, "cue: extension not found");
-		return FALSE;
-	}
-	if (strncmp(cue_ext, ".cue", 4))
-	{
-		logger_debug(cue_log, "cue: extension test failed");
-		return FALSE;
-	}
-
-	/* Check that track name consists entirely of digits */
-	for ( s = dir_sep + 1; *s; s ++ )
-	{
-		if (!isdigit(*s))
-		{
-			logger_debug(cue_log, "cue: not a digit");
-			return FALSE;
-		}
-	}
-	tn = atoi(dir_sep + 1);
-	if (tn == 0)
-	{
-		logger_debug(cue_log, "cue: track is 0");
-		return FALSE;
-	}
-
-	/* Save */
-	if (cuename != NULL)
-		(*cuename) = strndup(name, dir_sep - name);
-	if (track_num != NULL)
-		(*track_num) = tn;
-	logger_debug(cue_log, "cue: all tests passed");
-	return TRUE;
-} /* End of 'cue_parse_track_name' function */
-
-/* Get song info */
-song_info_t *cue_get_info( char *file_name, int *len )
-{
-	char *cuename;
-	int track_num;
-	cue_sheet_t *cs;
-	cue_track_t *track, *master;
-	song_info_t *si;
-	char track_num_str10;
-
-	(*len) = 0;
-
-	logger_debug(cue_log, "cue: cue_get_info(%s)", file_name);
-
-	/* Load cue sheet */
-	if (!cue_parse_track_name(file_name, &cuename, &track_num))
-		return NULL;
-	logger_debug(cue_log, "cue: cuename is %s, track num is %d", 
-			cuename, track_num);
-	cs = cue_sheet_parse(cuename);
-	if (cs == NULL)
-	{
-		free(cuename);
-		return NULL;
-	}
-
-	/* Get track */
-	if (track_num < 1 || track_num >= cs->m_num_tracks)
-	{
-		cue_sheet_free(cs);
-		free(cuename);
-		return NULL;
-	}
-	track = cs->m_trackstrack_num;
-	master = cs->m_tracks0;
-
-	/* Make info */
-	si = si_new();
-	if (si == NULL)
-	{
-		cue_sheet_free(cs);
-		free(cuename);
-		return NULL;
-	}
-	si_set_album(si, master->m_title);
-	si_set_artist(si, track->m_performer);
-	si_set_name(si, track->m_title);
-	snprintf(track_num_str, sizeof(track_num_str), "%02d", track_num);
-	si_set_track(si, track_num_str);
-
-	/* Free memory */
-	cue_sheet_free(cs);
-	free(cuename);
-	return si;
-} /* End of 'cue_get_info' function */
-
-/* Check if given file is a cue track */
-bool_t cue_is_our_file( char *name )
-{
-	return (!strcmp(util_extension(name), "cue")) || 
-		cue_parse_track_name(name, NULL, NULL);
-} /* End of 'cue_is_our_file' function */
-
-/* Open VFS directory */
-void *cue_opendir( char *name )
-{
-	cue_dir_data_t *dd;
-
-	logger_debug(cue_log, "cue_opendir(%s)", name);
-
-	/* Do cue staff if file has 'cue' extension and is
-	 * in fact not a directory */
-	if (!strcmp(util_extension(name), "cue"))
-	{
-		cue_sheet_t *cs = cue_sheet_parse(name);
-		if (cs == NULL)
-		{
-			logger_error(cue_log, 0, "cue: failed to parse %s", name);
-			return NULL;
-		}
-
-		/* Create data */
-		dd = (cue_dir_data_t *)malloc(sizeof(*dd));
-		if (dd == NULL)
-		{
-			logger_error(cue_log, 0, "cue: no enough memory");
-			cue_sheet_free(cs);
-			return NULL;
-		}
-		dd->m_is_cue = TRUE;
-		dd->m_data.m_cue.m_sheet = cs;
-		dd->m_data.m_cue.m_cuename = strdup(name);
-		if (dd->m_data.m_cue.m_cuename == NULL)
-		{
-			logger_error(cue_log, 0, "cue: no enough memory");
-			free(dd);
-			cue_sheet_free(cs);
-			return NULL;
-		}
-		dd->m_data.m_cue.m_cur_track = 0;
-		return dd;
-	}
-
-	/* A normal directory */
-	dd = (cue_dir_data_t *)malloc(sizeof(*dd));
-	if (dd == NULL)
-	{
-		logger_error(cue_log, 0, "cue: no enough memory");
-		return NULL;
-	}
-	dd->m_is_cue = FALSE;
-	dd->m_data.m_dir = opendir(name);
-	return dd;
-} /* End of 'cue_opendir' function */
-
-/* Close VFS directory */
-void cue_closedir( void *dir )
-{
-	cue_dir_data_t *dd = (cue_dir_data_t *)dir;
-
-	if (dd == NULL)
-		return;
-
-	if (dd->m_is_cue)
-	{
-		cue_sheet_free(dd->m_data.m_cue.m_sheet);
-		if (dd->m_data.m_cue.m_cuename != NULL)
-			free(dd->m_data.m_cue.m_cuename);
-	}
-	else 
-		closedir(dd->m_data.m_dir);
-	free(dd);
-} /* End of 'cue_closedir' function */
-
-/* Read VFS directory */
-char *cue_readdir( void *dir )
-{
-	cue_dir_data_t *dd = (cue_dir_data_t *)dir;
-	struct dirent *de;
-
-	if (dd == NULL)
-		return NULL;
-
-	if (dd->m_is_cue)
-	{
-		char track_name256;
-
-		int track = ++dd->m_data.m_cue.m_cur_track;
-		if (track >= dd->m_data.m_cue.m_sheet->m_num_tracks)
-			return NULL;
-
-		snprintf(track_name, sizeof(track_name), "%02d", track);
-		return strdup(track_name);
-	}
-
-	de = readdir(dd->m_data.m_dir);
-	return (de == NULL) ? NULL : strdup(de->d_name);
-} /* End of 'cue_readdir' function */
-
-/* Get VFS file parameters */
-int cue_stat( char *name, struct stat *sb )
-{
-	char *ext;
-
-	logger_debug(cue_log, "cue_stat(%s)", name);
-
-	memset(sb, 0, sizeof(*sb));
-
-	/* A cue file is treated as a directory */
-	if (!strcmp(util_extension(name), "cue"))
-	{
-		sb->st_mode = S_IFDIR;
-		return 0;
-	}
-	/* A cue track */
-	else if (cue_parse_track_name(name, NULL, NULL))
-	{
-		sb->st_mode = S_IFREG;
-		return 0;
-	}
-
-	/* A normal file */
-	return stat(name, sb);
-} /* End of 'cue_stat' function */
-
-/* Redirect song */
-char *cue_redirect( char *filename, inp_redirect_params_t *rp )
-{
-	char *sharp_pos;
-	char *cue_name = NULL;
-	int track_num;
-	cue_sheet_t *cs = NULL;
-	cue_track_t *track;
-	char redir_nameMAX_FILE_NAME;
-
-	logger_debug(cue_log, "cue: cue_redirect %s", filename);
-
-	/* Get corresponding cue name and track number */
-	if (!cue_parse_track_name(filename, &cue_name, &track_num))
-		return NULL;
-
-	/* Load cue sheet */
-	cs = cue_sheet_parse(cue_name);
-	if (cs == NULL)
-	{
-		logger_error(cue_log, 0, "cue: failed to load cue sheet %s", cue_name);
-		goto fail;
-	}
-
-	/* Get track */
-	if (track_num < 1 || track_num >= cs->m_num_tracks)
-	{
-		logger_error(cue_log, 0, "cue: no such track: %d", track_num);
-		goto fail;
-	}
-	track = cs->m_trackstrack_num;
-
-	/* Create song object */
-	snprintf(redir_name, sizeof(redir_name), "%s/%s", 
-			dirname(cue_name), cs->m_file_name);
-	logger_debug(cue_log, "cue: redirection name is %s", redir_name);
-
-	/* Set redirection parameters */
-	if (rp != NULL)
-	{
-		memset(rp, 0, sizeof(*rp));
-		rp->m_start_time = track->m_indices1 / 75;
-		rp->m_end_time = (track_num < cs->m_num_tracks - 1) ? 
-			cs->m_trackstrack_num + 1->m_indices1 / 75 : -1;
-		logger_debug(cue_log, "cue: start time is %d, end time is %d", 
-				rp->m_start_time, rp->m_end_time);
-	}
-
-	/* Free memory */
-	cue_sheet_free(cs);
-	free(cue_name);
-	return strdup(redir_name);
-
-fail:
-	if (cs != NULL)
-		cue_sheet_free(cs);
-	if (cue_name != NULL)
-		free(cue_name);
-	return NULL;
-} /* End of 'cue_redirect' function */
-
-/* Exchange data with main program */
-void plugin_exchange_data( plugin_data_t *pd )
-{
-	pd->m_desc = cue_desc;
-	pd->m_author = cue_author;
-	INP_DATA(pd)->m_flags = INP_VFS;
-	INP_DATA(pd)->m_get_info = cue_get_info;
-	INP_DATA(pd)->m_vfs_opendir = cue_opendir;
-	INP_DATA(pd)->m_vfs_closedir = cue_closedir;
-	INP_DATA(pd)->m_vfs_readdir = cue_readdir;
-	INP_DATA(pd)->m_vfs_stat = cue_stat;
-	INP_DATA(pd)->m_is_our_file = cue_is_our_file;
-	INP_DATA(pd)->m_redirect = cue_redirect;
-	cue_pmng = pd->m_pmng;
-	cue_log = pd->m_logger;
-} /* End of 'plugin_exchange_data' function */
-
-/* End of 'cue.c' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/input/cue/cue_sheet.c Deleted

@@ -1,270 +0,0 @@
-/******************************************************************
- * Copyright (C) 2005 by SG Software.
- *
- * MPFC Cue plugin. Cue sheet functions implementation.
- * $Id$
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "types.h"
-#include "cue_sheet.h"
-
-/* Parse cue sheet */
-cue_sheet_t *cue_sheet_parse( char *file_name )
-{
-	FILE *fd;
-	cue_sheet_t *cs = NULL;
-	cue_track_t *cur_track;
-
-	/* Try to open file */
-	fd = fopen(file_name, "rt");
-	if (fd == NULL)
-		goto fail;
-
-	/* Allocate memory */
-	cs = (cue_sheet_t *)malloc(sizeof(*cs));
-	if (cs == NULL)
-		goto fail;
-	memset(cs, 0, sizeof(*cs));
-	cur_track = cue_sheet_add_track(cs);
-	if (cur_track == NULL)
-		goto fail;
-
-	/* Parsing loop */
-	for ( ;; )
-	{
-		char line_buf1024, *line = line_buf;
-		cue_sheet_tag_t tag;
-
-		/* Parse a line */
-		if (feof(fd))
-			break;
-		if (fgets(line, sizeof(line_buf), fd) == NULL)
-			break;
-		tag = cue_sheet_get_line_tag(&line);
-		if (tag == CUE_SHEET_TAG_PERFORMER)
-		{
-			cue_sheet_set_str(&cur_track->m_performer, 
-					cue_sheet_get_string(&line));
-		}
-		else if (tag == CUE_SHEET_TAG_TITLE)
-		{
-			cue_sheet_set_str(&cur_track->m_title, 
-					cue_sheet_get_string(&line));
-		}
-		else if (tag == CUE_SHEET_TAG_FILE)
-		{
-			cue_sheet_set_str(&cs->m_file_name, cue_sheet_get_string(&line));
-		}
-		else if (tag == CUE_SHEET_TAG_TRACK)
-		{
-			cur_track = cue_sheet_add_track(cs);
-			if (cur_track == NULL)
-				goto fail;
-		}
-		else if (tag == CUE_SHEET_TAG_INDEX)
-		{
-			int index_num, timestamp;
-			index_num = cue_sheet_get_int(&line);
-			timestamp = cue_sheet_get_timestamp(&line);
-			if (index_num >= 0 && index_num < MAX_INDICES_COUNT)
-				cur_track->m_indicesindex_num = timestamp;
-		}
-	}
-
-	/* Close file */
-	fclose(fd);
-	return cs;
-fail:
-	if (cs != NULL)
-		cue_sheet_free(cs);
-	if (fd != NULL)
-		fclose(fd);
-	return NULL;
-} /* End of 'cue_sheet_parse' function */
-
-/* Free cue sheet */
-void cue_sheet_free( cue_sheet_t *cs )
-{
-	int i;
-
-	if (cs == NULL)
-		return;
-
-	for ( i = 0; i < cs->m_num_tracks; i ++ )
-	{
-		cue_track_t *track = cs->m_tracksi;
-
-		if (track == NULL)
-			continue;
-
-		if (track->m_title != NULL)
-			free(track->m_title);
-		if (track->m_performer != NULL)
-			free(track->m_performer);
-		free(track);
-	}
-
-	if (cs->m_file_name != NULL)
-		free(cs->m_file_name);
-	if (cs->m_tracks != NULL)
-		free(cs->m_tracks);
-	free(cs);
-} /* End of 'cue_sheet_free' function */
-
-/* Add a new track */
-cue_track_t *cue_sheet_add_track( cue_sheet_t *cs )
-{
-	cue_track_t *track;
-	cue_track_t **list;
-
-	/* Allocate memory */
-	track = (cue_track_t *)malloc(sizeof(*track));
-	if (track == NULL)
-		return NULL;
-	memset(track, 0, sizeof(*track));
-
-	/* Append to sheet */
-	list = (cue_track_t **)realloc(cs->m_tracks, 
-			(cs->m_num_tracks + 1) * sizeof(*cs->m_tracks));
-	if (list == NULL)
-	{
-		free(track);
-		return NULL;
-	}
-	cs->m_tracks = list;
-	cs->m_trackscs->m_num_tracks ++ = track;
-	return track;
-} /* End of 'cue_sheet_add_track' function */
-
-/* Skip whitespace */
-void cue_sheet_skip_ws( char **line )
-{
-	while (isspace(**line))
-		(*line) ++;
-} /* End of 'cue_sheet_skip_ws' function */
-		
-/* Read tag from line */
-cue_sheet_tag_t cue_sheet_get_line_tag( char **line )
-{
-	int i;
-	struct 
-	{
-		char *tag_string;
-		cue_sheet_tag_t tag;
-	} tags = { {"title", CUE_SHEET_TAG_TITLE},
-				 {"performer", CUE_SHEET_TAG_PERFORMER},
-				 {"index", CUE_SHEET_TAG_INDEX},
-				 {"file", CUE_SHEET_TAG_FILE},
-				 {"track", CUE_SHEET_TAG_TRACK},
-				};
-
-	cue_sheet_skip_ws(line);
-
-	for ( i = 0; i < sizeof(tags) / sizeof(*tags); i ++ )
-	{
-		char *s = tagsi.tag_string;
-		int len = strlen(s);
-
-		if (!strncasecmp(*line, s, len))
-		{
-			(*line) += len;
-			return tagsi.tag;
-		}
-	}
-	return CUE_SHEET_TAG_UNKNOWN;
-} /* End of 'cue_sheet_get_line_tag' function */
-
-/* Read a string from line */
-char *cue_sheet_get_string( char **line )
-{
-	int len;
-	char *str, *close_quote;
-
-	cue_sheet_skip_ws(line);
-
-	/* Opening quote */
-	if ((**line) != '\"')
-		return NULL;
-	(*line) ++;
-
-	/* Search for closing quote */
-	close_quote = strchr(*line, '\"');
-	if (close_quote == NULL)
-		return NULL;
-
-	/* Make string */
-	len = close_quote - (*line);
-	str = (char *)malloc(len + 1);
-	if (str == NULL)
-		return NULL;
-	memcpy(str, *line, len);
-	strlen = 0;
-	
-	/* Advance line pointer */
-	(*line) += (len + 1);
-	return str;
-} /* End of 'cue_sheet_get_string' function */
-
-/* Read an integer from line */
-int cue_sheet_get_int( char **line )
-{
-	int num = 0;
-
-	cue_sheet_skip_ws(line);
-
-	while (isdigit(**line))
-	{
-		num *= 10;
-		num += (**line) - '0';
-		(*line) ++;
-	}
-	return num;
-} /* End of 'cue_sheet_get_int' function */
-
-/* Read a timestamp from line */
-int cue_sheet_get_timestamp( char **line )
-{
-	int min, sec, frames;
-
-	min = cue_sheet_get_int(line);
-	if ((**line) != ':')
-		return -1;
-	(*line) ++;
-	sec = cue_sheet_get_int(line);
-	if ((**line) != ':')
-		return -1;
-	(*line) ++;
-	frames = cue_sheet_get_int(line);
-	return (min * 60 + sec) * 75 + frames;
-} /* End of 'cue_sheet_get_timestamp' function */
-
-/* Update string in sheet */
-void cue_sheet_set_str( char **str, char *value )
-{
-	if ((*str) != NULL)
-		free(*str);
-
-	(*str) = value;
-} /* End of 'cue_set_str' function */
-
-/* End of 'cue_sheet.c' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/input/cue/cue_sheet.h Deleted

@@ -1,93 +0,0 @@
-/******************************************************************
- * Copyright (C) 2005 by SG Software.
- *
- * MPFC Cue plugin. Interface for cue sheet functions.
- * $Id$
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_CUE_SHEET_H__
-#define __SG_MPFC_CUE_SHEET_H__
-
-#include "types.h"
-
-typedef struct
-{
-	/* Title */
-	char *m_title;
-
-	/* Performer */
-	char *m_performer;
-
-	/* Indices */
-#define MAX_INDICES_COUNT 100
-	int m_indicesMAX_INDICES_COUNT;
-} cue_track_t;
-
-/* Cue sheet */
-typedef struct
-{
-	/* Tracks */
-	int m_num_tracks;
-	cue_track_t **m_tracks;
-
-	/* Music file name */
-	char *m_file_name;
-} cue_sheet_t;
-
-/* Cue line tags */
-typedef enum
-{
-	CUE_SHEET_TAG_UNKNOWN,
-	CUE_SHEET_TAG_FILE,
-	CUE_SHEET_TAG_TITLE,
-	CUE_SHEET_TAG_PERFORMER,
-	CUE_SHEET_TAG_INDEX,
-	CUE_SHEET_TAG_TRACK,
-} cue_sheet_tag_t;
-
-/* Parse cue sheet */
-cue_sheet_t *cue_sheet_parse( char *file_name );
-
-/* Free cue sheet */
-void cue_sheet_free( cue_sheet_t *cs );
-
-/* Add a new track */
-cue_track_t *cue_sheet_add_track( cue_sheet_t *cs );
-
-/* Skip whitespace */
-void cue_sheet_skip_ws( char **line );
-
-/* Read tag from line */
-cue_sheet_tag_t cue_sheet_get_line_tag( char **line );
-
-/* Read a string from line */
-char *cue_sheet_get_string( char **line );
-
-/* Read an integer from line */
-int cue_sheet_get_int( char **line );
-
-/* Read a timestamp from line */
-int cue_sheet_get_timestamp( char **line );
-
-/* Update string in sheet */
-void cue_sheet_set_str( char **str, char *value );
-
-#endif
-
-/* End of 'cue_sheet.h' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/input/flac Deleted

mpfc-1.3.8.1.tar.bz2/plugins/input/flac/Makefile.am Deleted

mpfc-1.3.8.1.tar.bz2/plugins/input/flac/Makefile.in Deleted

@@ -1,586 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/input/flac
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/mpfc-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(mylibdir)"
-LTLIBRARIES = $(mylib_LTLIBRARIES)
-libflac_la_DEPENDENCIES =
-am_libflac_la_OBJECTS = flac.lo
-libflac_la_OBJECTS = $(am_libflac_la_OBJECTS)
-libflac_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libflac_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libflac_la_SOURCES)
-DIST_SOURCES = $(libflac_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
-COMMON_LIBS = @COMMON_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURSES_LIBS = @CURSES_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
-GENCAT = @GENCAT@
-GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GPM_LIBS = @GPM_LIBS@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESOLV_LIBS = @RESOLV_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = $(datadir)/locale
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-mylib_LTLIBRARIES = libflac.la
-mylibdir = $(libdir)/mpfc/input
-libflac_la_SOURCES = flac.c
-INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-libflac_la_LDFLAGS = -Xcompiler -nostartfiles 
-libflac_la_LIBADD = @COMMON_LIBS@ @FLAC_LIBS@ 
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/input/flac/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/input/flac/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
-	}
-
-uninstall-mylibLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
-	done
-
-clean-mylibLTLIBRARIES:
-	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
-	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libflac.la: $(libflac_la_OBJECTS) $(libflac_la_DEPENDENCIES) 
-	$(libflac_la_LINK) -rpath $(mylibdir) $(libflac_la_OBJECTS) $(libflac_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flac.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(mylibdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-mylibLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-mylibLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-mylibLTLIBRARIES
-
-
-# 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:

mpfc-1.3.8.1.tar.bz2/plugins/input/flac/flac.c Deleted

@@ -1,424 +0,0 @@
-/******************************************************************
- * Copyright (C) 2006 by SG Software.
- *
- * SG MPFC. 
- * $Id$ 
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-//#include "config.h"
-#define __MPFC_OUTER__
-#include <FLAC/all.h>
-#include <sys/soundcard.h>
-#include <string.h>
-#include "types.h"
-#include "inp.h"
-#include "pmng.h"
-
-/* Plugins manager */
-static pmng_t *flac_pmng = NULL;
-
-/* Plugin description */
-static char *flac_desc = "";
-
-/* Plugin author */
-static char *flac_author = "Sergey E. Galanov <sgsoftware@mail.ru>";
-
-/* Logger */
-static logger_t *flac_log = NULL;
-
-/* Time to seek */
-static int flac_seek_pos = -1;
-
-/* Audio parameters */
-static int flac_freq = 0, flac_channels = 0, flac_fmt = 0;
-static int flac_max_bs, flac_bpp;
-
-/* Decoder object */
-static FLAC__StreamDecoder *flac_decoder = NULL;
-
-/* Buffer for writing decoded stream */
-static byte *flac_buf = NULL, *flac_buf_ptr = NULL;
-static int flac_buf_size = 0;
-
-/* Current time */
-static int flac_cur_time = 0;
-
-/* Type for client data */
-typedef struct
-{
-	bool_t m_only_get_info;
-	int m_samplerate;
-	int m_fmt;
-	int m_channels;
-	int m_bpp;
-	int m_max_bs;
-	int m_length;
-} flac_client_data_t;
-flac_client_data_t flac_client_data;
-
-/* Write decoded data callback */
-FLAC__StreamDecoderWriteStatus flac_write_callback( const FLAC__StreamDecoder *decoder,
-		const FLAC__Frame *frame, const FLAC__int32 * const buf, void *client_data )
-{
-	int i, j;
-	byte *fb = flac_buf;
-	flac_client_data_t *cd = (flac_client_data_t *)client_data;
-
-	logger_debug(flac_log, "flac: in flac_write_callback with blocksize %d",
-			frame->header.blocksize);
-
-	if (cd->m_only_get_info)
-		return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
-
-	/* Write to buffer */
-	for ( i = 0; i < frame->header.blocksize; i ++ )
-	{
-		for ( j = 0; j < frame->header.channels; j ++ )
-		{
-			FLAC__int32 sample = bufji;
-			if (frame->header.bits_per_sample == 8)
-			{
-				(*fb ++) = sample;
-				flac_buf_size ++;
-			}
-			else if (frame->header.bits_per_sample == 16)
-			{
-				*((int16_t *)fb) = sample;
-				fb += 2;
-				flac_buf_size += 2;
-			}
-		}
-	}
-	logger_debug(flac_log, "flac: flac_buf_size = %d", flac_buf_size);
-
-	/* Update time */
-	if (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER)
-		flac_cur_time = frame->header.number.sample_number / flac_freq;
-	else
-		flac_cur_time = frame->header.number.frame_number * 
-			frame->header.blocksize / flac_freq;
-	logger_debug(flac_log, "flac: current time is %d", flac_cur_time);
-	return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
-} /* End of 'flac_write_callback' function */
-
-/* Process metadata callback */
-void flac_metadata_callback( const FLAC__StreamDecoder *decoder,
-		const FLAC__StreamMetadata *metadata, void *client_data )
-{
-	flac_client_data_t *cd = (flac_client_data_t *)client_data;
-
-	logger_debug(flac_log, "flac: flac_metadata_callback with type %d", 
-			metadata->type);
-
-	if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO)
-	{
-		const FLAC__StreamMetadata_StreamInfo *si = &metadata->data.stream_info;
-		unsigned bpp = si->bits_per_sample;
-
-		cd->m_samplerate = si->sample_rate;
-		cd->m_channels = si->channels;
-		cd->m_max_bs = si->max_blocksize;
-		cd->m_bpp = bpp;
-		cd->m_length = si->total_samples / si->sample_rate;
-		if (bpp == 8)
-			cd->m_fmt = AFMT_S8;
-		else if (bpp == 16)
-			cd->m_fmt = AFMT_S16_LE;
-		else
-			logger_error(flac_log, 0, "flac: %d bits per sample not supported", bpp);
-	}
-} /* End of 'flac_metadata_callback' function */
-
-/* Error callback */
-void flac_error_callback( const FLAC__StreamDecoder *decoder,
-		FLAC__StreamDecoderErrorStatus status, void *client_data )
-{
-	logger_error(flac_log, 0, "flac: got stream decoder error %d", status);
-} /* End of 'flac_error_callback' function */
-
-/* Read file metadata */
-FLAC__StreamDecoder *flac_read_metadata( char *filename, void *client_data )
-{
-	FLAC__StreamDecoderState fds;
-	int buf_size;
-	FLAC__StreamDecoder *decoder;
-
-	logger_debug(flac_log, "flac: flac_read_metadata(%s)", filename);
-
-	/* Initialize decoder */
-	decoder = FLAC__stream_decoder_new();
-	logger_debug(flac_log, "flac: FLAC__stream_decoder_new returned %p", 
-			decoder);
-	if (decoder == NULL)
-	{
-		logger_error(flac_log, 0, "flac: FLAC__stream_decoder_new failed");
-		FLAC__stream_decoder_delete(decoder);
-		return NULL;
-	}
-	if (FLAC__stream_decoder_init_file(decoder,
-			filename, flac_write_callback, flac_metadata_callback, 
-			flac_error_callback, client_data) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
-	{
-		logger_error(flac_log, 0, "flac: FLAC__stream_decoder_init_file failed");
-		FLAC__stream_decoder_delete(decoder);
-		return NULL;
-	}
-
-	/* Read metadata */
-	if (!FLAC__stream_decoder_process_until_end_of_metadata(decoder))
-	{
-		logger_error(flac_log, 0, 
-				"flac: FLAC__stream_decoder_process_until_end_of_metadata failed");
-		FLAC__stream_decoder_finish(decoder);
-		FLAC__stream_decoder_delete(decoder);
-		return NULL;
-	}
-	logger_debug(flac_log, "flac: Samplerate: %d, channels: %d, "
-			"max blocksize: %d, bpp: %d",
-			flac_freq, flac_channels, flac_max_bs, flac_bpp);
-	return decoder;
-} /* End of 'flac_read_metadata' function */
-
-/* Start play function */
-bool_t flac_start( char *filename )
-{
-	FLAC__StreamDecoderState fds;
-	int buf_size;
-
-	logger_debug(flac_log, "flac: flac_start(%s)", filename);
-
-	/* Set default parameters */
-	flac_seek_pos = -1;
-	flac_freq = 0;
-	flac_channels = 0;
-	flac_fmt = 0;
-
-	/* Initialize decoder and read metadata */
-	flac_client_data.m_only_get_info = FALSE;
-	flac_decoder = flac_read_metadata(filename, &flac_client_data);
-	if (flac_decoder == NULL)
-		return FALSE;
-	flac_freq = flac_client_data.m_samplerate;
-	flac_channels = flac_client_data.m_channels;
-	flac_fmt = flac_client_data.m_fmt;
-	flac_bpp = flac_client_data.m_bpp;
-	flac_max_bs = flac_client_data.m_max_bs;
-
-	/* Allocate memory for buffer */
-	buf_size = flac_max_bs * flac_channels * (flac_bpp / 8);
-	logger_debug(flac_log, "flac: allocating buffer of size %d", buf_size);
-	flac_buf = (byte *)malloc(buf_size);
-	if (flac_buf == NULL)
-	{
-		logger_error(flac_log, 0, "flac: no enough memory");
-		FLAC__stream_decoder_finish(flac_decoder);
-		FLAC__stream_decoder_delete(flac_decoder);
-		flac_decoder = NULL;
-		return FALSE;
-	}
-	flac_buf_ptr = flac_buf;
-	flac_buf_size = 0;
-	flac_cur_time = 0;
-	return TRUE;
-} /* End of 'flac_start' function */
-
-/* End playing function */
-void flac_end( void )
-{
-	flac_seek_pos = -1;
-
-	if (flac_buf != NULL)
-	{
-		free(flac_buf);
-		flac_buf = NULL;
-		flac_buf_ptr = NULL;
-	}
-
-	if (flac_decoder != NULL)
-	{
-		FLAC__stream_decoder_finish(flac_decoder);
-		FLAC__stream_decoder_delete(flac_decoder);
-		flac_decoder = NULL;
-	}
-} /* End of 'flac_end' function */
-
-/* Get stream function */
-int flac_get_stream( void *buf, int size )
-{
-	int s;
-	FLAC__bool res;
-
-	logger_debug(flac_log, "flac: flac_get_stream(%p, %d). flac_buf_size is %d. "
-			"decoder is %p", buf, size, flac_buf_size, flac_decoder);
-
-	/* Seek */
-	if (flac_seek_pos >= 0)
-	{
-		flac_buf_ptr = flac_buf;
-		flac_buf_size = 0;
-
-		res = FLAC__stream_decoder_seek_absolute(flac_decoder, 
-				flac_seek_pos * flac_freq);
-		logger_debug(flac_log, "flac: FLAC__stream_decoder_seek_absolute returned %d", res);
-		flac_seek_pos = -1;
-	}
-
-	/* Read data */
-	if (flac_buf_size == 0)
-	{
-		res = FLAC__stream_decoder_process_single(flac_decoder);
-		logger_debug(flac_log, "flac: FLAC__stream_decoder_process_single returned %d", res);
-	}
-
-	/* Flush buffer */
-	s = (size < flac_buf_size) ? size : flac_buf_size;
-	logger_debug(flac_log, "flac: copying %d bytes from buffer", s);
-	memcpy(buf, flac_buf_ptr, s);
-	flac_buf_ptr += s;
-	flac_buf_size -= s;
-
-	/* Check if we have reached buffer end */
-	if (flac_buf_size == 0)
-	{
-		logger_debug(flac_log, "flac: buffer flushed");
-		flac_buf_ptr = flac_buf;
-	}
-
-	logger_debug(flac_log, "flac: returning %d bytes", s);
-	return s;
-} /* End of 'flac_get_stream' function */
-
-/* Get audio parameters */
-void flac_get_audio_params( int *ch, int *freq, dword *fmt, int *bitrate )
-{
-	*ch = flac_channels;
-	*freq = flac_freq;
-	*fmt = flac_fmt;
-	(*bitrate) = 0;
-} /* End of 'flac_get_audio_params' function */
-
-/* Get formats supported */
-void flac_get_formats( char *extensions, char *content_type )
-{
-	if (extensions != NULL)
-		strcpy(extensions, "flac");
-} /* End of 'flac_get_formats' function */
-
-/* Check whether vorbis comment from metadata matches type */
-bool_t flac_comment_matches( FLAC__StreamMetadata_VorbisComment_Entry *comment, 
-		char *name, char **data )
-{
-	char *entry = comment->entry;
-	int len = strlen(name);
-	
-	if (!strncasecmp(entry, name, len) && (entrylen == '='))
-	{
-		(*data) = entry + len + 1;
-		return TRUE;
-	}
-	return FALSE;
-} /* End of 'flac_comment_matches' function */
-
-/* Get song info */
-song_info_t *flac_get_info( char *file_name, int *len )
-{
-	FLAC__StreamDecoder *decoder;
-	flac_client_data_t cd;
-	FLAC__StreamMetadata *tags;
-	song_info_t *si = NULL;
-
-	(*len) = 0;
-
-	/* Read file info */
-	cd.m_only_get_info = TRUE;
-	decoder = flac_read_metadata(file_name, &cd);
-	if (decoder == NULL)
-	{
-		return NULL;
-	}
-	(*len) = cd.m_length;
-
-	/* Free memory */
-	FLAC__stream_decoder_finish(decoder);
-	FLAC__stream_decoder_delete(decoder);
-
-	/* Read tags */
-	if (FLAC__metadata_get_tags(file_name, &tags))
-	{
-		FLAC__StreamMetadata_VorbisComment *comments;
-		int i;
-		
-		si = si_new();
-
-		comments = &tags->data.vorbis_comment;
-		for ( i = 0; i < comments->num_comments; i ++ )
-		{
-			FLAC__StreamMetadata_VorbisComment_Entry *comment = &comments->commentsi;
-			char *data;
-
-			if (flac_comment_matches(comment, "title", &data))
-				si_set_name(si, data);
-			else if (flac_comment_matches(comment, "artist", &data))
-				si_set_artist(si, data);
-			else if (flac_comment_matches(comment, "album", &data))
-				si_set_album(si, data);
-			else if (flac_comment_matches(comment, "tracknumber", &data))
-				si_set_track(si, data);
-			else if (flac_comment_matches(comment, "date", &data))
-				si_set_year(si, data);
-			else if (flac_comment_matches(comment, "year", &data))
-				si_set_year(si, data);
-			else if (flac_comment_matches(comment, "genre", &data))
-				si_set_genre(si, data);
-
-		}
-	}
-	return si;
-} /* End of 'flac_get_info' function */
-
-/* Seek */
-void flac_seek( int pos )
-{
-	flac_seek_pos = pos;
-} /* End of 'flac_seek' function */
-
-/* Get current time */
-int flac_get_cur_time( void )
-{
-	return flac_cur_time;
-} /* End of 'flac_get_cur_time' function */
-
-/* Exchange data with main program */
-void plugin_exchange_data( plugin_data_t *pd )
-{
-	pd->m_desc = flac_desc;
-	pd->m_author = flac_author;
-	INP_DATA(pd)->m_start = flac_start;
-	INP_DATA(pd)->m_end = flac_end;
-	INP_DATA(pd)->m_get_stream = flac_get_stream;
-	INP_DATA(pd)->m_get_audio_params = flac_get_audio_params;
-	INP_DATA(pd)->m_get_formats = flac_get_formats;
-	INP_DATA(pd)->m_get_info = flac_get_info;
-	INP_DATA(pd)->m_seek = flac_seek;
-	INP_DATA(pd)->m_get_cur_time = flac_get_cur_time;
-	flac_pmng = pd->m_pmng;
-	flac_log = pd->m_logger;
-} /* End of 'plugin_exchange_data' function */
-
-/* End of 'flac.c' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/input/mp3 Deleted

mpfc-1.3.8.1.tar.bz2/plugins/input/mp3/Makefile.am Deleted

mpfc-1.3.8.1.tar.bz2/plugins/input/mp3/Makefile.in Deleted

@@ -1,586 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/input/mp3
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/mpfc-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(mylibdir)"
-LTLIBRARIES = $(mylib_LTLIBRARIES)
-libmp3_la_DEPENDENCIES =
-am_libmp3_la_OBJECTS = mp3.lo
-libmp3_la_OBJECTS = $(am_libmp3_la_OBJECTS)
-libmp3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libmp3_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libmp3_la_SOURCES)
-DIST_SOURCES = $(libmp3_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
-COMMON_LIBS = @COMMON_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURSES_LIBS = @CURSES_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
-GENCAT = @GENCAT@
-GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GPM_LIBS = @GPM_LIBS@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESOLV_LIBS = @RESOLV_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = $(datadir)/locale
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-mylib_LTLIBRARIES = libmp3.la
-mylibdir = $(libdir)/mpfc/input
-libmp3_la_SOURCES = mp3.c mp3.h 
-INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-libmp3_la_LDFLAGS = -Xcompiler -nostartfiles 
-libmp3_la_LIBADD = @COMMON_LIBS@ @MAD_LIBS@ @MATH_LIBS@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/input/mp3/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/input/mp3/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
-	}
-
-uninstall-mylibLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
-	done
-
-clean-mylibLTLIBRARIES:
-	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
-	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libmp3.la: $(libmp3_la_OBJECTS) $(libmp3_la_DEPENDENCIES) 
-	$(libmp3_la_LINK) -rpath $(mylibdir) $(libmp3_la_OBJECTS) $(libmp3_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp3.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(mylibdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-mylibLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-mylibLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-mylibLTLIBRARIES
-
-
-# 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:

mpfc-1.3.8.1.tar.bz2/plugins/input/mp3/mp3.c Deleted

@@ -1,1211 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. MP3 input plugin functions implementation.
- * $Id: mp3.c 276 2009-08-08 18:41:54Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <errno.h>
-#include <mad.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <sys/soundcard.h>
-#include "types.h"
-#include "file.h"
-#include "genre_list.h"
-#include "inp.h"
-#include "logger.h"
-#include "mp3.h"
-#include "myid3.h"
-#include "pmng.h"
-#include "song_info.h"
-#include "util.h"
-#include "wnd.h"
-#include "wnd_checkbox.h"
-#include "wnd_dialog.h"
-
-#define MP3_IN_BUF_SIZE (5*8192)
-
-/* libmad structures */
-static struct mad_stream mp3_stream;
-static struct mad_frame mp3_frame;
-static struct mad_synth mp3_synth;
-static mad_timer_t mp3_timer;
-
-/* Input buffer */
-static byte mp3_in_bufMP3_IN_BUF_SIZE;
-
-/* Decoded frames counter */
-static dword mp3_frame_count = 0;
-
-/* Samples pointer */
-static dword mp3_samples = 0;
-
-/* Current seek value */
-static int mp3_seek_val = -1;
-
-/* Current song audio parameters */
-static int mp3_channels = 0, mp3_freq = 0, mp3_bitrate = 0;
-static dword mp3_fmt = 0;
-
-/* Current file name */
-static char mp3_file_nameMAX_FILE_NAME = "";
-
-/* ID3 tag scheduled for saving */
-static id3_tag_t *mp3_tag = NULL;
-
-/* Current song information */
-static song_info_t *mp3_cur_info = NULL;
-
-/* Whether we are about to remove tag? */
-static bool_t mp3_need_rem_tag = FALSE;
-
-/* Genres list */
-static genre_list_t *mp3_glist = NULL;
-
-/* Current song length */
-static int mp3_len = 0;
-
-/* Current song number of frames */
-static int mp3_total_num_frames = 0;
-
-/* Multipliers for equalizer */
-static mad_fixed_t mp3_eq_mul32;
-
-/* Current time */
-static int mp3_time = 0;
-
-/* File object */
-static file_t *mp3_fd = NULL;
-
-/* Plugins manager object */
-static pmng_t *mp3_pmng = NULL;
-
-/* Current song header */
-struct mad_header mp3_head;
-
-/* Logger */
-static logger_t *mp3_log = NULL;
-
-/* Get song information */
-static song_info_t *mp3_read_info( char *filename, int *len, int *nf, int *skip_start, int *skip_end );
-
-/* Plugin description */
-static char *mp3_desc = "mp3 files playback plugin";
-
-/* Plugin author */
-static char *mp3_author = "Sergey E. Galanov <sgsoftware@mail.ru>";
-
-/* Configuration lists */
-static cfg_node_t *mp3_cfg, *mp3_root_cfg;
-
-/* Real mp3 data bounds */
-static int mp3_start_pos = 0, mp3_end_pos = 0;
-
-/* Start play with an opened file descriptor */
-bool_t mp3_start_with_fd( char *filename, file_t *fd )
-{
-	int skip_start = 0, skip_end = 0;
-
-	/* Remember tag */
-	mp3_cur_info = mp3_read_info(filename, &mp3_len,
-			&mp3_total_num_frames, &skip_start, &skip_end);
-	mp3_start_pos = skip_start;
-	mp3_end_pos = util_get_file_size(filename) - skip_end;
-
-	/* Open file */
-	if (fd == NULL)
-	{
-		mp3_fd = file_open(filename, "rb", mp3_log);
-		if (mp3_fd == NULL)
-			return FALSE;
-	}
-	else
-		mp3_fd = fd;
-	
-	/* Initialize libmad structures */
-	mp3_frame_count = 0;
-	mad_stream_init(&mp3_stream);
-	mad_frame_init(&mp3_frame);
-	mad_synth_init(&mp3_synth);
-	mad_timer_reset(&mp3_timer);
-	mp3_timer = mad_timer_zero;
-
-	/* Save song parameters */
-	mp3_time = 0;
-	mp3_channels = 2;
-	mp3_freq = 44100;
-	mp3_fmt = AFMT_S16_LE;
-	mp3_samples = 0;
-	mp3_seek_val = -1;
-	mp3_bitrate = 0;
-	util_strncpy(mp3_file_name, filename, sizeof(mp3_file_name));
-
-	/* Read song parameters */
-	memset(&mp3_head, 0, sizeof(mp3_head));
-	mp3_read_song_params();
-	file_set_min_buf_size(mp3_fd, mp3_bitrate >> 3);
-	return TRUE;
-} /* End of 'mp3_start_with_fd' function */
-	
-/* Start play function */
-bool_t mp3_start( char *filename )
-{
-	return mp3_start_with_fd(filename, NULL);
-} /* End of 'mp3_start' function */
-
-/* End playing function */
-void mp3_end( void )
-{
-	if (mp3_fd != NULL)
-	{
-		mad_synth_finish(&mp3_synth);
-		mad_frame_finish(&mp3_frame);
-		mad_stream_finish(&mp3_stream);
-		file_close(mp3_fd);
-		mp3_fd = NULL;
-
-		/* Remove tag */
-		if (mp3_need_rem_tag)
-		{
-			id3_remove(mp3_file_name);
-			mp3_need_rem_tag = FALSE;
-		}
-		/* Save tag */
-		else if (mp3_tag != NULL)
-		{
-			id3_write(mp3_tag, mp3_file_name);
-			id3_free(mp3_tag);
-			mp3_tag = NULL;
-		}
-		
-		si_free(mp3_cur_info);
-		mp3_cur_info = NULL;
-		strcpy(mp3_file_name, "");
-		mp3_len = 0;
-		mp3_time = 0;
-	}
-} /* End of 'mp3_end' function */
-
-/* Get supported formats function */
-void mp3_get_formats( char *extensions, char *content_type )
-{
-	if (extensions != NULL)
-		strcpy(extensions, "mp3");
-	if (content_type != NULL)
-		strcpy(content_type, "audio/mpeg");
-} /* End of 'mp3_get_formats' function */
-
-/* Correct though long version of get_len function */
-static int mp3_get_len_correct( char *filename, int *num_frames )
-{
-	struct mad_stream stream;
-	struct mad_header header;
-	mad_timer_t timer;
-	unsigned char buffer8192;
-	unsigned int buflen = 0;
-	file_t *fd;
-	int i = 0;
-
-	/* Check if we want to get current song length */
-	if (!strcmp(filename, mp3_file_name))
-	{
-		*num_frames = mp3_total_num_frames;
-		return mp3_len;
-	}
-	
-	/* Open file */
-	fd = file_open(filename, "rb", mp3_log);
-	if (fd == NULL)
-		return 0;
-
-	/* Initialize our structures */
-	mad_stream_init(&stream);
-	mad_header_init(&header);
-	timer = mad_timer_zero;
-
-	/* Scan file */
-	for ( *num_frames = 0;; )
-	{
-		/* Read data */
-		if (buflen < sizeof(buffer))
-		{
-			dword bytes;
-			
-			bytes = file_read(buffer + buflen, 1, sizeof(buffer) - buflen, fd);
-			if (bytes <= 0)
-				break;
-			buflen += bytes;
-		}
-
-		/* Pipe data to MAD stream */
-		mad_stream_buffer(&stream, buffer, buflen);
-
-		/* Decode frame header */
-		if (mad_header_decode(&header, &stream) >= 0)
-		{
-			/* Gather statistics */
-			mad_timer_add(&timer, header.duration);
-			(*num_frames) ++;
-		}
-
-		/* Move rest data (not decoded) to buffer start */
-		memmove(buffer, stream.next_frame, &bufferbuflen - stream.next_frame);
-		buflen -= stream.next_frame - &buffer0;
-	} 
-
-	/* Finish process */
-	mad_header_finish(&header);
-	mad_stream_finish(&stream);
-
-	/* Close file */
-	file_close(fd);
-
-	/* Return */
-	return mad_timer_count(timer, MAD_UNITS_SECONDS);
-} /* End of 'mp3_get_len_correct' function */
-
-/* Convert MAD fixed point sample to 16-bit */
-static short mp3_mad_fixed_to_short( mad_fixed_t sample )
-{
-	sample += (1L << (MAD_F_FRACBITS - 16));
-	if (sample >= MAD_F_ONE)
-		sample = MAD_F_ONE - 1;
-	else if (sample < -MAD_F_ONE)
-		sample = -MAD_F_ONE;
-	return(sample >> (MAD_F_FRACBITS + 1 - 16));
-} /* End of 'mp3_mad_fixed_to_short' function */
-
-/* Save song information */
-bool_t mp3_save_info( char *filename, song_info_t *info )
-{
-	id3_tag_t *tag;
-	byte *data = NULL;
-	int size;
-	bool_t ret = TRUE;
-
-	/* Supported only for regular files */
-	if (file_get_type(filename) != FILE_TYPE_REGULAR)
-	{
-		logger_error(mp3_log, 1, _("Only regular files are supported for "
-					"writing info by mp3 plugin"));
-		return FALSE;
-	}
-
-	/* Save this tag */
-	if (!strcmp(filename, mp3_file_name))
-	{
-		si_free(mp3_cur_info);
-		mp3_cur_info = si_dup(info);
-	}
-
-	/* Read tag */
-	tag = id3_read(filename, NULL);
-	if (tag == NULL)
-	{
-		tag = id3_new();
-		if (tag == NULL)
-		{
-			logger_error(mp3_log, 1, _("Unable to create ID3 tag"));
-			return FALSE;
-		}
-	}
-
-	/* Update tag fields */
-	id3_set_frame(tag, ID3_FRAME_TITLE, info->m_name, info->m_charset);
-	id3_set_frame(tag, ID3_FRAME_ARTIST, info->m_artist, info->m_charset);
-	id3_set_frame(tag, ID3_FRAME_ALBUM, info->m_album, info->m_charset);
-	id3_set_frame(tag, ID3_FRAME_COMMENT, info->m_comments, info->m_charset);
-	id3_set_frame(tag, ID3_FRAME_YEAR, info->m_year, info->m_charset);
-	id3_set_frame(tag, ID3_FRAME_TRACK, info->m_track, info->m_charset);
-	id3_set_genre(tag, info->m_genre, 
-			glist_get_id_by_name(mp3_glist, info->m_genre), info->m_charset);
-
-	/* Save tag or save it later */
-	mp3_need_rem_tag = FALSE;
-	if (!strcmp(filename, mp3_file_name))
-	{
-		mp3_tag = tag;
-	}
-	else
-	{
-		ret = id3_write(tag, filename);
-		id3_free(tag);
-	}
-	return ret;
-} /* End of 'mp3_save_info' function */
-
-/* Check if given buffer is frame header */
-bool_t mp3_check_header( dword head )
-{
-	if ((head & 0xffe00000) != 0xffe00000)
-		return FALSE;
-	if (!((head >> 17) & 3))
-		return FALSE;
-	if (((head >> 12) & 0xf) == 0xf)
-		return FALSE;
-	if (!((head >> 12) & 0xf))
-		return FALSE;
-	if (((head >> 10) & 0x3) == 0x3)
-		return FALSE;
-	if (((head >> 19) & 1) == 1 && ((head >> 17) & 3) == 3 && 
-			((head >> 16) & 1) == 1)
-		return FALSE;
-	if ((head & 0xffff0000) == 0xfffe0000)
-		return FALSE;
-	
-	return TRUE;
-} /* End of 'mp3_check_header' function */
-
-/* Find frame start in mp3 file */
-bool_t mp3_find_frame( file_t *fd )
-{
-	byte buf4;
-	dword head;
-
-	if (file_read(buf, 1, 4, fd) != 4)
-		return FALSE;
-	head = ((byte)buf0 << 24) | ((byte)buf1 << 16) | 
-		((byte)buf2 << 8) | ((byte)buf3);
-	for ( ; !mp3_check_header(head); )
-	{
-		byte buf1;
-		if (file_read(buf, 1, 1, fd) != 1)
-			return FALSE;
-		head <<= 8;
-		head |= (byte)buf0;
-	}
-	file_seek(fd, -4, SEEK_CUR);
-	return TRUE;
-} /* End of 'mp3_find_frame' function */
-
-/* Get number of frames from XING header (if it exists) */
-int mp3_get_xing_frames( char *filename )
-{
-	file_t *fd;
-	int i, nf = 0, buflen;
-	byte buf8192, *xing;
-	bool_t found = FALSE;
-	
-	/* Open file */
-	fd = file_open(filename, "rb", mp3_log);
-	if (fd == NULL)
-		goto end;
-
-	/* Find first frame */
-	if (!mp3_find_frame(fd))
-		goto end;
-
-	/* Find XING header in this frame */
-	buflen = file_read(buf, 1, sizeof(buf), fd);
-	for ( i = 0, xing = buf; i < buflen - 12; i ++, xing ++ )
-	{
-		if (!strncmp(xing, "Xing", 4))
-		{
-			found = TRUE;
-			break;
-		}
-	}
-	if (!found)
-		goto end;
-
-	/* Extract number of frames */
-	xing += 7;
-	if ((*xing) & 0x01)
-	{
-		xing ++;
-		nf |= ((byte)(*xing) << 24); xing ++;
-		nf |= ((byte)(*xing) << 16); xing ++;
-		nf |= ((byte)(*xing) << 8); xing ++;
-		nf |= ((byte)(*xing)); 
-	}
-
-end:
-	/* Close file */
-	file_close(fd);
-	return nf;
-} /* End of 'mp3_get_xing_frames' function */
-
-/* Get song information */
-static song_info_t *mp3_read_info( char *filename, int *len, int *nf,
-		                           int *skip_start, int *skip_end )
-{
-	struct mad_header head;
-	int i, filesize;
-	id3_tag_t *tag;
-	char own_data1024;
-	song_info_t *si = NULL;
-	int bytes2skip = 0;
-	byte tags_present = 0;
-
-	if (skip_start)
-		(*skip_start) = 0;
-	if (skip_end)
-		(*skip_end) = 0;
-
-	/* Supported only for regular files; for others - 
-	 * output audio parameters */
-	if (file_get_type(filename) != FILE_TYPE_REGULAR)
-	{
-		int br;
-		
-		/* May return anything only for current song */
-		if (strcmp(filename, mp3_file_name))
-		{
-			*len = 0;
-			if (nf != NULL)
-				*nf = 0;
-			return NULL;
-		}
-
-		*len = 0;
-		si = si_new();
-		si->m_flags |= SI_ONLY_OWN;
-		snprintf(own_data, sizeof(own_data),
-			_("MPEG %s, layer %i\n"
-			"Bitrate: %lu kb/s\n"
-			"Samplerate: %i Hz\n"
-			"%s\n"
-			"Error protection: %s\n"
-			"Copyright: %s\n"
-			"Original: %s\n"
-			"Emphasis: %s"),
-			(mp3_head.flags & MAD_FLAG_MPEG_2_5_EXT) ? "2.5" : "1",
-			(mp3_head.layer == MAD_LAYER_I) ? 1 : 
-				(mp3_head.layer == MAD_LAYER_II ? 2 : 3),
-			mp3_head.bitrate / 1000,
-			mp3_head.samplerate,
-			(mp3_head.mode == MAD_MODE_SINGLE_CHANNEL) ? _("Single channel") :
-				(mp3_head.mode == MAD_MODE_DUAL_CHANNEL ? _("Dual channel") :
-				 (mp3_head.mode == MAD_MODE_JOINT_STEREO ? _("Joint Stereo") : 
-				  _("Stereo"))),
-			(mp3_head.flags & MAD_FLAG_PROTECTION) ? _("Yes") : _("No"),
-			(mp3_head.flags & MAD_FLAG_COPYRIGHT) ? _("Yes") : _("No"),
-			(mp3_head.flags & MAD_FLAG_ORIGINAL) ? _("Yes") : _("No"),
-			mp3_head.emphasis == MAD_EMPHASIS_NONE ? _("None") :
-		  		(mp3_head.emphasis == MAD_EMPHASIS_50_15_US ? 
-				 _("50/15 microseconds") : _("CCITT J.17")));
-		si_set_own_data(si, own_data);
-		if (nf != NULL)
-			*nf = 0;
-		return si;
-	}
-	
-	/* Return temporary tag if we request for current playing song tag */
-	if (!strcmp(filename, mp3_file_name))
-	{
-		*len = mp3_len;
-		if (nf != NULL)
-			*nf = mp3_total_num_frames;
-		return si_dup(mp3_cur_info);
-	}
-
-	/* Read tag */
-	si = si_new();
-	si->m_glist = mp3_glist;
-	tag = id3_read(filename, &tags_present);
-	if (tag != NULL)
-	{
-		if (skip_end)
-			(*skip_end) = (tags_present & ID3_V1_PRESENT) ? tag->m_v1.m_stream_len : 0;
-		if (skip_start)
-			(*skip_start) = (tags_present & ID3_V2_PRESENT) ? tag->m_v2.m_stream_len : 0;
-
-		/* Save tag size for skipping it */
-		if (tag->m_version == 2)
-		{
-			bytes2skip = tag->m_v2.m_stream_len;
-		}
-
-		/* Scan tag frames */
-		for ( ;; )
-		{	
-			id3_frame_t f;
-			
-			/* Get next frame */
-			id3_next_frame(tag, &f);
-
-			/* Handle frame */
-			if (!strcmp(f.m_name, ID3_FRAME_TITLE))
-			{
-				si_set_name(si, f.m_val);
-				if (f.m_encoding == ID3_UTF8)
-					si_set_charset(si, "utf-8");
-			}
-			else if (!strcmp(f.m_name, ID3_FRAME_ARTIST))
-				si_set_artist(si, f.m_val);
-			else if (!strcmp(f.m_name, ID3_FRAME_ALBUM))
-				si_set_album(si, f.m_val);
-			else if (!strcmp(f.m_name, ID3_FRAME_YEAR))
-				si_set_year(si, f.m_val);
-			else if (!strcmp(f.m_name, ID3_FRAME_TRACK))
-				si_set_track(si, f.m_val);
-			else if (!strcmp(f.m_name, ID3_FRAME_COMMENT))
-				si_set_comments(si, f.m_val);
-			else if (!strcmp(f.m_name, ID3_FRAME_GENRE))
-				si_set_genre(si, f.m_val);
-			else if (!strcmp(f.m_name, ID3_FRAME_FINISHED))
-			{
-				id3_free_frame(&f);
-				break;
-			}
-
-			id3_free_frame(&f);
-		}
-
-		/* Free tag */
-		id3_free(tag);
-	}
-
-	/* Obtain additional song parameters */
-	mad_header_init(&head);
-	mp3_read_header(filename, bytes2skip, &head);
-	if (head.bitrate)
-	{
-		int tpf;
-		bool_t frames_exact = FALSE;
-		int num_frames = 0;
-		
-		filesize = util_get_file_size(filename);
-		tpf = mad_timer_count(head.duration, MAD_UNITS_MILLISECONDS);
-
-		/* Obtain length */
-		if (cfg_get_var_bool(mp3_cfg, "quick-get-len"))
-		{
-			/* Get number of frames from XING header and calculate 
-			 * song length */
-			if (num_frames = mp3_get_xing_frames(filename))
-			{
-				frames_exact = TRUE;
-				*len = (tpf * num_frames) / 1000;
-			}
-			else if (head.bitrate)
-			{
-				*len = filesize / (head.bitrate >> 3);
-				num_frames = (tpf == 0 ? 0 : (*len) * 1000 / tpf);
-			}
-		}
-		else
-		{
-			*len = mp3_get_len_correct(filename, &num_frames);
-			frames_exact = TRUE;
-		}
-		if (nf != NULL)
-			*nf = num_frames;
-		
-		snprintf(own_data, sizeof(own_data),
-			_("MPEG %s, layer %i\n"
-			"Bitrate: %lu kb/s\n"
-			"Samplerate: %i Hz\n"
-			"%s\n"
-			"Error protection: %s\n"
-			"Copyright: %s\n"
-			"Original: %s\n"
-			"Emphasis: %s\n"
-			"%s%i frames\n"
-			"Length: %i seconds\n"
-			"File size: %i bytes"),
-			(head.flags & MAD_FLAG_MPEG_2_5_EXT) ? "2.5" : "1",
-			(head.layer == MAD_LAYER_I) ? 1 : (head.layer == MAD_LAYER_II ?
-											   2 : 3),
-			head.bitrate / 1000,
-			head.samplerate,
-			(head.mode == MAD_MODE_SINGLE_CHANNEL) ? _("Single channel") :
-				(head.mode == MAD_MODE_DUAL_CHANNEL ? _("Dual channel") :
-				 (head.mode == MAD_MODE_JOINT_STEREO ? _("Joint Stereo") : 
-				  _("Stereo"))),
-			(head.flags & MAD_FLAG_PROTECTION) ? _("Yes") : _("No"),
-			(head.flags & MAD_FLAG_COPYRIGHT) ? _("Yes") : _("No"),
-			(head.flags & MAD_FLAG_ORIGINAL) ? _("Yes") : _("No"),
-			head.emphasis == MAD_EMPHASIS_NONE ? _("None") :
-		  		(head.emphasis == MAD_EMPHASIS_50_15_US ? 
-				 _("50/15 microseconds") : _("CCITT J.17")),
-			frames_exact ? "" : _("approx. "), num_frames, *len,
-			filesize);
-			si_set_own_data(si, own_data);
-	}
-	mad_header_finish(&head);
-
-	return si;
-} /* End of 'mp3_read_info' function */
-
-/* Get song information (exported) */
-song_info_t *mp3_get_info( char *filename, int *len )
-{
-	return mp3_read_info(filename, len, NULL, NULL, NULL);
-} /* End of 'mp3_get_info' function */
-
-/* Get stream function */
-int mp3_get_stream( void *buf, int size )
-{
-	int len = 0;
-	byte *out_ptr = (byte *)buf;
-
-	if (mp3_fd == NULL)
-		return 0;
-
-	/* Decode frame if samples counter is zero */
-	if (!mp3_samples)
-	{
-		struct mad_header head;
-
-		/* Seek */
-		if (mp3_seek_val != -1 && mp3_bitrate)
-		{
-			file_seek(mp3_fd, mp3_start_pos + mp3_seek_val * mp3_bitrate / 8, SEEK_SET);
-			mp3_time = mp3_seek_val;
-			mp3_timer.seconds = mp3_time;
-			mp3_timer.fraction = 0;//mp3_time * MAD_TIMER_RESOLUTION;
-			mp3_seek_val = -1;
-		}
-
-		/* Fill input buffer */
-		if (mp3_stream.buffer == NULL || mp3_stream.error == MAD_ERROR_BUFLEN)
-		{
-			int read_size, remaining;
-			byte *read_start;
-			long cur_pos;
-
-			/* Prepare input buffer */
-			if (mp3_stream.next_frame != NULL)
-			{
-				remaining = mp3_stream.bufend - mp3_stream.next_frame;
-				memmove(mp3_in_buf, mp3_stream.next_frame, remaining);
-				read_start = mp3_in_buf + remaining;
-				read_size = MP3_IN_BUF_SIZE - remaining;
-			}
-			else
-			{
-				read_size = MP3_IN_BUF_SIZE;
-				read_start = mp3_in_buf;
-				remaining = 0;
-			}
-
-			/* Check for end */
-			cur_pos = file_tell(mp3_fd);
-			if (cur_pos + read_size >= mp3_end_pos)
-			{
-				read_size = (mp3_end_pos - cur_pos);
-			}
-
-			/* Fill buffer */
-			read_size = file_read(read_start, 1, read_size, mp3_fd);
-			if (read_size <= 0)
-			{
-				return 0;
-			}
-	
-			/* Pipe new buffer to libmad's stream decoder facility */
-			mad_stream_buffer(&mp3_stream, mp3_in_buf, read_size + remaining);
-			mp3_stream.error = 0;
-		}
-
-		/* Decode frame */
-		if (mad_frame_decode(&mp3_frame, &mp3_stream))
-			return mp3_get_stream(buf, size);
-
-		/* Apply equalizer */
-		mp3_apply_eq();
-
-		/* Update file information */
-		head = mp3_frame.header;
-		mp3_freq = head.samplerate;
-		mp3_fmt = AFMT_S16_LE;
-		mp3_channels = (head.mode == MAD_MODE_SINGLE_CHANNEL) ? 1 : 2;
-		mp3_bitrate = mp3_frame.header.bitrate;
-
-		/* Accounting */
-		mp3_frame_count ++;
-		mad_timer_add(&mp3_timer, mp3_frame.header.duration);
-		mp3_time = mp3_timer.seconds;
-
-		/* Synthesize PCM samples */
-		mad_synth_frame(&mp3_synth, &mp3_frame);
-	}
-
-	/* Convert libmad's samples from fixed point format */
-	for ( ;mp3_samples < mp3_synth.pcm.length && len < size; mp3_samples ++ )
-	{
-		short sample;
-
-		/* Left channel */
-		sample = mp3_mad_fixed_to_short(mp3_synth.pcm.samples0mp3_samples);
-		*(out_ptr ++) = sample & 0xFF;
-		*(out_ptr ++) = sample >> 8;
-		len += 2;
-
-		/* Right channel */
-		if (MAD_NCHANNELS(&mp3_frame.header) == 2)
-		{
-			sample = mp3_mad_fixed_to_short(
-					mp3_synth.pcm.samples1mp3_samples);
-			*(out_ptr ++) = sample & 0xFF;
-			*(out_ptr ++) = sample >> 8;
-			len += 2;
-		}
-	}
-
-	if (mp3_samples >= mp3_synth.pcm.length)
-		mp3_samples = 0;
-
-	return len;
-} /* End of 'mp3_get_stream' function */
-
-/* Seek song */
-void mp3_seek( int seconds )
-{
-	/* Supported only for regular files */
-	if (file_get_type(mp3_file_name) != FILE_TYPE_REGULAR)
-		return;
-	
-	if (mp3_fd != NULL)
-	{
-		mp3_seek_val = seconds;
-	}
-} /* End of 'mp3_seek' function */
-
-/* Get audio parameters */
-void mp3_get_audio_params( int *ch, int *freq, dword *fmt, int *bitrate )
-{
-	*ch = mp3_channels;
-	*freq = mp3_freq;
-	*fmt = mp3_fmt;
-	*bitrate = mp3_bitrate;
-} /* End of 'mp3_get_audio_params' function */
-
-/* Initialize genres list */
-void mp3_init_glist( void )
-{
-	genre_list_t *l;
-
-	/* Create list */
-	if ((mp3_glist = glist_new()) == NULL)
-		return;
-
-	/* Fill it */
-	l = mp3_glist;
-	glist_add(l, "", 0xFF);
-	glist_add(l, "A Capella", 0x7B);
-	glist_add(l, "Acid", 0x22);
-	glist_add(l, "Acid Jazz", 0x4A);
-	glist_add(l, "Acid Punk", 0x49);
-	glist_add(l, "Acoustic", 0x63);
-	glist_add(l, "Alt. Rock", 0x28);
-	glist_add(l, "Alternative", 0x14);
-	glist_add(l, "Ambient", 0x1A);
-	glist_add(l, "Anime", 0x91);
-	glist_add(l, "Avantgarde", 0x5A);
-	glist_add(l, "Ballad", 0x74);
-	glist_add(l, "Bass", 0x29);
-	glist_add(l, "Beat", 0x87);
-	glist_add(l, "Bebop", 0x55);
-	glist_add(l, "Big Band", 0x60);
-	glist_add(l, "Black Metal", 0x8A);
-	glist_add(l, "Bluegrass", 0x59);
-	glist_add(l, "Blues", 0x00);
-	glist_add(l, "Booty Bass", 0x6B);
-	glist_add(l, "BritPop", 0x84);
-	glist_add(l, "Cabaret", 0x41);
-	glist_add(l, "Celtic", 0x58);
-	glist_add(l, "Chamber Music", 0x68);
-	glist_add(l, "Christian Gangsta Rap", 0x88);
-	glist_add(l, "Christian Rap", 0x3D);
-	glist_add(l, "Christian Rock", 0x8D);
-	glist_add(l, "Classic Rock", 0x01);
-	glist_add(l, "Classical", 0x20);
-	glist_add(l, "Club", 0x70);
-	glist_add(l, "Club-House", 0x80);
-	glist_add(l, "Comedy", 0x39);
-	glist_add(l, "Contemporary Christian", 0x8C);
-	glist_add(l, "Country", 0x02);
-	glist_add(l, "Crossover", 0x8B);
-	glist_add(l, "Cult", 0x3A);
-	glist_add(l, "Dance", 0x03);
-	glist_add(l, "Dance Hall", 0x7D);
-	glist_add(l, "Darkwave", 0x32);
-	glist_add(l, "Death Metal", 0x16);
-	glist_add(l, "Disco", 0x04);
-	glist_add(l, "Dream", 0x37);
-	glist_add(l, "Drum & Bass", 0x7F);
-	glist_add(l, "Drum Solo", 0x7A);
-	glist_add(l, "Duet", 0x78);
-	glist_add(l, "Easy Listening", 0x62);
-	glist_add(l, "Electronic", 0x34);
-	glist_add(l, "Ethnic", 0x30);
-	glist_add(l, "Eurodance", 0x36);
-	glist_add(l, "Euro-House", 0x7C);
-	glist_add(l, "Euro-Techno", 0x19);
-	glist_add(l, "Fast-Fusion", 0x54);
-	glist_add(l, "Folk", 0x50);
-	glist_add(l, "Folk/Rock", 0x51);
-	glist_add(l, "Folklore", 0x73);
-	glist_add(l, "Freestyle", 0x77);
-	glist_add(l, "Funk", 0x05);
-	glist_add(l, "Fusion", 0x1E);
-	glist_add(l, "Game", 0x24);
-	glist_add(l, "Gangsta Rap", 0x3B);
-	glist_add(l, "Goa", 0x7E);
-	glist_add(l, "Gospel", 0x26);
-	glist_add(l, "Gothic", 0x31);
-	glist_add(l, "Gothic Rock", 0x5B);
-	glist_add(l, "Grunge", 0x06);
-	glist_add(l, "Hard Rock", 0x4F);
-	glist_add(l, "Hardcore", 0x81);
-	glist_add(l, "Heavy Metal", 0x89);
-	glist_add(l, "Hip-Hop", 0x07);
-	glist_add(l, "House", 0x23);
-	glist_add(l, "Humour", 0x64);
-	glist_add(l, "Indie", 0x83);
-	glist_add(l, "Industrial", 0x13);
-	glist_add(l, "Instrumental", 0x21);
-	glist_add(l, "Instrumental Pop", 0x2E);
-	glist_add(l, "Instrumental Rock", 0x2F);
-	glist_add(l, "Jazz", 0x08);
-	glist_add(l, "Jazz+Funk", 0x1D);
-	glist_add(l, "JPop", 0x92);
-	glist_add(l, "Jungle", 0x3F);
-	glist_add(l, "Latin", 0x56);
-	glist_add(l, "Lo-Fi", 0x47);
-	glist_add(l, "Meditative", 0x2D);
-	glist_add(l, "Merengue", 0x8E);
-	glist_add(l, "Metal", 0x09);
-	glist_add(l, "Musical", 0x4D);
-	glist_add(l, "National Folk", 0x52);
-	glist_add(l, "Native American", 0x40);
-	glist_add(l, "Negerpunk", 0x85);
-	glist_add(l, "New Age", 0x0A);
-	glist_add(l, "New Wave", 0x42);
-	glist_add(l, "Noise", 0x27);
-	glist_add(l, "Oldies", 0x0B);
-	glist_add(l, "Opera", 0x67);
-	glist_add(l, "Other", 0x0C);
-	glist_add(l, "Polka", 0x4B);
-	glist_add(l, "Polsk Punk", 0x86);
-	glist_add(l, "Pop", 0x0D);
-	glist_add(l, "Pop/Funk", 0x3E);
-	glist_add(l, "Pop-Folk", 0x35);
-	glist_add(l, "Porn Groove", 0x6D);
-	glist_add(l, "Power Ballad", 0x75);
-	glist_add(l, "Prank", 0x17);
-	glist_add(l, "Primus", 0x6C);
-	glist_add(l, "Progressive Rock", 0x5C);
-	glist_add(l, "Psychedelic", 0x43);
-	glist_add(l, "Psychedelic Rock", 0x5D);
-	glist_add(l, "Punk", 0x2B);
-	glist_add(l, "Punk Rock", 0x79);
-	glist_add(l, "R&B", 0x0E);
-	glist_add(l, "Rap", 0x0F);
-	glist_add(l, "Rave", 0x44);
-	glist_add(l, "Reggae", 0x10);
-	glist_add(l, "Retro", 0x4C);
-	glist_add(l, "Revival", 0x57);
-	glist_add(l, "Rythmic Soul", 0x76);
-	glist_add(l, "Rock", 0x11);
-	glist_add(l, "Rock & Roll", 0x4E);
-	glist_add(l, "Salsa", 0x8F);
-	glist_add(l, "Samba", 0x72);
-	glist_add(l, "Satire", 0x6E);
-	glist_add(l, "Showtunes", 0x45);
-	glist_add(l, "Ska", 0x15);
-	glist_add(l, "Slow Jam", 0x6F);
-	glist_add(l, "Slow Rock", 0x5F);
-	glist_add(l, "Sonata", 0x69);
-	glist_add(l, "Soul", 0x2A);
-	glist_add(l, "Sound Clip", 0x25);
-	glist_add(l, "Soundtrack", 0x18);
-	glist_add(l, "Southern Rock", 0x38);
-	glist_add(l, "Space", 0x2C);
-	glist_add(l, "Speech", 0x65);
-	glist_add(l, "Swing", 0x53);
-	glist_add(l, "Symphonic Rock", 0x5E);
-	glist_add(l, "Symphony", 0x6A);
-	glist_add(l, "Synthpop", 0x93);
-	glist_add(l, "Tango", 0x71);
-	glist_add(l, "Techno", 0x12);
-	glist_add(l, "Techno-Industrial", 0x33);
-	glist_add(l, "Terror", 0x82);
-	glist_add(l, "Thrash Metal", 0x90);
-	glist_add(l, "Top 40", 0x3C);
-	glist_add(l, "Trailer", 0x46);
-	glist_add(l, "Trance", 0x1F);
-	glist_add(l, "Tribal", 0x48);
-	glist_add(l, "Trip-Hop", 0x1B);
-	glist_add(l, "Vocal", 0x1C);
-} /* End of 'mp3_init_glist' function */
-
-/* Get current time */
-int mp3_get_cur_time( void )
-{
-	return mp3_time;
-} /* End of 'mp3_get_cur_time' function */
-
-/* Remove ID3 tags */
-static void mp3_remove_tag( char *filename )
-{
-	logger_message(mp3_log, 1, _("Removing tag from file %s"), filename);
-	if (strcmp(filename, mp3_file_name))
-	{
-		id3_remove(filename);
-	}
-	else
-	{
-		mp3_need_rem_tag = TRUE;
-		if (mp3_tag != NULL)
-		{
-			id3_free(mp3_tag);
-			mp3_tag = NULL;
-		}
-		if (mp3_cur_info != NULL)
-		{
-			song_info_t *si = si_new();
-			si_set_own_data(si, mp3_cur_info->m_own_data);
-			si_free(mp3_cur_info);
-			mp3_cur_info = si;
-		}
-	}
-	logger_message(mp3_log, 1, _("OK"));
-} /* End of 'mp3_remove_tag' function */
-
-/* Handle 'ok_clicked' message for configuration dialog */
-wnd_msg_retcode_t mp3_on_configure( wnd_t *wnd )
-{
-	checkbox_t *cb = CHECKBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd),
-				"quick_getlen"));
-	assert(cb);
-	cfg_set_var_bool(mp3_cfg, "quick-get-len", cb->m_checked);
-	return WND_MSG_RETCODE_OK;
-} /* End of 'mp3_on_configure' function */
-
-/* Launch configuration dialog */
-void mp3_configure( wnd_t *parent )
-{
-	dialog_t *dlg;
-
-	dlg = dialog_new(parent, _("Configure mp3 plugin"));
-	checkbox_new(WND_OBJ(dlg->m_vbox),
-			_("&Quick length calculation"), "quick_getlen", 'u', 
-			cfg_get_var_bool(mp3_cfg, "quick-get-len"));
-	wnd_msg_add_handler(WND_OBJ(dlg), "ok_clicked", mp3_on_configure);
-	dialog_arrange_children(dlg);
-} /* End of 'mp3_configure' function */
-
-/* Exchange data with main program */
-void plugin_exchange_data( plugin_data_t *pd )
-{
-	pd->m_desc = mp3_desc;
-	pd->m_author = mp3_author;
-	pd->m_configure = mp3_configure;
-	INP_DATA(pd)->m_start = mp3_start;
-	INP_DATA(pd)->m_start_with_fd = mp3_start_with_fd;
-	INP_DATA(pd)->m_end = mp3_end;
-	INP_DATA(pd)->m_get_stream = mp3_get_stream;
-	INP_DATA(pd)->m_get_info = mp3_get_info;
-	INP_DATA(pd)->m_save_info = mp3_save_info;
-	INP_DATA(pd)->m_seek = mp3_seek;
-	INP_DATA(pd)->m_get_audio_params = mp3_get_audio_params;
-	INP_DATA(pd)->m_get_formats = mp3_get_formats;
-	INP_DATA(pd)->m_set_eq = mp3_set_eq;
-	INP_DATA(pd)->m_get_cur_time = mp3_get_cur_time;
-	mp3_pmng = pd->m_pmng;
-	mp3_log = pd->m_logger;
-	mp3_cfg = pd->m_cfg;
-	mp3_root_cfg = pd->m_root_cfg;
-
-	INP_DATA(pd)->m_num_spec_funcs = 1;
-	INP_DATA(pd)->m_spec_funcs =
-		(inp_spec_func_t *)malloc(sizeof(inp_spec_func_t));
-	INP_DATA(pd)->m_spec_funcs0.m_title = strdup(_("Remove ID3 tags"));
-	INP_DATA(pd)->m_spec_funcs0.m_flags = 0;
-	INP_DATA(pd)->m_spec_funcs0.m_func = mp3_remove_tag;
-} /* End of 'plugin_exchange_data' function */
-
-/* This function is called when initializing module */
-void _init( void )
-{
-	/* Initialize genres list */
-	mp3_init_glist();
-} /* End of '_init' function */
-
-/* This function is called when uninitializing module */
-void _fini( void )
-{
-	glist_free(mp3_glist);
-} /* End of '_fini' function */
-
-/* Set equalizer parameters */
-void mp3_set_eq( void )
-{
-	byte map32 = { 0, 1, 2, 3, 4, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8,
-  						8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 
-						9, 9, 9	};
-	int i;
-	
-	for ( i = 0; i < 32; i ++ )
-	{
-		char name256;
-		float val;
-		
-		snprintf(name, sizeof(name), "equalizer.band%d", mapi + 1);
-		val = cfg_get_var_float(mp3_root_cfg, "equalizer.preamp") + 
-			cfg_get_var_float(mp3_root_cfg, name);
-		if (val > 18.)
-			val = 18.;
-		val = pow(10., val / 20.);
-		mp3_eq_muli = mad_f_tofixed(val);
-	}
-} /* End of 'mp3_set_eq' function */
-
-/* Apply equalizer to frame */
-static void mp3_apply_eq( void )
-{
-	unsigned int nch, ch, ns, s, sb;
-
-	/* Do nothing if equalizer is disabled */
-	if (!cfg_get_var_bool(mp3_root_cfg, "equalizer.enabled"))
-		return;
-
-	nch = MAD_NCHANNELS(&mp3_frame.header);
-	ns = MAD_NSBSAMPLES(&mp3_frame.header);
-	for ( ch = 0; ch < nch; ++ch )
-		for ( s = 0; s < ns; ++s )
-			for ( sb = 0; sb < 32; ++sb )
-				mp3_frame.sbsamplechssb = 
-					mad_f_mul(mp3_frame.sbsamplechssb, mp3_eq_mulsb);
-} /* End of 'mp3_apply_eq' function */
-
-/* Read song parameters */
-static void mp3_read_song_params( void )
-{
-	struct mad_stream stream;
-	struct mad_header head;
-	byte buffer8192;
-	int buflen = 0;
-
-	/* Initialize MAD structures */
-	mad_stream_init(&stream);
-	mad_header_init(&head);
-
-	/* Scan file */
-	for ( ;; )
-	{
-		/* Read data */
-		if (buflen < sizeof(buffer))
-		{
-			dword bytes;
-			
-			bytes = file_read(buffer + buflen, 1, 
-					sizeof(buffer) - buflen, mp3_fd);
-			if (bytes <= 0)
-				break;
-			buflen += bytes;
-		}
-
-		/* Pipe data to MAD stream */
-		mad_stream_buffer(&stream, buffer, buflen);
-
-		/* Decode frame header */
-		mad_header_decode(&head, &stream);
-
-		/* Move rest data (not decoded) to buffer start */
-		memmove(buffer, stream.next_frame, &bufferbuflen - stream.next_frame);
-		buflen -= stream.next_frame - &buffer0;
-
-		/* Save parameters */
-		if (head.bitrate)
-		{
-			mp3_freq = head.samplerate;
-			mp3_fmt = AFMT_S16_LE;
-			mp3_channels = (head.mode == MAD_MODE_SINGLE_CHANNEL) ? 1 : 2;
-			mp3_bitrate = head.bitrate;
-			memcpy(&mp3_head, &head, sizeof(head));
-			break;
-		}
-	} 
-	
-	/* Unitialize all */
-	mad_header_finish(&head);
-	mad_stream_finish(&stream);
-	file_seek(mp3_fd, mp3_start_pos, SEEK_SET);
-} /* End of 'mp3_read_song_params' function */
-
-/* Read mp3 file header */
-static void mp3_read_header( char *filename, int data_offset, 
-		struct mad_header *head )
-{
-	struct mad_stream stream;
-	byte buffer8192;
-	int buflen = 0;
-	file_t *fd;
-
-	if (!strcmp(filename, mp3_file_name))
-		return;
-
-	/* Open file */
-	fd = file_open(filename, "rb", mp3_log);
-	if (fd == NULL)
-		return;
-	file_seek(fd, data_offset, SEEK_SET);
-
-	/* Initialize MAD structures */
-	mad_stream_init(&stream);
-
-	/* Scan file */
-	for ( ;; )
-	{
-		/* Read data */
-		if (buflen < sizeof(buffer))
-		{
-			dword bytes;
-			
-			bytes = file_read(buffer + buflen, 1, sizeof(buffer) - buflen, fd);
-			if (bytes <= 0)
-				break;
-			buflen += bytes;
-		}
-
-		/* Pipe data to MAD stream */
-		mad_stream_buffer(&stream, buffer, buflen);
-
-		/* Decode frame header */
-		mad_header_decode(head, &stream);
-
-		/* Move rest data (not decoded) to buffer start */
-		memmove(buffer, stream.next_frame, &bufferbuflen - stream.next_frame);
-		buflen -= stream.next_frame - &buffer0;
-
-		/* Save parameters */
-		if (head->bitrate)
-			break;
-	} 
-
-	/* Unitialize all */
-	mad_stream_finish(&stream);
-	file_close(fd);
-} /* End of 'mp3_read_header' function */
-
-/* Set default configuration values */
-void plugin_set_cfg_default( cfg_node_t *list )
-{
-	cfg_set_var_bool(list, "quick-get-len", TRUE);
-} /* End of 'plugin_set_cfg_default' function */
-
-/* End of 'mp3.c' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/input/mp3/mp3.h Deleted

@@ -1,71 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Interface for MP3 input plugin functions.
- * $Id: mp3.h 231 2005-03-28 09:29:54Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include "types.h"
-#include "file.h"
-#include "song_info.h"
-
-/* Start play function */
-bool_t mp3_start( char *filename );
-
-/* End playing function */
-void mp3_end( void );
-
-/* Get supported formats function */
-void mp3_get_formats( char *extensions, char *content_type );
-
-/* Get stream function */
-int mp3_get_stream( void *buf, int size );
-
-/* Seek song */
-void mp3_seek( int seconds );
-
-/* Get song information (exported) */
-song_info_t *mp3_get_info( char *filename, int *len );
-
-/* Set equalizer parameters */
-void mp3_set_eq( void );
-
-/* Get audio parameters */
-void mp3_get_audio_params( int *ch, int *freq, dword *fmt, int *bitrate );
-
-/* Decode a frame */
-static void mp3_decode_frame( void );
-
-/* Save ID3 tag */
-static void mp3_save_tag( char *filename, byte *tag, int tag_size );
-
-/* Apply equalizer to frame */
-static void mp3_apply_eq( void );
-
-/* Buffering read from file */
-static int mp3_read( void *ptr, int size, file_t *fd );
-
-/* Read song parameters */
-static void mp3_read_song_params( void );
-
-/* Read mp3 file header */
-static void mp3_read_header( char *filename, int data_offset,
-		struct mad_header *head );
-
-/* End of 'mp3.h' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/input/ogg Deleted

mpfc-1.3.8.1.tar.bz2/plugins/input/ogg/Makefile.am Deleted

mpfc-1.3.8.1.tar.bz2/plugins/input/ogg/Makefile.in Deleted

@@ -1,587 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/input/ogg
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/mpfc-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(mylibdir)"
-LTLIBRARIES = $(mylib_LTLIBRARIES)
-libogg_vorbis_la_DEPENDENCIES =
-am_libogg_vorbis_la_OBJECTS = ogg.lo vcedit.lo
-libogg_vorbis_la_OBJECTS = $(am_libogg_vorbis_la_OBJECTS)
-libogg_vorbis_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libogg_vorbis_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libogg_vorbis_la_SOURCES)
-DIST_SOURCES = $(libogg_vorbis_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
-COMMON_LIBS = @COMMON_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURSES_LIBS = @CURSES_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
-GENCAT = @GENCAT@
-GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GPM_LIBS = @GPM_LIBS@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESOLV_LIBS = @RESOLV_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-mylib_LTLIBRARIES = libogg_vorbis.la
-mylibdir = $(libdir)/mpfc/input
-libogg_vorbis_la_SOURCES = ogg.c vcedit.c vcedit.h
-INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-libogg_vorbis_la_LDFLAGS = -Xcompiler -nostartfiles
-libogg_vorbis_la_LIBADD = @COMMON_LIBS@ @OGG_LIBS@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/input/ogg/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/input/ogg/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
-	}
-
-uninstall-mylibLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
-	done
-
-clean-mylibLTLIBRARIES:
-	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
-	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libogg_vorbis.la: $(libogg_vorbis_la_OBJECTS) $(libogg_vorbis_la_DEPENDENCIES) 
-	$(libogg_vorbis_la_LINK) -rpath $(mylibdir) $(libogg_vorbis_la_OBJECTS) $(libogg_vorbis_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcedit.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(mylibdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-mylibLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-mylibLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-mylibLTLIBRARIES
-
-
-# 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:

mpfc-1.3.8.1.tar.bz2/plugins/input/ogg/ogg.c Deleted

@@ -1,680 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Ogg Vorbis input plugin functions implementation.
- * $Id: ogg.c 307 2011-03-13 11:58:47Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/soundcard.h>
-#include <pthread.h>
-#include <vorbis/codec.h>
-#include <vorbis/vorbisfile.h>
-#include "types.h"
-#include "file.h"
-#include "genre_list.h"
-#include "inp.h"
-#include "pmng.h"
-#include "song_info.h"
-#include "util.h"
-#include "vcedit.h"
-#include "wnd.h"
-#include "wnd_checkbox.h"
-#include "wnd_dialog.h"
-
-/* Ogg Vorbis file object */
-static OggVorbis_File ogg_vf;
-
-/* Audio parameters */
-static int ogg_channels = 0, ogg_freq = 0, ogg_bitrate = 0;
-static dword ogg_fmt = 0;
-
-/* Genres list */
-static genre_list_t *ogg_glist = NULL;
-
-/* Plugins manager */
-static pmng_t *ogg_pmng = NULL;
-
-/* Currently playing song file name */
-static char ogg_filenameMAX_FILE_NAME = "";
-
-/* Song info to save after play end */
-static song_info_t *ogg_info = NULL;
-
-/* Audio information of the current song */
-static vorbis_info *ogg_vi = NULL;
-
-/* Some declarations */
-bool_t ogg_save_info( char *filename, song_info_t *info );
-
-/* Callback functions for libvorbis */
-static size_t ogg_file_read( void *ptr, size_t size, size_t nmemb, 
-		void *datasource );
-static int ogg_file_seek( void *datasource, ogg_int64_t offset, int whence );
-static int ogg_file_close( void *datasource );
-static long ogg_file_tell( void *datasource );
-static ov_callbacks ogg_callbacks = { ogg_file_read, ogg_file_seek, 
-	ogg_file_close, ogg_file_tell };
-
-/* Mutex for synchronizing operations */
-static pthread_mutex_t ogg_mutex;
-
-/* Logger */
-static logger_t *ogg_log;
-
-/* Configuration list */
-static cfg_node_t *ogg_cfg;
-
-/* Plugin info */
-static char *ogg_desc = "OggVorbis plugin";
-static char *ogg_author = "Sergey E. Galanov <sgsoftware@mail.ru>";
-
-/* Start playing with an opened file descriptor */
-bool_t ogg_start_with_fd( char *filename, file_t *fd )
-{
-	vorbis_comment *comment;
-	int i;
-
-	/* Open file */
-	if (fd == NULL)
-	{
-		fd = file_open(filename, "rb", ogg_log);
-		if (fd == NULL)
-			return FALSE;
-	}
-	if (ov_open_callbacks(fd, &ogg_vf, NULL, 0, ogg_callbacks) < 0)
-	{
-		file_close(fd);
-		return FALSE;
-	}
-
-	/* Create mutex */
-	pthread_mutex_init(&ogg_mutex, NULL);
-
-	/* Get audio parameters */
-	ogg_fmt = AFMT_S16_LE;
-	ogg_vi = ov_info(&ogg_vf, -1);
-	ogg_channels = ogg_vi->channels;
-	ogg_freq = ogg_vi->rate;
-	ogg_bitrate = 0;
-	ogg_info = NULL;
-	file_set_min_buf_size(fd, ogg_vi->bitrate_nominal >> 3);
-	util_strncpy(ogg_filename, filename, sizeof(ogg_filename));
-	return TRUE;
-} /* End of 'ogg_start_with_fd' function */
-
-/* Start playing */
-bool_t ogg_start( char *filename )
-{
-	return ogg_start_with_fd(filename, NULL);
-} /* End of 'ogg_start' function */
-
-/* End playing */
-void ogg_end( void )
-{
-	char fnameMAX_FILE_NAME;
-	
-	ov_clear(&ogg_vf);
-
-	/* Save info if need */
-	util_strncpy(fname, ogg_filename, sizeof(fname));
-	strcpy(ogg_filename, "");
-	ogg_vi = NULL;
-	if (ogg_info != NULL)
-	{
-		ogg_save_info(fname, ogg_info);
-		si_free(ogg_info);
-		ogg_info = NULL;
-	}
-	ogg_bitrate = 0;
-	ogg_freq = 0;
-	ogg_channels = 0;
-	ogg_fmt = 0;
-
-	/* Destroy mutex */
-	pthread_mutex_destroy(&ogg_mutex);
-} /* End of 'ogg_end' function */
-
-/* Lock mutex */
-static void ogg_lock( void )
-{
-	pthread_mutex_lock(&ogg_mutex);
-} /* End of 'ogg_lock' function */
-
-/* Unlock mutex */
-static void ogg_unlock( void )
-{
-	pthread_mutex_unlock(&ogg_mutex);
-} /* End of 'ogg_unlock' function */
-
-/* Get supported formats */
-void ogg_get_formats( char *extensions, char *content_type )
-{
-	if (extensions != NULL)
-		strcpy(extensions, "ogg");
-	if (content_type != NULL)
-		strcpy(content_type, "application/ogg");
-} /* End of 'ogg_get_formats' function */
-
-/* Get stream */
-int ogg_get_stream( void *buf, int size ) 
-{
-	int current_section, ret;
-
-	ogg_lock();
-	ret = ov_read(&ogg_vf, buf, size, 0, 2, 1, &current_section);
-	ogg_bitrate = ov_bitrate(&ogg_vf, current_section);
-	ogg_freq = ogg_vi->rate;
-	ogg_channels = ogg_vi->channels;
-	if (!(ogg_vi->bitrate_upper == ogg_vi->bitrate_lower && 
-				ogg_vi->bitrate_upper == ogg_vi->bitrate_nominal))
-		ogg_bitrate = ov_bitrate_instant(&ogg_vf);
-	ogg_unlock();
-	return ret;
-} /* End of 'ogg_get_stream' function */
-
-/* Seek song */
-void ogg_seek( int val )
-{
-	/* Supported only for regular files */
-	if (file_get_type(ogg_filename) != FILE_TYPE_REGULAR)
-		return;
-	
-	ogg_lock();
-	ov_time_seek(&ogg_vf, val);
-	ogg_unlock();
-} /* End of 'ogg_seek' function */
-
-/* Get audio parameters */
-void ogg_get_audio_params( int *ch, int *freq, dword *fmt, int *bitrate )
-{
-	*ch = ogg_channels;
-	*freq = ogg_freq;
-	*fmt = ogg_fmt;
-	*bitrate = ogg_bitrate;
-} /* End of 'ogg_get_audio_params' function */
-
-/* Get current time */
-int ogg_get_cur_time( void )
-{
-	return ov_time_tell(&ogg_vf);
-} /* End of 'ogg_get_cur_time' function */
-
-/* Get comments list from vorbis comment */
-static char **ogg_get_comment_list( vorbis_comment *vc )
-{
-	int i;
-	char **strv;
-
-	strv = (char **)malloc(sizeof(char *) * (vc->comments + 1));
-	for ( i = 0; i < vc->comments; i ++ )
-		strvi = strdup(vc->user_commentsi);
-	strvi = NULL;
-	return strv;
-} /* End of 'ogg_get_comment_list' function */
-
-/* Add tag to comments list */
-static char **ogg_add_tag( char **list, char *label, char *tag )
-{
-	char str256;
-	int len;
-	int i;
-
-	/* Search list for our tag */
-	snprintf(str, sizeof(str), "%s=%s", label, tag);
-	len = strlen(label) + 1;
-	for ( i = 0; listi != NULL; i ++ )
-	{
-		/* Found - modify it */
-		if (!strncasecmp(str, listi, len))
-		{
-			free(listi);
-			listi = strdup(str);
-			return list; 
-		}
-	}
-	/* Not found - add tag */
-	list = (char **)realloc(list, sizeof(char *) * (i + 2));
-	listi = strdup(str);
-	listi + 1 = NULL;
-	return list;
-} /* End of 'ogg_add_tag' function */
-
-/* Add comments list to vorbis comment */
-static void ogg_add_list( vorbis_comment *vc, char **comments )
-{
-	while (*comments)
-		vorbis_comment_add(vc, *comments++);
-} /* End of 'ogg_add_list' function */
-
-/* Save song information */
-bool_t ogg_save_info( char *filename, song_info_t *info )
-{
-	char **comment_list;
-	vcedit_state *state;
-	vorbis_comment *comment;
-	FILE *in, *out;
-	int i, outfd;
-	char tmpfnMAX_FILE_NAME;
-	
-	/* Supported only for regular files */
-	if (file_get_type(filename) != FILE_TYPE_REGULAR)
-	{
-		logger_error(ogg_log, 1, _("Only regular files are supported for"
-					"writing info by ogg plugin"));
-		return FALSE;
-	}
-
-	/* Convert to UTF-8 if need */
-	if (cfg_get_var_int(ogg_cfg, "always-use-utf8") &&
-			(info->m_charset == NULL || strcasecmp(info->m_charset, "utf-8")))
-	{
-		si_convert_cs(info, "utf-8", ogg_pmng);
-	}
-	
-	/* Schedule info for saving if we are playing this file now */
-	if (!strcmp(filename, ogg_filename))
-	{
-		if (ogg_info != NULL)
-			si_free(ogg_info);
-		ogg_info = si_dup(info);
-		return TRUE;
-	}
-
-	/* Read current info at first */
-	state = vcedit_new_state();
-	in = fopen(filename, "rb");
-	if (in == NULL)
-	{
-		vcedit_clear(state);
-		logger_error(ogg_log, 1, _("Unable to open file %s"), filename);
-		return FALSE;
-	}
-	if (vcedit_open(state, in) < 0)
-	{
-		fclose(in);
-		vcedit_clear(state);
-		return FALSE;
-	}
-	comment = vcedit_comments(state);
-	comment_list = ogg_get_comment_list(comment);
-	vorbis_comment_clear(comment);
-
-	/* Set our fields */
-	comment_list = ogg_add_tag(comment_list, "title", info->m_name);
-	comment_list = ogg_add_tag(comment_list, "artist", info->m_artist);
-	comment_list = ogg_add_tag(comment_list, "album", info->m_album);
-	comment_list = ogg_add_tag(comment_list, "tracknumber", info->m_track);
-	comment_list = ogg_add_tag(comment_list, "date", info->m_year);
-	comment_list = ogg_add_tag(comment_list, "genre", info->m_genre);
-	//comment_list = ogg_add_tag(comment_list, "", info->m_comments);
-	ogg_add_list(comment, comment_list);
-	for ( i = 0; comment_listi != NULL; i ++ )
-		free(comment_listi);
-	free(comment_list);
-
-	/* Save */
-	snprintf(tmpfn, sizeof(tmpfn), "%s.XXXXXX", filename);
-	if ((outfd = mkstemp(tmpfn)) < 0)
-	{
-		fclose(in);
-		vcedit_clear(state);
-		return FALSE;
-	}
-	if ((out = fdopen(outfd, "wb")) == NULL)
-	{
-		close(outfd);
-		fclose(in);
-		vcedit_clear(state);
-		logger_error(ogg_log, 1, _("Unable to open file %s for writing"), 
-				tmpfn);
-		return FALSE;
-	}
-	vcedit_write(state, out);
-	vcedit_clear(state);
-	fclose(in);
-	fclose(out);
-	rename(tmpfn, filename);
-	return TRUE;
-} /* End of 'ogg_save_info' function */
-
-/* Get song information */
-song_info_t *ogg_get_info( char *filename, int *len )
-{
-	OggVorbis_File vf;
-	file_t *fd;
-	vorbis_comment *comment;
-	vorbis_info *vi;
-	song_info_t *si = NULL;
-	char own_data1024;
-
-	/* For non-regular files return only audio parameters */
-	*len = 0;
-	if (file_get_type(filename) != FILE_TYPE_REGULAR)
-	{
-		if (strcmp(filename, ogg_filename))
-			return NULL;
-
-		si = si_new();
-		si->m_flags |= SI_ONLY_OWN;
-		snprintf(own_data, sizeof(own_data),
-				_("Nominal bitrate: %li kb/s\n"
-				"Samplerate: %li Hz\n"
-				"Channels: %i"),
-				ogg_vi->bitrate_nominal / 1000, ogg_vi->rate, 
-				ogg_vi->channels);
-		si_set_own_data(si, own_data);
-		return si;
-	}
-
-	/* Return current info if we have it */
-	if (ogg_info != NULL && !strcmp(filename, ogg_filename))
-	{
-		return si_dup(ogg_info);
-	}
-
-	/* Open file */
-	fd = file_open(filename, "rb", ogg_log);
-	if (fd == NULL)
-		return NULL;
-	if (ov_open_callbacks(fd, &vf, NULL, 0, ogg_callbacks) < 0)
-	{
-		file_close(fd);
-		return NULL;
-	}
-
-	*len = ov_time_total(&vf, -1);
-	si = si_new();
-	si->m_glist = ogg_glist;
-	comment = ov_comment(&vf, -1);
-	si_set_name(si, vorbis_comment_query(comment, "title", 0));
-	si_set_artist(si, vorbis_comment_query(comment, "artist", 0));
-	si_set_album(si, vorbis_comment_query(comment, "album", 0));
-	si_set_track(si, vorbis_comment_query(comment, "tracknumber", 0));
-	si_set_year(si, vorbis_comment_query(comment, "date", 0));
-	si_set_genre(si, vorbis_comment_query(comment, "genre", 0));
-
-	/* Set additional information */
-	vi = ov_info(&vf, -1);
-	if (vi != NULL)
-	{
-		snprintf(own_data, sizeof(own_data),
-				_("Nominal bitrate: %li kb/s\n"
-				"Samplerate: %li Hz\n"
-				"Channels: %i\n"
-				"Length: %i seconds\n"
-				"File size: %i bytes"),
-				vi->bitrate_nominal / 1000, vi->rate, vi->channels, 
-				*len, util_get_file_size(filename));
-		si_set_own_data(si, own_data);
-	}
-
-	/* Close file */
-	ov_clear(&vf);
-	return si;
-} /* End of 'ogg_get_info' function */
-
-/* Handle 'ok_clicked' message for configuration dialog */
-wnd_msg_retcode_t ogg_on_configure( wnd_t *wnd )
-{
-	checkbox_t *cb = CHECKBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd),
-				"always_use_utf8"));
-	assert(cb);
-	cfg_set_var_bool(ogg_cfg, "always-use-utf8", cb->m_checked);
-	return WND_MSG_RETCODE_OK;
-} /* End of 'ogg_on_configure' function */
-
-/* Launch configuration dialog */
-void ogg_configure( wnd_t *parent )
-{
-	dialog_t *dlg;
-
-	dlg = dialog_new(parent, _("Configure OggVorbis plugin"));
-	checkbox_new(WND_OBJ(dlg->m_vbox),
-			_("Always use &UTF-8"), "always_use_utf8", 'u', 
-			cfg_get_var_bool(ogg_cfg, "always-use-utf8"));
-	wnd_msg_add_handler(WND_OBJ(dlg), "ok_clicked", ogg_on_configure);
-	dialog_arrange_children(dlg);
-} /* End of 'ogg_configure' function */
-
-/* Exchange data with main program */
-void plugin_exchange_data( plugin_data_t *pd )
-{
-	pd->m_desc = ogg_desc;
-	pd->m_author = ogg_author;
-	pd->m_configure = ogg_configure;
-	INP_DATA(pd)->m_start = ogg_start;
-	INP_DATA(pd)->m_end = ogg_end;
-	INP_DATA(pd)->m_get_stream = ogg_get_stream;
-	INP_DATA(pd)->m_seek = ogg_seek;
-	INP_DATA(pd)->m_get_audio_params = ogg_get_audio_params;
-	INP_DATA(pd)->m_get_cur_time = ogg_get_cur_time;
-	INP_DATA(pd)->m_get_formats = ogg_get_formats;
-	INP_DATA(pd)->m_save_info = ogg_save_info;
-	INP_DATA(pd)->m_get_info = ogg_get_info;
-	ogg_pmng = pd->m_pmng;
-	ogg_log = pd->m_logger;
-	ogg_cfg = pd->m_cfg;
-} /* End of 'ogg_get_func_list' function */
-
-/* Initialize genres list */
-static void ogg_init_glist( void )
-{
-	genre_list_t *l;
-
-	/* Create list */
-	if ((ogg_glist = glist_new()) == NULL)
-		return;
-
-	/* Fill it */
-	l = ogg_glist;
-	glist_add(l, "A Capella", 0);
-	glist_add(l, "Acid", 0);
-	glist_add(l, "Acid Jazz", 0);
-	glist_add(l, "Acid Punk", 0);
-	glist_add(l, "Acoustic", 0);
-	glist_add(l, "Alt", 0);
-	glist_add(l, "Alternative", 0);
-	glist_add(l, "Ambient", 0);
-	glist_add(l, "Anime", 0);
-	glist_add(l, "Avantgarde", 0);
-	glist_add(l, "Ballad", 0);
-	glist_add(l, "Bass", 0);
-	glist_add(l, "Beat", 0);
-	glist_add(l, "Bebob", 0);
-	glist_add(l, "Big Band", 0);
-	glist_add(l, "Black Metal", 0);
-	glist_add(l, "Bluegrass", 0);
-	glist_add(l, "Blues", 0);
-	glist_add(l, "Booty Bass", 0);
-	glist_add(l, "BritPop", 0);
-	glist_add(l, "Cabaret", 0);
-	glist_add(l, "Celtic", 0);
-	glist_add(l, "Chamber Music", 0);
-	glist_add(l, "Chanson", 0);
-	glist_add(l, "Chorus", 0);
-	glist_add(l, "Christian Gangsta Rap", 0);
-	glist_add(l, "Christian Rap", 0);
-	glist_add(l, "Christian Rock", 0);
-	glist_add(l, "Classical", 0);
-	glist_add(l, "Classic Rock", 0);
-	glist_add(l, "Club", 0);
-	glist_add(l, "Club-House", 0);
-	glist_add(l, "Comedy", 0);
-	glist_add(l, "Contemporary Christian", 0);
-	glist_add(l, "Country", 0);
-	glist_add(l, "Crossover", 0);
-	glist_add(l, "Cult", 0);
-	glist_add(l, "Dance", 0);
-	glist_add(l, "Dance Hall", 0);
-	glist_add(l, "Darkwave", 0);
-	glist_add(l, "Death Metal", 0);
-	glist_add(l, "Disco", 0);
-	glist_add(l, "Dream", 0);
-	glist_add(l, "Drum & Bass", 0);
-	glist_add(l, "Drum Solo", 0);
-	glist_add(l, "Duet", 0);
-	glist_add(l, "Easy Listening", 0);
-	glist_add(l, "Electronic", 0);
-	glist_add(l, "Ethnic", 0);
-	glist_add(l, "Eurodance", 0);
-	glist_add(l, "Euro-House", 0);
-	glist_add(l, "Euro-Techno", 0);
-	glist_add(l, "Fast-Fusion", 0);
-	glist_add(l, "Folk", 0);
-	glist_add(l, "Folklore", 0);
-	glist_add(l, "Folk/Rock", 0);
-	glist_add(l, "Freestyle", 0);
-	glist_add(l, "Funk", 0);
-	glist_add(l, "Fusion", 0);
-	glist_add(l, "Game", 0);
-	glist_add(l, "Gangsta Rap", 0);
-	glist_add(l, "Goa", 0);
-	glist_add(l, "Gospel", 0);
-	glist_add(l, "Gothic", 0);
-	glist_add(l, "Gothic Rock", 0);
-	glist_add(l, "Grunge", 0);
-	glist_add(l, "Hardcore", 0);
-	glist_add(l, "Hard Rock", 0);
-	glist_add(l, "Heavy Metal", 0);
-	glist_add(l, "House", 0);
-	glist_add(l, "Humour", 0);
-	glist_add(l, "Indie", 0);
-	glist_add(l, "Industrial", 0);
-	glist_add(l, "Instrumental", 0);
-	glist_add(l, "Instrumental Pop", 0);
-	glist_add(l, "Jazz+Funk", 0);
-	glist_add(l, "JPop", 0);
-	glist_add(l, "Jungle", 0);
-	glist_add(l, "Latin", 0);
-	glist_add(l, "Lo-Fi", 0);
-	glist_add(l, "Meditative", 0);
-	glist_add(l, "Merengue", 0);
-	glist_add(l, "Metal", 0);
-	glist_add(l, "Musical", 0);
-	glist_add(l, "National Folk", 0);
-	glist_add(l, "Native American", 0);
-	glist_add(l, "Negerpunk", 0);
-	glist_add(l, "New Age", 0);
-	glist_add(l, "New Wave", 0);
-	glist_add(l, "Noise", 0);
-	glist_add(l, "Oldies", 0);
-	glist_add(l, "Opera", 0);
-	glist_add(l, "Other", 0);
-	glist_add(l, "Polka", 0);
-	glist_add(l, "Polsk Punk", 0);
-	glist_add(l, "Pop", 0);
-	glist_add(l, "Pop-Folk", 0);
-	glist_add(l, "Pop/Funk", 0);
-	glist_add(l, "Porn Groove", 0);
-	glist_add(l, "Power Ballad", 0);
-	glist_add(l, "Pranks", 0);
-	glist_add(l, "Primus", 0);
-	glist_add(l, "Progressive Rock", 0);
-	glist_add(l, "Psychedelic", 0);
-	glist_add(l, "Psychedelic Rock", 0);
-	glist_add(l, "Punk", 0);
-	glist_add(l, "Punk Rock", 0);
-	glist_add(l, "Rap", 0);
-	glist_add(l, "Rave", 0);
-	glist_add(l, "R&B", 0);
-	glist_add(l, "Reggae", 0);
-	glist_add(l, "Retro", 0);
-	glist_add(l, "Revival", 0);
-	glist_add(l, "Rhythmic Soul", 0);
-	glist_add(l, "Rock", 0);
-	glist_add(l, "Rock & Roll", 0);
-	glist_add(l, "Salsa", 0);
-	glist_add(l, "Samba", 0);
-	glist_add(l, "Satire", 0);
-	glist_add(l, "Showtunes", 0);
-	glist_add(l, "Ska", 0);
-	glist_add(l, "Slow Jam", 0);
-	glist_add(l, "Slow Rock", 0);
-	glist_add(l, "Sonata", 0);
-	glist_add(l, "Soul", 0);
-	glist_add(l, "Sound Clip", 0);
-	glist_add(l, "Soundtrack", 0);
-	glist_add(l, "Southern Rock", 0);
-	glist_add(l, "Space", 0);
-	glist_add(l, "Speech", 0);
-	glist_add(l, "Swing", 0);
-	glist_add(l, "Symphonic Rock", 0);
-	glist_add(l, "Symphony", 0);
-	glist_add(l, "Synthpop", 0);
-	glist_add(l, "Tango", 0);
-	glist_add(l, "Techno", 0);
-	glist_add(l, "Techno-Industrial", 0);
-	glist_add(l, "Terror", 0);
-	glist_add(l, "Thrash Metal", 0);
-	glist_add(l, "Top 40", 0);
-	glist_add(l, "Trailer", 0);
-	glist_add(l, "Trance", 0);
-	glist_add(l, "Tribal", 0);
-	glist_add(l, "Trip-Hop", 0);
-	glist_add(l, "Vocal", 0);
-} /* End of 'ogg_init_glist' function */
-	
-/* This function is called when initializing module */
-void _init( void )
-{
-	/* Initialize genres list */
-	ogg_init_glist();
-} /* End of '_init' function */
-
-/* This function is called when uninitializing module */
-void _fini( void )
-{
-	glist_free(ogg_glist);
-} /* End of '_fini' function */
-
-/* Helper seeking function */
-static int ogg_file_seek( void *datasource, ogg_int64_t offset, int whence )
-{
-	file_t *fd = (file_t *)datasource;
-
-	if (fd->m_type == FILE_TYPE_HTTP)
-		return -1;
-	else
-		return file_seek(fd, offset, whence);
-} /* End of 'ogg_file_seek' function */
-	
-/* Helper reading function */
-static size_t ogg_file_read( void *ptr, size_t size, size_t nmemb, 
-		void *datasource )
-{
-	return file_read(ptr, size, nmemb, datasource);
-} /* End of 'ogg_file_read' function */
-
-/* Helper file closing function */
-static int ogg_file_close( void *datasource )
-{
-	return file_close(datasource);
-} /* End of 'ogg_file_close' function */
-
-/* Helper file position telling function */
-static long ogg_file_tell( void *datasource )
-{
-	return file_tell(datasource);
-} /* End of 'ogg_file_tell' function */
-
-/* End of 'ogg.c' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/input/ogg/vcedit.c Deleted

@@ -1,494 +0,0 @@
-/* This program is licensed under the GNU Library General Public License, version 2,
- * a copy of which is included with this program (LICENCE.LGPL).
- *
- * (c) 2000-2001 Michael Smith <msmith@labyrinth.net.au>
- *
- *
- * Comment editing backend, suitable for use by nice frontend interfaces.
- *
- * last modified: $Id: vcedit.c 229 2005-02-21 18:36:59Z sg2 $
- */
-
-#include "types.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <ogg/ogg.h>
-#include <vorbis/codec.h>
-
-#include "vcedit.h"
-
-
-#define CHUNKSIZE 4096
-
-vcedit_state *vcedit_new_state(void)
-{
-	vcedit_state *state = malloc(sizeof(vcedit_state));
-	memset(state, 0, sizeof(vcedit_state));
-
-	return state;
-}
-
-char *vcedit_error(vcedit_state *state)
-{
-	return state->lasterror;
-}
-
-vorbis_comment *vcedit_comments(vcedit_state *state)
-{
-	return state->vc;
-}
-
-static void vcedit_clear_internals(vcedit_state *state)
-{
-	if(state->vc)
-	{
-		vorbis_comment_clear(state->vc);
-		free(state->vc);
-	}
-	if(state->os)
-	{
-		ogg_stream_clear(state->os);
-		free(state->os);
-	}
-	if(state->oy)
-	{
-		ogg_sync_clear(state->oy);
-		free(state->oy);
-	}
-	if(state->vendor)
-		free(state->vendor);
-    if(state->mainbuf)
-        free(state->mainbuf);
-    if(state->bookbuf)
-        free(state->bookbuf);
-    if(state->vi) {
-       	vorbis_info_clear(state->vi);
-        free(state->vi);
-    }
-
-    memset(state, 0, sizeof(*state));
-}
-
-void vcedit_clear(vcedit_state *state)
-{
-	if(state)
-	{
-		vcedit_clear_internals(state);
-		free(state);
-	}
-}
-
-/* Next two functions pulled straight from libvorbis, apart from one change
- * - we don't want to overwrite the vendor string.
- */
-static void _v_writestring(oggpack_buffer *o,char *s, int len)
-{
-	while(len--)
-	{
-		oggpack_write(o,*s++,8);
-	}
-}
-
-static int _commentheader_out(vorbis_comment *vc, char *vendor, ogg_packet *op)
-{
-	oggpack_buffer opb;
-
-	oggpack_writeinit(&opb);
-
-	/* preamble */  
-	oggpack_write(&opb,0x03,8);
-	_v_writestring(&opb,"vorbis", 6);
-
-	/* vendor */
-	oggpack_write(&opb,strlen(vendor),32);
-	_v_writestring(&opb,vendor, strlen(vendor));
-
-	/* comments */
-	oggpack_write(&opb,vc->comments,32);
-	if(vc->comments){
-		int i;
-		for(i=0;i<vc->comments;i++){
-			if(vc->user_commentsi){
-				oggpack_write(&opb,vc->comment_lengthsi,32);
-				_v_writestring(&opb,vc->user_commentsi, 
-                        vc->comment_lengthsi);
-			}else{
-				oggpack_write(&opb,0,32);
-			}
-		}
-	}
-	oggpack_write(&opb,1,1);
-
-	op->packet = _ogg_malloc(oggpack_bytes(&opb));
-	memcpy(op->packet, opb.buffer, oggpack_bytes(&opb));
-
-	op->bytes=oggpack_bytes(&opb);
-	op->b_o_s=0;
-	op->e_o_s=0;
-	op->granulepos=0;
-
-	oggpack_writeclear(&opb);
-	return 0;
-}
-
-static int _blocksize(vcedit_state *s, ogg_packet *p)
-{
-	int this = vorbis_packet_blocksize(s->vi, p);
-	int ret = (this + s->prevW)/4;
-
-	if(!s->prevW)
-	{
-		s->prevW = this;
-		return 0;
-	}
-
-	s->prevW = this;
-	return ret;
-}
-
-static int _fetch_next_packet(vcedit_state *s, ogg_packet *p, ogg_page *page)
-{
-	int result;
-	char *buffer;
-	int bytes;
-
-	result = ogg_stream_packetout(s->os, p);
-
-	if(result > 0)
-		return 1;
-	else
-	{
-		if(s->eosin)
-			return 0;
-		while(ogg_sync_pageout(s->oy, page) <= 0)
-		{
-			buffer = ogg_sync_buffer(s->oy, CHUNKSIZE);
-			bytes = s->read(buffer,1, CHUNKSIZE, s->in);
-			ogg_sync_wrote(s->oy, bytes);
-			if(bytes == 0) 
-				return 0;
-		}
-		if(ogg_page_eos(page))
-			s->eosin = 1;
-		else if(ogg_page_serialno(page) != s->serial)
-		{
-			s->eosin = 1;
-			s->extrapage = 1;
-			return 0;
-		}
-
-		ogg_stream_pagein(s->os, page);
-		return _fetch_next_packet(s, p, page);
-	}
-}
-
-int vcedit_open(vcedit_state *state, FILE *in)
-{
-	return vcedit_open_callbacks(state, (void *)in, 
-			(vcedit_read_func)fread, (vcedit_write_func)fwrite);
-}
-
-int vcedit_open_callbacks(vcedit_state *state, void *in,
-		vcedit_read_func read_func, vcedit_write_func write_func)
-{
-
-	char *buffer;
-	int bytes,i;
-	ogg_packet *header;
-	ogg_packet	header_main;
-	ogg_packet  header_comments;
-	ogg_packet	header_codebooks;
-	ogg_page    og;
-
-	state->in = in;
-	state->read = read_func;
-	state->write = write_func;
-
-	state->oy = malloc(sizeof(ogg_sync_state));
-	ogg_sync_init(state->oy);
-
-	buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
-	bytes = state->read(buffer, 1, CHUNKSIZE, state->in);
-
-	ogg_sync_wrote(state->oy, bytes);
-
-	if(ogg_sync_pageout(state->oy, &og) != 1)
-	{
-		if(bytes<CHUNKSIZE)
-			state->lasterror = _("Input truncated or empty.");
-		else
-			state->lasterror = _("Input is not an Ogg bitstream.");
-		goto err;
-	}
-
-	state->serial = ogg_page_serialno(&og);
-
-	state->os = malloc(sizeof(ogg_stream_state));
-	ogg_stream_init(state->os, state->serial);
-
-    state->vi = malloc(sizeof(vorbis_info));
-	vorbis_info_init(state->vi);
-
-	state->vc = malloc(sizeof(vorbis_comment));
-	vorbis_comment_init(state->vc);
-
-	if(ogg_stream_pagein(state->os, &og) < 0)
-	{
-		state->lasterror = _("Error reading first page of Ogg bitstream.");
-		goto err;
-	}
-
-	if(ogg_stream_packetout(state->os, &header_main) != 1)
-	{
-		state->lasterror = _("Error reading initial header packet.");
-		goto err;
-	}
-
-	if(vorbis_synthesis_headerin(state->vi, state->vc, &header_main) < 0)
-	{
-		state->lasterror = _("Ogg bitstream does not contain vorbis data.");
-		goto err;
-	}
-
-	state->mainlen = header_main.bytes;
-	state->mainbuf = malloc(state->mainlen);
-	memcpy(state->mainbuf, header_main.packet, header_main.bytes);
-
-	i = 0;
-	header = &header_comments;
-	while(i<2) {
-		while(i<2) {
-			int result = ogg_sync_pageout(state->oy, &og);
-			if(result == 0) break; /* Too little data so far */
-			else if(result == 1)
-			{
-				ogg_stream_pagein(state->os, &og);
-				while(i<2)
-				{
-					result = ogg_stream_packetout(state->os, header);
-					if(result == 0) break;
-					if(result == -1)
-					{
-						state->lasterror = _("Corrupt secondary header.");
-						goto err;
-					}
-					vorbis_synthesis_headerin(state->vi, state->vc, header);
-					if(i==1)
-					{
-						state->booklen = header->bytes;
-						state->bookbuf = malloc(state->booklen);
-						memcpy(state->bookbuf, header->packet, 
-								header->bytes);
-					}
-					i++;
-					header = &header_codebooks;
-				}
-			}
-		}
-
-		buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
-		bytes = state->read(buffer, 1, CHUNKSIZE, state->in);
-		if(bytes == 0 && i < 2)
-		{
-			state->lasterror = _("EOF before end of vorbis headers.");
-			goto err;
-		}
-		ogg_sync_wrote(state->oy, bytes);
-	}
-
-	/* Copy the vendor tag */
-	state->vendor = malloc(strlen(state->vc->vendor) +1);
-	strcpy(state->vendor, state->vc->vendor);
-
-	/* Headers are done! */
-	return 0;
-
-err:
-	vcedit_clear_internals(state);
-	return -1;
-}
-
-int vcedit_write(vcedit_state *state, void *out)
-{
-	ogg_stream_state streamout;
-	ogg_packet header_main;
-	ogg_packet header_comments;
-	ogg_packet header_codebooks;
-
-	ogg_page ogout, ogin;
-	ogg_packet op;
-	ogg_int64_t granpos = 0;
-	int result;
-	char *buffer;
-	int bytes;
-	int needflush=0, needout=0;
-
-	state->eosin = 0;
-	state->extrapage = 0;
-
-	header_main.bytes = state->mainlen;
-	header_main.packet = state->mainbuf;
-	header_main.b_o_s = 1;
-	header_main.e_o_s = 0;
-	header_main.granulepos = 0;
-
-	header_codebooks.bytes = state->booklen;
-	header_codebooks.packet = state->bookbuf;
-	header_codebooks.b_o_s = 0;
-	header_codebooks.e_o_s = 0;
-	header_codebooks.granulepos = 0;
-
-	ogg_stream_init(&streamout, state->serial);
-
-	_commentheader_out(state->vc, state->vendor, &header_comments);
-
-	ogg_stream_packetin(&streamout, &header_main);
-	ogg_stream_packetin(&streamout, &header_comments);
-	ogg_stream_packetin(&streamout, &header_codebooks);
-
-	while((result = ogg_stream_flush(&streamout, &ogout)))
-	{
-		if(state->write(ogout.header,1,ogout.header_len, out) !=
-				(size_t) ogout.header_len)
-			goto cleanup;
-		if(state->write(ogout.body,1,ogout.body_len, out) != 
-				(size_t) ogout.body_len)
-			goto cleanup;
-	}
-
-	while(_fetch_next_packet(state, &op, &ogin))
-	{
-		int size;
-		size = _blocksize(state, &op);
-		granpos += size;
-
-		if(needflush)
-		{
-			if(ogg_stream_flush(&streamout, &ogout))
-			{
-				if(state->write(ogout.header,1,ogout.header_len, 
-							out) != (size_t) ogout.header_len)
-					goto cleanup;
-				if(state->write(ogout.body,1,ogout.body_len, 
-							out) != (size_t) ogout.body_len)
-					goto cleanup;
-			}
-		}
-		else if(needout)
-		{
-			if(ogg_stream_pageout(&streamout, &ogout))
-			{
-				if(state->write(ogout.header,1,ogout.header_len, 
-							out) != (size_t) ogout.header_len)
-					goto cleanup;
-				if(state->write(ogout.body,1,ogout.body_len, 
-							out) != (size_t) ogout.body_len)
-					goto cleanup;
-			}
-		}
-
-		needflush=needout=0;
-
-		if(op.granulepos == -1)
-		{
-			op.granulepos = granpos;
-			ogg_stream_packetin(&streamout, &op);
-		}
-		else /* granulepos is set, validly. Use it, and force a flush to 
-				account for shortened blocks (vcut) when appropriate */ 
-		{
-			if(granpos > op.granulepos)
-			{
-				granpos = op.granulepos;
-				ogg_stream_packetin(&streamout, &op);
-				needflush=1;
-			}
-			else 
-			{
-				ogg_stream_packetin(&streamout, &op);
-				needout=1;
-			}
-		}		
-	}
-
-	streamout.e_o_s = 1;
-	while(ogg_stream_flush(&streamout, &ogout))
-	{
-		if(state->write(ogout.header,1,ogout.header_len, 
-					out) != (size_t) ogout.header_len)
-			goto cleanup;
-		if(state->write(ogout.body,1,ogout.body_len, 
-					out) != (size_t) ogout.body_len)
-			goto cleanup;
-	}
-
-	if (state->extrapage)
-	{
-		if(state->write(ogin.header,1,ogin.header_len,
-		                out) != (size_t) ogin.header_len)
-			goto cleanup;
-		if (state->write(ogin.body,1,ogin.body_len, out) !=
-				(size_t) ogin.body_len)
-			goto cleanup;
-	}
-
-	state->eosin=0; /* clear it, because not all paths to here do */
-	while(!state->eosin) /* We reached eos, not eof */
-	{
-		/* We copy the rest of the stream (other logical streams)
-		 * through, a page at a time. */
-		while(1)
-		{
-			result = ogg_sync_pageout(state->oy, &ogout);
-			if(result==0)
-                break;
-			if(result<0)
-				state->lasterror = _("Corrupt or missing data, continuing...");
-			else
-			{
-				/* Don't bother going through the rest, we can just 
-				 * write the page out now */
-				if(state->write(ogout.header,1,ogout.header_len, 
-						out) != (size_t) ogout.header_len) {
-                    fprintf(stderr, "Bumming out\n");
-					goto cleanup;
-                }
-				if(state->write(ogout.body,1,ogout.body_len, out) !=
-						(size_t) ogout.body_len) {
-                    fprintf(stderr, "Bumming out 2\n");
-					goto cleanup;
-                }
-			}
-		}
-		buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
-		bytes = state->read(buffer,1, CHUNKSIZE, state->in);
-		ogg_sync_wrote(state->oy, bytes);
-		if(bytes == 0) 
-		{
-			state->eosin = 1;
-			break;
-		}
-	}
-							
-
-cleanup:
-	ogg_stream_clear(&streamout);
-	ogg_packet_clear(&header_comments);
-
-	free(state->mainbuf);
-	free(state->bookbuf);
-    state->mainbuf = state->bookbuf = NULL;
-
-	if(!state->eosin)
-	{
-		state->lasterror =
-			_("Error writing stream to output. "
-			"Output stream may be corrupted or truncated.");
-		return -1;
-	}
-
-	return 0;
-}
-

mpfc-1.3.8.1.tar.bz2/plugins/input/ogg/vcedit.h Deleted

@@ -1,62 +0,0 @@
-/* This program is licensed under the GNU Library General Public License, version 2,
- * a copy of which is included with this program (with filename LICENSE.LGPL).
- *
- * (c) 2000-2001 Michael Smith <msmith@labyrinth.net.au>
- *
- * VCEdit header.
- *
- * last modified: $ID:$
- */
-
-#ifndef __VCEDIT_H
-#define __VCEDIT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif 
-
-#include <stdio.h>
-#include <ogg/ogg.h>
-#include <vorbis/codec.h>
-
-typedef size_t (*vcedit_read_func)(void *, size_t, size_t, void *);
-typedef size_t (*vcedit_write_func)(const void *, size_t, size_t, void *);
-
-typedef struct {
-	ogg_sync_state		*oy;
-	ogg_stream_state	*os;
-
-	vorbis_comment		*vc;
-	vorbis_info         *vi;
-
-	vcedit_read_func read;
-	vcedit_write_func write;
-
-	void		*in;
-	long		serial;
-	unsigned char	*mainbuf;
-	unsigned char	*bookbuf;
-	int		mainlen;
-	int		booklen;
-	char 	    *lasterror;
-	char   *vendor;
-	int prevW;
-	int extrapage;
-	int eosin;
-} vcedit_state;
-
-extern vcedit_state *	vcedit_new_state(void);
-extern void		vcedit_clear(vcedit_state *state);
-extern vorbis_comment *	vcedit_comments(vcedit_state *state);
-extern int		vcedit_open(vcedit_state *state, FILE *in);
-extern int		vcedit_open_callbacks(vcedit_state *state, void *in,
-		vcedit_read_func read_func, vcedit_write_func write_func);
-extern int		vcedit_write(vcedit_state *state, void *out);
-extern char *   vcedit_error(vcedit_state *state);
-
-#ifdef __cplusplus
-}
-#endif 
-
-#endif /* __VCEDIT_H */
-

mpfc-1.3.8.1.tar.bz2/plugins/input/wav Deleted

mpfc-1.3.8.1.tar.bz2/plugins/input/wav/Makefile.am Deleted

mpfc-1.3.8.1.tar.bz2/plugins/input/wav/Makefile.in Deleted

@@ -1,582 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/input/wav
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/mpfc-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(mylibdir)"
-LTLIBRARIES = $(mylib_LTLIBRARIES)
-libwav_la_DEPENDENCIES =
-am_libwav_la_OBJECTS = wav.lo
-libwav_la_OBJECTS = $(am_libwav_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libwav_la_SOURCES)
-DIST_SOURCES = $(libwav_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
-COMMON_LIBS = @COMMON_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURSES_LIBS = @CURSES_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
-GENCAT = @GENCAT@
-GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GPM_LIBS = @GPM_LIBS@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESOLV_LIBS = @RESOLV_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-mylib_LTLIBRARIES = libwav.la
-mylibdir = $(libdir)/mpfc/input
-libwav_la_SOURCES = wav.c wav.h
-libwav_la_LIBADD = @COMMON_LIBS@
-INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/input/wav/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/input/wav/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
-	}
-
-uninstall-mylibLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
-	done
-
-clean-mylibLTLIBRARIES:
-	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
-	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libwav.la: $(libwav_la_OBJECTS) $(libwav_la_DEPENDENCIES) 
-	$(LINK) -rpath $(mylibdir) $(libwav_la_OBJECTS) $(libwav_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wav.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(mylibdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-mylibLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-mylibLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-mylibLTLIBRARIES
-
-
-# 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:

mpfc-1.3.8.1.tar.bz2/plugins/input/wav/wav.c Deleted

@@ -1,323 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. WAV input plugin functions implementation.
- * $Id: wav.c 247 2006-01-07 18:19:21Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/soundcard.h>
-#include "types.h"
-#include "inp.h"
-#include "file.h"
-#include "song_info.h"
-#include "pmng.h"
-#include "util.h"
-#include "wav.h"
-
-/* Currently playing file descriptor and name */
-static file_t *wav_fd = NULL;
-static char wav_fnameMAX_FILE_NAME;
-
-/* Current seek value */
-static int wav_seek_val = -1;
-
-/* Current song audio parameters */
-static int wav_channels = 0, wav_freq = 0, wav_avg_bps = 0;
-static dword wav_fmt = 0;
-static dword wav_file_size = 0;
-static int wav_block_align = 0;
-
-/* Song length */
-static int wav_len = 0;
-
-/* Data offset in file */
-static int wav_data_offset = 0;
-
-/* Current time */
-static int wav_time = 0;
-
-/* Plugin description */
-static char *wav_desc = "WAV files playback plugin";
-
-/* Plugin author */
-static char *wav_author = "Sergey E. Galanov <sgsoftware@mail.ru>";
-
-/* Logger */
-static logger_t *wav_log = NULL;
-
-/* Start play function */
-bool_t wav_start( char *filename )
-{
-	char riff4, riff_type4;
-	dword file_size;
-	void *buf = NULL;
-	dword data_size = 0;
-
-	logger_debug(wav_log, "wav_start(%s)", filename);
-	
-	/* Try to open file */
-	wav_fd = file_open(filename, "rb", NULL);
-	if (wav_fd == NULL)
-		return FALSE;
-	util_strncpy(wav_fname, filename, sizeof(wav_fname));
-
-	/* Read WAV file header */
-	file_read(riff, 1, sizeof(riff), wav_fd);
-	logger_debug(wav_log, "wav: riff is %c%c%c%c", riff0, riff1, 
-			riff2, riff3);
-	file_read(&wav_file_size, 1, sizeof(file_size), wav_fd);
-	logger_debug(wav_log, "wav: file size is %d", wav_file_size);
-	file_read(riff_type, 1, sizeof(riff_type), wav_fd);
-	logger_debug(wav_log, "wav: riff_type is %c%c%c%c", riff_type0, 
-			riff_type1, riff_type2, riff_type3);
-
-	/* Check file validity */
-	if (riff0 != 'R' || riff1 != 'I' || riff2 != 'F' || riff3 != 'F' ||
-			riff_type0 != 'W' || riff_type1 != 'A' ||
-			riff_type2 != 'V' || riff_type3 != 'E')
-	{
-		logger_error(wav_log, 0, "wav: RIFF header not found");
-		wav_end();
-		return FALSE;
-	}
-
-	/* Read chunks until 'data' */
-	while (!wav_read_next_chunk(wav_fd, (void **)(&buf), &data_size));
-	logger_debug(wav_log, "wav: data size if %d", data_size);
-
-	/* Check format */
-	if (!data_size || buf == NULL || 
-			!(WAV_FMT_GET_FORMAT(buf) == 1))
-	{
-		logger_error(wav_log, 0, "wav: invalid format");
-		free(buf);
-		wav_end();
-		return FALSE;
-	}
-
-	/* Save song parameters */
-	wav_data_offset = file_tell(wav_fd);
-	wav_channels = WAV_FMT_GET_CHANNELS(buf);
-	wav_freq = WAV_FMT_GET_SAMPLES_PER_SEC(buf);
-	wav_avg_bps = WAV_FMT_GET_AVG_BYTES_PER_SEC(buf);
-	wav_block_align = WAV_FMT_GET_BLOCK_ALIGN(buf);
-	switch (WAV_FMT_GET_FORMAT(buf))
-	{
-	case 1:
-		wav_fmt = (WAV_PCM_FMT_GET_BPS(buf) == 8) ?
-			AFMT_U8 : AFMT_S16_LE;
-		break;
-	}
-
-	wav_len = data_size / wav_avg_bps;
-	wav_seek_val = -1;
-	wav_time = 0;
-	free(buf);
-	return TRUE;
-} /* End of 'wav_start' function */
-
-/* End playing function */
-void wav_end( void )
-{
-	/* Close file */
-	if (wav_fd != NULL)
-	{
-		strcpy(wav_fname, "");
-		file_close(wav_fd);
-		wav_time = 0;
-		wav_fd = NULL;
-	}
-} /* End of 'wav_end' function */
-
-/* Get supported formats function */
-void wav_get_formats( char *extensions, char *content_type )
-{
-	if (extensions != NULL)
-		strcpy(extensions, "wav");
-	if (content_type != NULL)
-		strcpy(content_type, "audio/wav");
-} /* End of 'wav_get_formats' function */
-
-/* Get stream function */
-int wav_get_stream( void *buf, int size )
-{
-	if (wav_fd != NULL)
-	{
-		if (wav_seek_val != -1)
-		{
-			file_seek(wav_fd, wav_data_offset + wav_seek_val * wav_avg_bps, 
-					SEEK_SET);
-			wav_seek_val = -1;
-		}
-		
-		memset(buf, 0, size);
-		size = file_read(buf, 1, size, wav_fd);
-		wav_time = (file_tell(wav_fd) - wav_data_offset) / wav_avg_bps;
-	}
-	else
-		size = 0;
-	return size;
-} /* End of 'wav_get_stream' function */
-
-/* Seek song */
-void wav_seek( int seconds )
-{
-	if (wav_fd != NULL)
-	{
-		wav_seek_val = seconds;
-	}
-} /* End of 'wav_seek' function */
-
-/* Get audio parameters */
-void wav_get_audio_params( int *ch, int *freq, dword *fmt, int *bitrate )
-{
-	*ch = wav_channels;
-	*freq = wav_freq;
-	*fmt = wav_fmt;
-	*bitrate = 0;
-} /* End of 'wav_get_audio_params' function */
-
-/* Get current time */
-int wav_get_cur_time( void )
-{
-	return wav_time;
-} /* End of 'wav_get_cur_time' function */
-
-/* Get song information */
-song_info_t *wav_get_info( char *filename, int *length )
-{
-	int size, samplerate, bps, channels, block_align, bits, len;
-	song_info_t *si;
-	char str1024;
-	
-	/* Get audio parameters */
-	if (!strcmp(filename, wav_fname))
-	{
-		samplerate = wav_freq;
-		bps = wav_avg_bps;
-		channels = wav_channels;
-		block_align = wav_block_align;
-		bits = (wav_fmt == AFMT_U8 || wav_fmt == AFMT_S8) ? 8 : 16;
-		size = wav_file_size;
-		len = wav_len;
-	}
-	else
-	{
-		file_t *fd;
-		byte *buf;
-		dword data_size = 0;
-
-		/* Read file header */
-		fd = file_open(filename, "rb", NULL);
-		if (fd == NULL)
-			return NULL;
-		file_seek(fd, 4, SEEK_SET);
-		file_read(&size, 1, 4, fd);
-		file_seek(fd, 4, SEEK_CUR);
-		while (!wav_read_next_chunk(fd, (void **)(&buf), &data_size));
-		if (!data_size || buf == NULL || !(WAV_FMT_GET_FORMAT(buf) == 1))
-		{
-			file_close(fd);
-			return NULL;
-		}
-		file_close(fd);
-
-		/* Get parameters */
-		channels = WAV_FMT_GET_CHANNELS(buf);
-		samplerate = WAV_FMT_GET_SAMPLES_PER_SEC(buf);
-		bps = WAV_FMT_GET_AVG_BYTES_PER_SEC(buf);
-		block_align = WAV_FMT_GET_BLOCK_ALIGN(buf);
-		bits = WAV_PCM_FMT_GET_BPS(buf);
-		len = data_size / bps;
-		free(buf);
-	}
-
-	/* Initialize info */
-	si = si_new();
-	si->m_flags |= SI_ONLY_OWN;
-	snprintf(str, sizeof(str),
-			_("File size: %i bytes\n"
-			"Length: %i seconds\n"
-			"Bits/sample: %i\n"
-			"Format: PCM\n"
-			"Channels: %i\n"
-			"Samplerate: %i Hz\n"
-			"Bytes/sec: %i\n"
-			"Block align: %i"),
-			size, len, bits, channels, samplerate, bps, block_align);
-	si_set_own_data(si, str);
-	*length = len;
-	return si;
-} /* End of 'wav_get_info' function */ 
-
-/* Exchange data with main program */
-void plugin_exchange_data( plugin_data_t *pd )
-{
-	pd->m_desc = wav_desc;
-	pd->m_author = wav_author;
-	INP_DATA(pd)->m_start = wav_start;
-	INP_DATA(pd)->m_end = wav_end;
-	INP_DATA(pd)->m_get_stream = wav_get_stream;
-	INP_DATA(pd)->m_seek = wav_seek;
-	INP_DATA(pd)->m_get_audio_params = wav_get_audio_params;
-	INP_DATA(pd)->m_get_formats = wav_get_formats;
-	INP_DATA(pd)->m_get_cur_time = wav_get_cur_time;
-	INP_DATA(pd)->m_get_info = wav_get_info;
-	wav_log = pd->m_logger;
-} /* End of 'plugin_exchange_data' function */
-
-/* Read the next chunk. Returns TRUE when 'data' chunk is read */
-static bool_t wav_read_next_chunk( file_t *fd, void **fmt_buf, 
-										dword *data_size )
-{
-	char chunk_id4;
-	dword chunk_size;
-	
-	if (fd == NULL || file_eof(fd))
-		return TRUE;
-
-	/* Read chunk header */
-	file_read(chunk_id, 1, sizeof(chunk_id), fd);
-	file_read(&chunk_size, 1, sizeof(chunk_size), fd);
-
-	/* Parse chunk */
-	if (!strncmp(chunk_id, "data", 4))
-	{
-		(*data_size) = chunk_size;
-		return TRUE;
-	}
-	else if (!strncmp(chunk_id, "fmt ", 4))
-	{
-		(*fmt_buf) = malloc(chunk_size);
-		if ((*fmt_buf) == NULL)
-			return FALSE;
-		file_read(*fmt_buf, 1, chunk_size, fd);
-	}
-	else
-	{
-		file_seek(fd, chunk_size, SEEK_CUR);
-	}
-
-	return FALSE;
-} /* End of 'wav_read_next_chunk' function */
-
-/* End of 'wav.c' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/input/wav/wav.h Deleted

@@ -1,77 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Interface for WAV input plugin functions.
- * $Id: wav.h 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include "types.h"
-#include "file.h"
-#include "inp.h"
-#include "song_info.h"
-
-/* Get field from format */
-#define WAV_FMT_GET_FORMAT(buf) *(word *)(buf)
-#define WAV_FMT_GET_CHANNELS(buf) *(word *)(((byte *)(buf) + 2))
-#define WAV_FMT_GET_SAMPLES_PER_SEC(buf) *(dword *)(((byte *)(buf) + 4))
-#define WAV_FMT_GET_AVG_BYTES_PER_SEC(buf) *(dword *)(((byte *)(buf) + 8))
-#define WAV_FMT_GET_BLOCK_ALIGN(buf) *(word *)(((byte *)(buf) + 12))
-#define WAV_PCM_FMT_GET_BPS(buf) *(word *)(((byte *)(buf) + 14))
-
-/* Supported formats */
-#define WAV_FMT_PCM 1
-#define WAV_FMT_ADPCM 2
-
-/* Check that format is supported */
-#define WAV_FMT_SUPPORTED(fmt) ((fmt) <= 2)
-
-/* Start play function */
-bool_t wav_start( char *filename );
-
-/* End playing function */
-void wav_end( void );
-
-/* Get supported formats function */
-void wav_get_formats( char *extensions, char *content_type );
-
-/* Get song information */
-song_info_t *wav_get_info( char *filename, int *len );
-
-/* Save song information */
-void wav_save_info( char *filename, song_info_t *info );
-
-/* Get stream function */
-int wav_get_stream( void *buf, int size );
-
-/* Seek song */
-void wav_seek( int seconds );
-
-/* Get audio parameters */
-void wav_get_audio_params( int *ch, int *freq, dword *fmt, int *bitrate );
-
-/* Read the next chunk. Returns TRUE when 'data' chunk is read */
-static bool_t wav_read_next_chunk( file_t *fd, void **fmt_buf, 
-										dword *data_size );
-
-/* Read and decode data from ADPCM */
-static int wav_read_adpcm( void *buf, int size );
-
-/* End of 'wav.h' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/output Deleted

mpfc-1.3.8.1.tar.bz2/plugins/output/Makefile.am Deleted

mpfc-1.3.8.1.tar.bz2/plugins/output/Makefile.in Deleted

@@ -1,619 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/output
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/mpfc-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^$^/*$/.*$$,\1,'; \
-  sed_rest='s,^^/*/*,,'; \
-  sed_last='s,^.*/$^/*$$$,\1,'; \
-  sed_butlast='s,/*^/*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
-COMMON_LIBS = @COMMON_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURSES_LIBS = @CURSES_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
-GENCAT = @GENCAT@
-GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GPM_LIBS = @GPM_LIBS@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESOLV_LIBS = @RESOLV_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-ALL_PLUGINS = alsa disk_writer oss
-SUBDIRS = @OUTPUT_PLUGINS@
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/output/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/output/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
-
-
-# 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:

mpfc-1.3.8.1.tar.bz2/plugins/output/alsa Deleted

mpfc-1.3.8.1.tar.bz2/plugins/output/alsa/Makefile.am Deleted

mpfc-1.3.8.1.tar.bz2/plugins/output/alsa/Makefile.in Deleted

@@ -1,582 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/output/alsa
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/mpfc-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(mylibdir)"
-LTLIBRARIES = $(mylib_LTLIBRARIES)
-libalsa_la_DEPENDENCIES =
-am_libalsa_la_OBJECTS = alsa.lo
-libalsa_la_OBJECTS = $(am_libalsa_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libalsa_la_SOURCES)
-DIST_SOURCES = $(libalsa_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
-COMMON_LIBS = @COMMON_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURSES_LIBS = @CURSES_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
-GENCAT = @GENCAT@
-GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GPM_LIBS = @GPM_LIBS@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESOLV_LIBS = @RESOLV_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = $(datadir)/locale
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-mylib_LTLIBRARIES = libalsa.la
-mylibdir = $(libdir)/mpfc/output
-libalsa_la_SOURCES = alsa.c
-INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-libalsa_la_LIBADD = @COMMON_LIBS@ @ASOUND_LIBS@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/output/alsa/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/output/alsa/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
-	}
-
-uninstall-mylibLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
-	done
-
-clean-mylibLTLIBRARIES:
-	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
-	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libalsa.la: $(libalsa_la_OBJECTS) $(libalsa_la_DEPENDENCIES) 
-	$(LINK) -rpath $(mylibdir) $(libalsa_la_OBJECTS) $(libalsa_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsa.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(mylibdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-mylibLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-mylibLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-mylibLTLIBRARIES
-
-
-# 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:

mpfc-1.3.8.1.tar.bz2/plugins/output/alsa/alsa.c Deleted

@@ -1,590 +0,0 @@
-/*
- * Copyright (C) 2004 Thadeu Lima de Souza Cascardo (cascardo@minaslivre.org)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <alsa/asoundlib.h>
-#include <alsa/error.h>
-#include <sys/soundcard.h>
-#include <stdarg.h>
-#include "types.h"
-#include "cfg.h"
-#include "outp.h"
-#include "pmng.h"
-#include "wnd.h"
-#include "wnd_dialog.h"
-#include "wnd_editbox.h"
-
-#define ALSA_SAMPLE_XFER 256
-
-static snd_pcm_t *handle = NULL;
-static snd_pcm_hw_params_t *hwparams = NULL;
-static snd_pcm_sw_params_t *swparams = NULL;
-static pmng_t *alsa_pmng = NULL;
-static int alsa_fmt = SND_PCM_FORMAT_S16_LE;
-static int alsa_size = 2;
-static int alsa_rate = 44100;
-static int alsa_channels = 2;
-static bool_t alsa_paused = FALSE;
-
-static char *alsa_default_dev = "default";
-
-static char *alsa_desc = "ALSA output plugin";
-static char *alsa_author = 
-		"Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>; "
-                "Sergey E. Galanov <sgsoftware@mail.ru>";
-static cfg_node_t *alsa_cfg = NULL;
-static logger_t *alsa_log = NULL;
-
-static unsigned int alsa_buffer_time;
-static unsigned int alsa_period_time;
-
-/* Mixer types table */
-static char *alsa_mixer_types_table = 
-{
-	"PCM", "Master", "PCM", "Line", "CD", "Mic"
-};
-static plugin_mixer_type_t alsa_mixer_type = PLUGIN_MIXER_DEFAULT;
-static char *alsa_mixer_type_name = "PCM";
-
-void alsa_end ();
-bool_t alsa_open_dev( void );
-
-void alsa_error_handler( const char *file, int line, const char *function,
-		int err, const char *fmt, ... )
-{
-	va_list ap;
-	va_start(ap, fmt);
-	logger_add_message_vararg(alsa_log, LOGGER_MSG_ERROR, 1, (char *)fmt, ap);
-	va_end(ap);
-}
-
-bool_t alsa_start ()
-{
-  int err;
-
-  snd_lib_error_set_handler(alsa_error_handler);
-  if (!alsa_open_dev()) {
-    logger_message(alsa_log, 0, "alsa_open_dev failed");
-    alsa_end();
-    return FALSE;
-  }
-  err = snd_pcm_hw_params_malloc(&hwparams);
-  if (err < 0) {
-    logger_message(alsa_log, 0, "snd_pcm_hw_params_malloc error");
-    alsa_end();
-    return FALSE;
-  }
-
-  err = snd_pcm_hw_params_any (handle, hwparams);
-  if (err < 0) {
-    logger_message(alsa_log, 0, "snd_pcm_hw_params_any returned %d", err);
-    alsa_end();
-    return FALSE;
-  }
-
-  err = snd_pcm_hw_params_set_access (handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED);
-  if (err < 0) {
-    logger_message(alsa_log, 0, "snd_pcm_hw_params_set_access returned %d", err);
-    alsa_end();
-    return FALSE;
-  }
-
-  logger_debug(alsa_log, "setting format to %d", alsa_fmt);
-  err = snd_pcm_hw_params_set_format (handle, hwparams, alsa_fmt);
-  if (err < 0) {
-	int i;
-	snd_pcm_format_t formats = { SND_PCM_FORMAT_S16_LE,
-									SND_PCM_FORMAT_S16_BE,
-									SND_PCM_FORMAT_U8 };
-
-    logger_message(alsa_log, 0, "snd_pcm_hw_params_set_format with format %d returned %d", alsa_fmt, err);
-
-	alsa_fmt = -1;
-	for ( i = 0; i < sizeof(formats) / sizeof(*formats); i ++ )
-	{
-		if (snd_pcm_hw_params_set_format(handle, hwparams,
-					formatsi) == 0)
-		{
-			alsa_fmt = formatsi;
-			if (alsa_fmt == SND_PCM_FORMAT_U8)
-				alsa_size = 1;
-			else
-				alsa_size = 2;
-			logger_message(alsa_log, 0, "format %d is suitable", alsa_fmt);
-			break;
-		}
-	}
-    
-	if (alsa_fmt == -1)
-	{
-		alsa_end();
-		return FALSE;
-	}
-  }
-
-  logger_debug(alsa_log, "setting channels to %d", alsa_channels);
-  err = snd_pcm_hw_params_set_channels_near (handle, hwparams, &alsa_channels);
-  logger_debug(alsa_log, "channels are set to %d", alsa_channels);
-  if (err < 0) {
-    logger_message(alsa_log, 0, "snd_pcm_hw_params_set_channels with channels %d returned %d", alsa_channels, err);
-    alsa_end();
-    return FALSE;
-  }
-
-  logger_debug(alsa_log, "alsa_rate is %d", alsa_rate);
-  err = snd_pcm_hw_params_set_rate_near (handle, hwparams, &alsa_rate, NULL);
-  if (err < 0) {
-    logger_message(alsa_log, 0, "snd_pcm_hw_params_set_rate_near with rate %d and returned %d", alsa_rate, err);
-    alsa_end();
-    return FALSE;
-  }
-  logger_debug(alsa_log, "after set_rate_near alsa_rate is %d", alsa_rate);
-
-  alsa_buffer_time = 500000;
-  err = snd_pcm_hw_params_set_buffer_time_near(handle, hwparams, &alsa_buffer_time, NULL);
-  if (err < 0) {
-    logger_message(alsa_log, 0, "snd_pcm_hw_params_set_buffer_time_near() failed: %s", snd_strerror(err));
-    alsa_end();
-    return FALSE;
-  }
-
-  alsa_period_time = 1000000 * ALSA_SAMPLE_XFER / alsa_rate;
-  err = snd_pcm_hw_params_set_period_time_near(handle, hwparams, &alsa_period_time, NULL);
-  if (err < 0) {
-    logger_message(alsa_log, 0, "snd_pcm_hw_params_set_period_time_near() failed: %s", snd_strerror(err));
-    alsa_end();
-    return FALSE;
-  }
-
-  err = snd_pcm_hw_params (handle, hwparams);
-  if (err < 0) {
-    logger_message(alsa_log, 0, "snd_pcm_hw_params returned %d", err);
-    alsa_end ();
-    return FALSE;
-  }
-
-  err = snd_pcm_prepare (handle);
-  if (err < 0) {
-    logger_message(alsa_log, 0, "snd_pcm_prepare returned %d", err);
-    alsa_end();
-    return FALSE;
-  }
-
-  {
-      int r, d;
-      snd_pcm_hw_params_get_rate_min(hwparams, &r, &d);
-      logger_debug(alsa_log, "minimal rate is %d, direction is %d", r, d);
-  }
-
-  logger_message(alsa_log, 0, "ALSA init successful");
-
-  alsa_paused = FALSE;
-  return TRUE;
-}
-
-void alsa_end ()
-{
-    logger_debug(alsa_log, "in begin of alsa_end alsa_rate is %d", alsa_rate);
-  alsa_paused = FALSE;
-  if (handle != NULL) {
-      snd_pcm_close(handle);
-      handle = NULL;
-  }
-  if (hwparams != NULL) {
-    snd_pcm_hw_params_free(hwparams);
-    hwparams = NULL;
-  }
-    logger_debug(alsa_log, "in end of alsa_end alsa_rate is %d", alsa_rate);
-}
-
-static void xrun_recover(void)
-{
-	int err;
-
-	if (snd_pcm_state(handle) == SND_PCM_STATE_XRUN)
-	{
-		if ((err = snd_pcm_prepare(handle)) < 0)
-			logger_message(alsa_log, 0, "xrun_recover(): snd_pcm_prepare() failed.");
-	}
-}
-
-void alsa_play (void *buf, int size)
-{
-  int written;
-  int err;
-  int fragments;
-
-  if (handle == NULL || size <= 0)
-    return;
-
-  written = 0;
-
-  while (written < size) {
-    fragments = (size - written) / (alsa_channels * alsa_size);
-    err = snd_pcm_writei(handle, ((char *) buf) + written, fragments);
-    if (err < 0) {
-      if (err == -EAGAIN || err == -EINTR)
-		continue;
-	  else if (err == -EPIPE)
-	  {
-		  xrun_recover();
-		  continue;
-	  }
-      logger_message(alsa_log, 0, "error %s", snd_strerror(err));
-      break;
-    }
-    written += err * (alsa_channels * alsa_size);
-  }
-}
-
-void alsa_set_channels (int channels)
-{
-  if (handle == NULL)
-    return;
-  alsa_channels = channels;
-  logger_debug(alsa_log, "in alsa_set_channels alsa_rate is %d", alsa_rate);
-  alsa_end ();
-  alsa_start ();
-}
-
-void alsa_set_rate (int rate)
-{
-  if (handle == NULL)
-    return;
-  alsa_rate = rate;
-  logger_debug(alsa_log, "in alsa_set_rate alsa_rate is %d", alsa_rate);
-  alsa_end ();
-  alsa_start ();
-}
-
-void alsa_set_fmt (dword fmt)
-{
-  if (handle == NULL)
-    return;
-  logger_debug(alsa_log, "in alsa_set_fmt begin alsa_rate is %d", alsa_rate);
-  switch (fmt)
-    {
-      case AFMT_U8:
-        alsa_fmt = SND_PCM_FORMAT_U8;
-	alsa_size = 1;
-        break;
-      case AFMT_U16_LE:
-        alsa_fmt = SND_PCM_FORMAT_U16_LE;
-	alsa_size = 2;
-        break;
-      case AFMT_U16_BE:
-        alsa_fmt = SND_PCM_FORMAT_U16_BE;
-	alsa_size = 2;
-        break;
-      case AFMT_S8:
-        alsa_fmt = SND_PCM_FORMAT_S8;
-	alsa_size = 1;
-        break;
-      case AFMT_S16_LE:
-        alsa_fmt = SND_PCM_FORMAT_S16_LE;
-	alsa_size = 2;
-        break;
-      case AFMT_S16_BE:
-        alsa_fmt = SND_PCM_FORMAT_S16_BE;
-	alsa_size = 2;
-        break;
-      default:
-        return;
-    }
-  logger_debug(alsa_log, "in alsa_set_fmt end alsa_rate is %d", alsa_rate);
-  alsa_end ();
-  alsa_start ();
-}
-
-int alsa_get_channels( void )
-{
-	return alsa_channels;
-}
-
-int alsa_get_freq( void )
-{
-	return alsa_rate;
-}
-
-dword alsa_get_fmt( void )
-{
-  logger_debug(alsa_log, "in alsa_get_fmt format is %d", alsa_fmt);
-  switch (alsa_fmt)
-    {
-      case SND_PCM_FORMAT_U8:
-        return AFMT_U8;
-      case SND_PCM_FORMAT_U16_LE:
-        return AFMT_U16_LE;
-      case SND_PCM_FORMAT_U16_BE:
-        return AFMT_U16_BE;
-      case SND_PCM_FORMAT_S8:
-        return AFMT_S8;
-      case SND_PCM_FORMAT_S16_LE:
-        return AFMT_S16_LE;
-      case SND_PCM_FORMAT_S16_BE:
-        return AFMT_S16_BE;
-    }
-  return 0xFFFFFFFF;
-}
-
-void alsa_flush ()
-{
-  if (handle == NULL)
-    return;
-  snd_pcm_drain (handle);
-}
-
-static int alsa_get_mixer_element(snd_mixer_t **mix, snd_mixer_elem_t **elem)
-{
-  char *card_name = NULL;
-  snd_mixer_selem_id_t *selem_id = NULL;
-
-  *mix = NULL;
-  *elem = NULL;
-
-  snd_mixer_open (mix, 0);
-  if (*mix == NULL) {
-    logger_message(alsa_log, 0, "snd_mixer_open() returned NULL");
-    goto error;
-  }
-
-  card_name = cfg_get_var(alsa_cfg, "mixer-card-name");
-  if (card_name == NULL) {
-    card_name = "default";
-  }
-  if (snd_mixer_attach (*mix, card_name) < 0) {
-    logger_message(alsa_log, 0, "could not attach mixer %s", card_name);
-  }
-
-  snd_mixer_selem_register (*mix, NULL, NULL);
-  snd_mixer_load (*mix);
-  snd_mixer_selem_id_alloca(&selem_id);
-  if (selem_id == NULL) {
-    logger_message(alsa_log, 0, "could not allocate selem_id");
-    goto error;
-  }
-  snd_mixer_selem_id_set_name(selem_id, alsa_mixer_type_name);
-  if ((*elem = snd_mixer_find_selem(*mix, selem_id)) == NULL) {
-    logger_message(alsa_log, 0, "snd_mixer_find_selem returned NULL");
-    goto error;
-  }
-  return 0;
-
- error:
-  if (*mix)
-    snd_mixer_close (*mix);
-  return -1;
-}
-
-void alsa_set_volume (int left, int right)
-{
-  snd_mixer_t *mix;
-  snd_mixer_elem_t *elem;
-  long scaled_left, scaled_right;
-  long min, max;
-  int err;
-
-
-  if (alsa_get_mixer_element(&mix, &elem)) {
-    logger_message(alsa_log, 0, "could not open alsa pcm element");
-    return;
-  }
-
-  snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
-  if (max <= min)
-  {
-	  snd_mixer_close(mix);
-	  return;
-  }
-  scaled_left = min + ((max - min) * left / 100);
-  scaled_right = min + ((max - min) * right / 100);
-  err = snd_mixer_selem_set_playback_volume (elem, SND_MIXER_SCHN_FRONT_LEFT,
-		  scaled_left);
-  if (err < 0)
-  {
-	  logger_message(alsa_log, 0, "snd_mixer_selem_set_playback_volume returned %d", err);
-	  return;
-  }
-  err = snd_mixer_selem_set_playback_volume (elem, SND_MIXER_SCHN_FRONT_RIGHT,
-		  scaled_right);
-  if (err < 0)
-  {
-	  logger_message(alsa_log, 0, "snd_mixer_selem_set_playback_volume returned %d", err);
-	  return;
-  }
-  err = snd_mixer_close (mix);
-  if (err < 0)
-  {
-	  logger_message(alsa_log, 0, "snd_mixer_close returned %d", err);
-	  return;
-  }
-}
-
-void alsa_get_volume (int *left, int *right)
-{
-  snd_mixer_t *mix;
-  snd_mixer_elem_t *elem;
-  long min, max;
-  int err;
-  long scaled_left, scaled_right;
-
-  if (alsa_get_mixer_element(&mix, &elem)) {
-    logger_message(alsa_log, 0, "could not open alsa pcm element");
-    return;
-  }
-
-  snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
-  if (max <= min)
-  {
-	  snd_mixer_close(mix);
-	  return;
-  }
-  err = snd_mixer_selem_get_playback_volume (elem, SND_MIXER_SCHN_FRONT_LEFT,
-		  &scaled_left);
-  if (err < 0)
-  {
-	  logger_message(alsa_log, 0, "snd_mixer_selem_get_playback_volume returned %d", err);
-	  return;
-  }
-  snd_mixer_selem_get_playback_volume (elem, SND_MIXER_SCHN_FRONT_RIGHT,
-		  &scaled_right);
-  (*left) = (scaled_left - min) * 100 / (max - min);
-  (*right) = (scaled_right - min) * 100 / (max - min);
-  snd_mixer_close (mix);
-}
-
-bool_t alsa_open_dev( void )
-{
-	char *dev;
-
-	/* Get device name */
-	dev = cfg_get_var(alsa_cfg, "device");
-	if (dev == NULL)
-		dev = alsa_default_dev;
-
-	/* Try devices specified in this variable */
-	while (dev != NULL)
-	{
-		int err;
-
-		/* Get next device name */
-		char *s = strchr(dev, ';');
-		if (s != NULL)
-			(*s) = 0;
-
-		/* Try to open this device */
-		err = snd_pcm_open(&handle, dev, SND_PCM_STREAM_PLAYBACK, 
-					SND_PCM_NONBLOCK);
-		if (err < 0)
-		  logger_message(alsa_log, 0, "non-blocking snd_pcm_open with "
-				 "device %s returned %d", dev, err);
-		if (err >= 0)
-		{
-			int ret;
-
-			snd_pcm_close(handle);
-			handle = NULL;
-			ret = snd_pcm_open(&handle, dev, SND_PCM_STREAM_PLAYBACK, 0);
-			if (ret < 0)
-			  logger_message(alsa_log, 0, "snd_pcm_open with device %s returned %d", 
-					 dev, ret);
-			if (s != NULL)
-				(*s) = ';';
-			return (ret >= 0);
-		}
-		if (s != NULL)
-			(*s) = ';';
-		dev = (s == NULL ? NULL : s + 1);
-	}
-
-	return FALSE;
-}
-
-void alsa_pause( void )
-{
-	if (handle != NULL && !alsa_paused)
-		snd_pcm_pause(handle, TRUE);
-	alsa_paused = TRUE;
-}
-
-void alsa_resume( void )
-{
-	if (handle != NULL && alsa_paused)
-		snd_pcm_pause(handle, FALSE);
-	alsa_paused = FALSE;
-}
-
-wnd_msg_retcode_t alsa_on_configure( wnd_t *wnd )
-{
-	editbox_t *eb = EDITBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), "device"));
-	assert(eb);
-	cfg_set_var(alsa_cfg, "device", EDITBOX_TEXT(eb));
-	return WND_MSG_RETCODE_OK;
-}
-
-void alsa_configure( wnd_t *parent )
-{
-	dialog_t *dlg;
-	editbox_t *eb;
-
-	dlg = dialog_new(parent, _("Configure ALSA plugin"));
-	eb = editbox_new_with_label(WND_OBJ(dlg->m_vbox), _("&Device: "), 
-			"device", cfg_get_var(alsa_cfg, "device"), 'd', 50);
-	wnd_msg_add_handler(WND_OBJ(dlg), "ok_clicked", alsa_on_configure);
-	dialog_arrange_children(dlg);
-}
-
-/* Set mixer type */
-void alsa_set_mixer_type( plugin_mixer_type_t type )
-{
-	char *name = cfg_get_var(alsa_cfg, "mixer-name");
-	if (name == NULL)
-	{
-		if (type >= (sizeof(alsa_mixer_types_table) / sizeof(*alsa_mixer_types_table)))
-			return;
-		alsa_mixer_type = type;
-		alsa_mixer_type_name = alsa_mixer_types_tablealsa_mixer_type;
-	}
-	else
-		alsa_mixer_type_name = name;
-}
-
-void plugin_exchange_data (plugin_data_t *pd)
-{
-  pd->m_desc = alsa_desc;
-  pd->m_author = alsa_author;
-  pd->m_configure = alsa_configure;
-  OUTP_DATA(pd)->m_start = alsa_start;
-  OUTP_DATA(pd)->m_end = alsa_end;
-  OUTP_DATA(pd)->m_play = alsa_play;
-  OUTP_DATA(pd)->m_set_channels = alsa_set_channels;
-  OUTP_DATA(pd)->m_set_freq = alsa_set_rate;
-  OUTP_DATA(pd)->m_set_fmt = alsa_set_fmt;
-  OUTP_DATA(pd)->m_get_channels = alsa_get_channels;
-  OUTP_DATA(pd)->m_get_freq = alsa_get_freq;
-  OUTP_DATA(pd)->m_get_fmt = alsa_get_fmt;
-  OUTP_DATA(pd)->m_flush = alsa_flush;
-  OUTP_DATA(pd)->m_pause = alsa_pause;
-  OUTP_DATA(pd)->m_resume = alsa_resume;
-  OUTP_DATA(pd)->m_set_volume = alsa_set_volume;
-  OUTP_DATA(pd)->m_get_volume = alsa_get_volume;
-  OUTP_DATA(pd)->m_set_mixer_type = alsa_set_mixer_type;
-  alsa_pmng = pd->m_pmng;
-  alsa_cfg = pd->m_cfg;
-  alsa_log = pd->m_logger;
-}

mpfc-1.3.8.1.tar.bz2/plugins/output/disk_writer Deleted

mpfc-1.3.8.1.tar.bz2/plugins/output/disk_writer/Makefile.am Deleted

mpfc-1.3.8.1.tar.bz2/plugins/output/disk_writer/Makefile.in Deleted

@@ -1,582 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/output/disk_writer
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/mpfc-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(mylibdir)"
-LTLIBRARIES = $(mylib_LTLIBRARIES)
-libdisk_writer_la_DEPENDENCIES =
-am_libdisk_writer_la_OBJECTS = writer.lo
-libdisk_writer_la_OBJECTS = $(am_libdisk_writer_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libdisk_writer_la_SOURCES)
-DIST_SOURCES = $(libdisk_writer_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
-COMMON_LIBS = @COMMON_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURSES_LIBS = @CURSES_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
-GENCAT = @GENCAT@
-GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GPM_LIBS = @GPM_LIBS@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESOLV_LIBS = @RESOLV_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-mylib_LTLIBRARIES = libdisk_writer.la
-mylibdir = $(libdir)/mpfc/output
-libdisk_writer_la_SOURCES = writer.c
-libdisk_writer_la_LIBADD = @COMMON_LIBS@
-INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/output/disk_writer/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/output/disk_writer/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
-	}
-
-uninstall-mylibLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
-	done
-
-clean-mylibLTLIBRARIES:
-	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
-	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libdisk_writer.la: $(libdisk_writer_la_OBJECTS) $(libdisk_writer_la_DEPENDENCIES) 
-	$(LINK) -rpath $(mylibdir) $(libdisk_writer_la_OBJECTS) $(libdisk_writer_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writer.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(mylibdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-mylibLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-mylibLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-mylibLTLIBRARIES
-
-
-# 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:

mpfc-1.3.8.1.tar.bz2/plugins/output/disk_writer/writer.c Deleted

@@ -1,391 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Disk writer output plugin functions implementation.
- * $Id: writer.c 308 2011-03-13 12:16:29Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/soundcard.h>
-#include "types.h"
-#include "file.h"
-#include "outp.h"
-#include "pmng.h"
-#include "wnd.h"
-#include "wnd_dialog.h"
-#include "wnd_checkbox.h"
-#include "wnd_editbox.h"
-#include "wnd_filebox.h"
-#include "util.h"
-
-/* Header size */
-#define DW_HEAD_SIZE 44
-
-/* Default encoding fragment size (in seconds) */
-#define DW_DEFAULT_FRAGMENT_SIZE 600
-
-/* Output file handler */
-static file_t *dw_fd = NULL;
-static char dw_file_nameMAX_FILE_NAME;
-
-/* Song parameters */
-static short dw_channels = 2;
-static long dw_freq = 44100;
-static dword dw_fmt = 0;
-static long dw_file_size = 0;
-
-/* Plugin data */
-static pmng_t *dw_pmng = NULL;
-static cfg_node_t *dw_cfg, *dw_root_cfg;
-
-/* Plugin description */
-static char *dw_desc = "Disk Writer plugin";
-
-/* Plugin author */
-static char *dw_author = "Sergey E. Galanov <sgsoftware@mail.ru>";
-
-/* Logger object */
-static logger_t *dw_log = NULL;
-
-/* Encoder thread data */
-static pthread_t dw_encoder_tid = 0;
-static bool_t dw_encoder_stop = FALSE;
-static bool_t dw_encode = FALSE;
-static int dw_fragment_index = 0, dw_head_fragment = 0, dw_fragment_size;
-
-/* Forward declarations */
-static void *dw_encoder_thread( void *arg );
-static void dw_write_head( void );
-
-/* Prepare a new file to write audio data to */
-bool_t dw_prepare_file( void )
-{
-	char full_nameMAX_FILE_NAME, suffix30 = ".wav";
-
-	/* Get output file name */
-	util_strncpy(full_name, dw_file_name, sizeof(full_name));
-	if (dw_encode)
-		snprintf(suffix, sizeof(suffix), "-%03d.wav", dw_fragment_index);
-	strcat(full_name, suffix);
-
-	/* Try to open file */
-	dw_fd = file_open(full_name, "w+b", NULL);
-	if (dw_fd == NULL)
-	{
-		logger_error(dw_log, 1, _("Unable to create file %s"), full_name);
-		return FALSE;
-	}
-
-	/* Leave space for header */
-	file_seek(dw_fd, DW_HEAD_SIZE, SEEK_SET);
-	dw_file_size = DW_HEAD_SIZE;
-	return TRUE;
-} /* End of 'dw_prepare_file' function */
-
-/* Finish work with a file */
-void dw_finish_file( void )
-{
-	dw_write_head();
-	file_close(dw_fd);
-	dw_fd = NULL;
-} /* End of 'dw_finish_file' function */
-
-/* Start plugin */
-bool_t dw_start( void )
-{
-	char nameMAX_FILE_NAME;
-	char *str = NULL;
-	int i;
-
-	/* Get output file name (without extension and fragment index) */
-	if (cfg_get_var_int(dw_cfg, "name-as-title"))
-		str = cfg_get_var(dw_root_cfg, "cur-song-title");
-	else 
-		str = cfg_get_var(dw_root_cfg, "cur-song-name");
-	if (str == NULL)
-		return FALSE;
-	util_strncpy(name, str, sizeof(name));
-	str = strrchr(name, '.');
-	if (str != NULL)
-		*str = 0;
-	util_replace_char(name, ':', '_');
-	str = cfg_get_var(dw_cfg, "path");
-	if (str != NULL)
-		snprintf(dw_file_name, sizeof(dw_file_name), "%s/%s", str, name);
-	else
-		snprintf(dw_file_name, sizeof(dw_file_name), "%s", name);
-
-	/* Check if we should encode the stream */
-	if (cfg_get_var_bool(dw_cfg, "encode"))
-	{
-		dw_encode = TRUE;
-		dw_fragment_index = 0;
-
-		/* Get one fragment size and convert to the respective file size */
-		dw_fragment_size = cfg_get_var_int(dw_cfg, "fragment-size");
-		if (dw_fragment_size <= 0)
-			dw_fragment_size = DW_DEFAULT_FRAGMENT_SIZE;
-		dw_fragment_size *= (dw_freq * dw_channels);
-		if (dw_fmt != AFMT_U8 && dw_fmt != AFMT_S8)
-			dw_fragment_size *= 2;
-
-		/* Start encoder thread */
-		dw_encoder_tid = 0;
-		dw_encoder_stop = FALSE;
-		dw_head_fragment = 0;
-		if (pthread_create(&dw_encoder_tid, NULL, dw_encoder_thread, NULL))
-			dw_encode = FALSE;
-	}
-	
-	/* Prepare the file */
-	if (!dw_prepare_file())
-		return FALSE;
-	return TRUE;
-} /* End of 'dw_start' function */
-
-/* Write WAV header */
-static void dw_write_head( void )
-{
-	long chunksize1 = 16, chunksize2 = dw_file_size - DW_HEAD_SIZE;
-	short format_tag = 1;
-	short databits, block_align;
-	long avg_bps;
-	
-	if (dw_fd == NULL)
-		return;
-	
-	/* Set some variables */
-	chunksize1 = 16;
-	chunksize2 = dw_file_size - DW_HEAD_SIZE;
-	format_tag = 1;
-	databits = (dw_fmt == AFMT_U8 || dw_fmt == AFMT_S8) ? 8 : 16;
-	block_align = databits * dw_channels / 8;
-	avg_bps = dw_freq * block_align;
-
-	/* Write header */
-	file_seek(dw_fd, 0, SEEK_SET);
-	file_write("RIFF", 1, 4, dw_fd);
-	file_write(&dw_file_size, 4, 1, dw_fd);
-	file_write("WAVE", 1, 4, dw_fd);
-	file_write("fmt ", 1, 4, dw_fd);
-	file_write(&chunksize1, 4, 1, dw_fd);
-	file_write(&format_tag, 2, 1, dw_fd);
-	file_write(&dw_channels, 2, 1, dw_fd);
-	file_write(&dw_freq, 4, 1, dw_fd);
-	file_write(&avg_bps, 4, 1, dw_fd);
-	file_write(&block_align, 2, 1, dw_fd);
-	file_write(&databits, 2, 1, dw_fd);
-	file_write("data", 1, 4, dw_fd);
-	file_write(&chunksize2, 4, 1, dw_fd);
-} /* End of 'dw_write_head' function */
-
-/* Stop plugin */
-void dw_end( void )
-{
-	if (dw_fd != NULL)
-		dw_finish_file();
-	if (dw_encoder_tid != 0)
-	{
-		dw_encoder_stop = TRUE;
-		pthread_join(dw_encoder_tid, NULL);
-		dw_encoder_tid = 0;
-	}
-} /* End of 'dw_end' function */
-
-/* Play stream */
-void dw_play( void *buf, int size )
-{
-	if (dw_fd == NULL)
-		return;
-	
-	file_write(buf, 1, size, dw_fd);
-	dw_file_size += size;
-	if (dw_encode && dw_file_size >= dw_fragment_size)
-	{
-		dw_finish_file();
-		dw_fragment_index ++;
-		dw_prepare_file();
-	}
-} /* End of 'dw_play' function */
-
-/* Set channels number */
-void dw_set_channels( int ch )
-{
-	dw_channels = ch;
-} /* End of 'dw_set_channels' function */
-
-/* Set playing frequency */
-void dw_set_freq( int freq )
-{
-	dw_freq = freq;
-} /* End of 'dw_set_freq' function */
-
-/* Set playing format */
-void dw_set_fmt( dword fmt )
-{
-	dw_fmt = fmt;
-} /* End of 'dw_set_bits' function */
-
-/* Encoder thread function */
-static void *dw_encoder_thread( void *arg )
-{
-	for ( ;; )
-	{
-		/* Do encoding */
-		while ((dw_head_fragment < dw_fragment_index) ||
-				(dw_head_fragment == dw_fragment_index && dw_encoder_stop))
-		{
-			char cmdMAX_FILE_NAME, file_nameMAX_FILE_NAME, 
-				 full_nameMAX_FILE_NAME;
-			char *cmd_format;
-			int cmd_len;
-
-			/* Construct file name */
-			snprintf(file_name, sizeof(file_name), "%s-%03d", dw_file_name,
-					dw_head_fragment);
-			snprintf(full_name, sizeof(full_name), "%s.wav", file_name);
-
-			/* Format encoder command */
-			cmd_format = cfg_get_var(dw_cfg, "encode-command");
-			if (cmd_format != NULL && strcmp(cmd_format, ""))
-			{
-				/* Substitute tokens in the format string */
-				for ( cmd_len = 0; *cmd_format; cmd_format ++ )
-				{
-					/* Common character */
-					if ((*cmd_format) != '%')
-						cmdcmd_len ++ = (*cmd_format);
-					/* A token */
-					else
-					{
-						char ch;
-
-						/* Get format symbol */
-						cmd_format ++;
-						ch = (*cmd_format);
-
-						/* Input file name */
-						if (ch == 'i')
-						{
-							strncpy(&cmdcmd_len, full_name, 
-									sizeof(cmd) - cmd_len);
-							cmd_len += strlen(full_name);
-						}
-						/* Output file name (without extension) */
-						else if (ch == 'o') 
-						{
-							strncpy(&cmdcmd_len, file_name, 
-									sizeof(cmd) - cmd_len);
-							cmd_len += strlen(file_name);
-						}
-						/* Some other symbol */
-						else
-							cmdcmd_len ++ = ch;
-					}
-					if (cmd_len >= sizeof(cmd))
-					{
-						cmd_len = sizeof(cmd) - 1;
-						break;
-					}
-				}
-				cmdcmd_len = 0;
-			}
-			/* Use default coder */
-			else
-			{
-				snprintf(cmd, sizeof(cmd), "oggenc -Q \"%s\"", full_name);
-			}
-			logger_status_msg(dw_log, 1, _("Encoding: %s"), cmd);
-			if (system(cmd) < 0)
-			{
-				logger_error(dw_log, 1, _("Encoder command failed"));
-			}
-			unlink(full_name);
-			dw_head_fragment ++;
-		}
-		if (dw_encoder_stop)
-			break;
-		util_wait();
-	}
-	return NULL;
-} /* End of 'dw_encoder_thread' function */
-
-/* Handle 'ok_clicked' message for configuration dialog */
-wnd_msg_retcode_t dw_on_configure( wnd_t *wnd )
-{
-	editbox_t *eb_path, *eb_fragment, *eb_command;
-	checkbox_t *cb_encode;
-	
-	eb_path = EDITBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), "path"));
-	cb_encode = CHECKBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), "encode"));
-	eb_fragment = EDITBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd),
-				"fragment_size"));
-	eb_command = EDITBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), 
-				"encode_command"));
-	assert(eb_path && eb_fragment && eb_command && cb_encode);
-	cfg_set_var(dw_cfg, "path", EDITBOX_TEXT(eb_path));
-	cfg_set_var_bool(dw_cfg, "encode", cb_encode->m_checked);
-	cfg_set_var(dw_cfg, "fragment-size", EDITBOX_TEXT(eb_fragment));
-	cfg_set_var(dw_cfg, "encode-command", EDITBOX_TEXT(eb_command));
-	return WND_MSG_RETCODE_OK;
-} /* End of 'dw_on_configure' function */
-
-/* Launch configuration dialog */
-void dw_configure( wnd_t *parent )
-{
-	dialog_t *dlg;
-	vbox_t *vbox;
-
-	dlg = dialog_new(parent, _("Configure disk writer plugin"));
-	filebox_new_with_label(WND_OBJ(dlg->m_vbox), _("P&ath to store: "), 
-			"path", cfg_get_var(dw_cfg, "path"), 'a', 50);
-	vbox = vbox_new(WND_OBJ(dlg->m_vbox), _("Encoder"), 0);
-	checkbox_new(WND_OBJ(vbox), _("&Enable encoder"),
-			"encode", 'e', cfg_get_var_bool(dw_cfg, "encode"));
-	editbox_new_with_label(WND_OBJ(vbox), _("F&ragment size: "), 
-			"fragment_size", cfg_get_var(dw_cfg, "fragment-size"), 'r', 50);
-	editbox_new_with_label(WND_OBJ(vbox), _("Encoder c&ommand: "),
-			"encode_command", cfg_get_var(dw_cfg, "encode-command"), 'o', 50);
-	wnd_msg_add_handler(WND_OBJ(dlg), "ok_clicked", dw_on_configure);
-	dialog_arrange_children(dlg);
-} /* End of 'dw_configure' function */
-
-/* Exchange data with main program */
-void plugin_exchange_data( plugin_data_t *pd )
-{
-	pd->m_desc = dw_desc;
-	pd->m_author = dw_author;
-	pd->m_configure = dw_configure;
-	OUTP_DATA(pd)->m_start = dw_start;
-	OUTP_DATA(pd)->m_end = dw_end;
-	OUTP_DATA(pd)->m_play = dw_play;
-	OUTP_DATA(pd)->m_set_channels = dw_set_channels;
-	OUTP_DATA(pd)->m_set_freq = dw_set_freq;
-	OUTP_DATA(pd)->m_set_fmt = dw_set_fmt;
-	OUTP_DATA(pd)->m_flags = OUTP_NO_SOUND;
-	dw_pmng = pd->m_pmng;
-	dw_cfg = pd->m_cfg;
-	dw_root_cfg = pd->m_root_cfg;
-	dw_log = pd->m_logger;
-} /* End of 'plugin_exchange_data' function */
-
-/* End of 'writer.c' file */
-

mpfc-1.3.8.1.tar.bz2/plugins/output/oss Deleted

mpfc-1.3.8.1.tar.bz2/plugins/output/oss/Makefile.am Deleted

mpfc-1.3.8.1.tar.bz2/plugins/output/oss/Makefile.in Deleted

@@ -1,582 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = plugins/output/oss
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/mpfc-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
-  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
-    if (++n$$2 == $(am__install_max)) \
-      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
-    END { for (dir in files) print dir, filesdir }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(mylibdir)"
-LTLIBRARIES = $(mylib_LTLIBRARIES)
-liboss_la_DEPENDENCIES =
-am_liboss_la_OBJECTS = oss.lo
-liboss_la_OBJECTS = $(am_liboss_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(liboss_la_SOURCES)
-DIST_SOURCES = $(liboss_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
-COMMON_LIBS = @COMMON_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURSES_LIBS = @CURSES_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
-GENCAT = @GENCAT@
-GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GPM_LIBS = @GPM_LIBS@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESOLV_LIBS = @RESOLV_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-mylib_LTLIBRARIES = liboss.la
-mylibdir = $(libdir)/mpfc/output
-liboss_la_SOURCES = oss.c
-liboss_la_LIBADD = @COMMON_LIBS@
-INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/output/oss/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/output/oss/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(mylibdir)" || $(MKDIR_P) "$(DESTDIR)$(mylibdir)"
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
-	}
-
-uninstall-mylibLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
-	done
-
-clean-mylibLTLIBRARIES:
-	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
-	@list='$(mylib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-liboss.la: $(liboss_la_OBJECTS) $(liboss_la_DEPENDENCIES) 
-	$(LINK) -rpath $(mylibdir) $(liboss_la_OBJECTS) $(liboss_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oss.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(mylibdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-mylibLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-mylibLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-mylibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-mylibLTLIBRARIES install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-mylibLTLIBRARIES
-
-
-# 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:

mpfc-1.3.8.1.tar.bz2/plugins/output/oss/oss.c Deleted

@@ -1,276 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. OSS output plugin functions implementation.
- * $Id: oss.c 308 2011-03-13 12:16:29Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <unistd.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/soundcard.h>
-#include <sys/ioctl.h>
-#include "types.h"
-#include "cfg.h"
-#include "outp.h"
-#include "pmng.h"
-#include "wnd.h"
-#include "wnd_dialog.h"
-#include "wnd_editbox.h"
-
-/* Audio device file handle */
-static int oss_fd = -1;
-
-/* Some function declarations */
-static bool_t oss_get_dev( char *name );
-
-/* Plugins manager  */
-static pmng_t *oss_pmng = NULL;
-
-/* Plugin description */
-static char *oss_desc = "OSS output plugin";
-
-/* Plugin author */
-static char *oss_author = "Sergey E. Galanov <sgsoftware@mail.ru>";
-
-/* Configuration list */
-static cfg_node_t *oss_cfg = NULL;
-
-/* Mixer type */
-static int oss_mixer_type_read = SOUND_MIXER_READ_PCM;
-static int oss_mixer_type_write = SOUND_MIXER_WRITE_PCM;
-
-/* Start plugin */
-bool_t oss_start( void )
-{
-	char nameMAX_FILE_NAME;
-
-	/* Check if we have access to sound card */
-	if (!oss_get_dev(name))
-	{
-		oss_fd = -1;
-		return FALSE;
-	}
-
-	/* Open device */
-	oss_fd = open(name, O_WRONLY);
-	if (oss_fd < 0)
-		return FALSE;
-	return TRUE;
-} /* End of 'oss_start' function */
-
-/* Stop plugin */
-void oss_end( void )
-{
-	if (oss_fd != -1)
-	{
-		close(oss_fd);
-		oss_fd = -1;
-	}
-} /* End of 'oss_end' function */
-
-/* Play stream */
-void oss_play( void *buf, int size )
-{
-	if (oss_fd == -1)
-		return;
-	
-	if (write(oss_fd, buf, size) != size)
-	{
-		return;
-	}
-} /* End of 'oss_play' function */
-
-/* Set channels number */
-void oss_set_channels( int ch )
-{
-	if (oss_fd == -1)
-		return;
-
-	ioctl(oss_fd, SNDCTL_DSP_CHANNELS, &ch);
-} /* End of 'oss_set_channels' function */
-
-/* Set playing frequency */
-void oss_set_freq( int freq )
-{
-	if (oss_fd == -1)
-		return;
-
-	ioctl(oss_fd, SNDCTL_DSP_SPEED, &freq);
-} /* End of 'oss_set_freq' function */
-
-/* Set playing format */
-void oss_set_fmt( dword fmt )
-{
-	if (oss_fd == -1)
-		return;
-
-	ioctl(oss_fd, SNDCTL_DSP_SETFMT, &fmt);
-} /* End of 'oss_set_bits' function */
-
-/* Flush function */
-void oss_flush( void )
-{
-	if (oss_fd == -1)
-		return;
-
-	ioctl(oss_fd, SNDCTL_DSP_SYNC, 0);
-} /* End of 'oss_flush' function */
-
-/* Set volume */
-void oss_set_volume( int left, int right )
-{
-	int fd;
-	int v;
-
-	fd = open("/dev/mixer", O_WRONLY);
-	if (fd < 0)
-		return;
-	v = right | (left << 8);
-	ioctl(fd, oss_mixer_type_write, &v);
-	close(fd);
-} /* End of 'oss_set_volume' function */
-
-/* Get volume */
-void oss_get_volume( int *left, int *right )
-{
-	int fd;
-	int v;
-
-	fd = open("/dev/mixer", O_RDONLY);
-	if (fd < 0)
-		return;
-	ioctl(fd, oss_mixer_type_read, &v);
-	close(fd);
-	*left = ((v >> 8) & 0xFF);
-	*right = (v & 0xFF);
-} /* End of 'oss_get_volume' function */
-
-/* Handle 'ok_clicked' message for configuration dialog */
-wnd_msg_retcode_t oss_on_configure( wnd_t *wnd )
-{
-	editbox_t *eb = EDITBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), "device"));
-	assert(eb);
-	cfg_set_var(oss_cfg, "device", EDITBOX_TEXT(eb));
-	return WND_MSG_RETCODE_OK;
-} /* End of 'oss_on_configure' function */
-
-/* Launch configuration dialog */
-void oss_configure( wnd_t *parent )
-{
-	dialog_t *dlg;
-	editbox_t *eb;
-
-	dlg = dialog_new(parent, _("Configure OSS plugin"));
-	eb = editbox_new_with_label(WND_OBJ(dlg->m_vbox), _("&Device: "), 
-			"device", cfg_get_var(oss_cfg, "device"), 'd', 50);
-	wnd_msg_add_handler(WND_OBJ(dlg), "ok_clicked", oss_on_configure);
-	dialog_arrange_children(dlg);
-} /* End of 'oss_configure' function */
-
-/* Set mixer type */
-void oss_set_mixer_type( plugin_mixer_type_t type )
-{
-	if (type == PLUGIN_MIXER_DEFAULT || type == PLUGIN_MIXER_PCM)
-	{
-		oss_mixer_type_read = SOUND_MIXER_READ_PCM;
-		oss_mixer_type_write = SOUND_MIXER_WRITE_PCM;
-	}
-	else if (type == PLUGIN_MIXER_MASTER)
-	{
-		oss_mixer_type_read = SOUND_MIXER_READ_VOLUME;
-		oss_mixer_type_write = SOUND_MIXER_WRITE_VOLUME;
-	}
-	else if (type == PLUGIN_MIXER_CD)
-	{
-		oss_mixer_type_read = SOUND_MIXER_READ_CD;
-		oss_mixer_type_write = SOUND_MIXER_WRITE_CD;
-	}
-	else if (type == PLUGIN_MIXER_LINE)
-	{
-		oss_mixer_type_read = SOUND_MIXER_READ_LINE;
-		oss_mixer_type_write = SOUND_MIXER_WRITE_LINE;
-	}
-	else if (type == PLUGIN_MIXER_MIC)
-	{
-		oss_mixer_type_read = SOUND_MIXER_READ_MIC;
-		oss_mixer_type_write = SOUND_MIXER_WRITE_MIC;
-	}
-} /* End of 'oss_set_mixer_type' function */
-
-/* Exchange data with main program */
-void plugin_exchange_data( plugin_data_t *pd )
-{
-	pd->m_desc = oss_desc;
-	pd->m_author = oss_author;
-	pd->m_configure = oss_configure;
-	OUTP_DATA(pd)->m_start = oss_start;
-	OUTP_DATA(pd)->m_end = oss_end;
-	OUTP_DATA(pd)->m_play = oss_play;
-	OUTP_DATA(pd)->m_set_channels = oss_set_channels;
-	OUTP_DATA(pd)->m_set_freq = oss_set_freq;
-	OUTP_DATA(pd)->m_set_fmt = oss_set_fmt;
-	OUTP_DATA(pd)->m_flush = oss_flush;
-	OUTP_DATA(pd)->m_set_volume = oss_set_volume;
-	OUTP_DATA(pd)->m_get_volume = oss_get_volume;
-	OUTP_DATA(pd)->m_set_mixer_type = oss_set_mixer_type;
-	oss_pmng = pd->m_pmng;
-	oss_cfg = pd->m_cfg;
-} /* End of 'plugin_exchange_data' function */
-
-/* Some function declarations */
-bool_t oss_get_dev( char *name )
-{
-	char *dev, *s;
-	int fd;
-	
-	/* Get respective variable value */
-	dev = cfg_get_var(oss_cfg, "device");
-	if (dev == NULL)
-		dev = "/dev/dsp;/dev/dsp1";
-
-	/* Search specified devices */
-	for ( s = dev; *s; )
-	{
-		int i = 0;
-
-		/* Get name */
-		while ((*s) && ((*s) != ';'))
-		{
-			namei ++ = *(s ++);
-		}
-		namei = 0;
-
-		/* Check this device */
-		fd = open(name, O_WRONLY | O_NONBLOCK);
-		if (fd >= 0)
-		{
-			close(fd);
-			return TRUE;
-		}
-
-		/* Skip symbols until slash */
-		while ((*s) != '/' && (*s))
-			s ++;
-	}
-	return FALSE;
-} /* End of 'oss_get_dev' function */
-
-/* End of 'oss.c' file */
-

mpfc-1.3.8.1.tar.bz2/src/charset.h Deleted

@@ -1,84 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Interface for libcharset functions.
- * $Id: charset.h 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_CHARSET_H__
-#define __SG_MPFC_CHARSET_H__
-
-#include "types.h"
-#include "pmng.h"
-
-/* Charsets that are supported internally */
-#define CS_1_BYTE 0
-#define CS_UTF8 1
-#define CS_UNKNOWN -1
-
-/* Charset information structure */
-typedef struct 
-{
-	/* Charset ID */
-	int m_id;
-
-	/* Plugin that handles this charset and charset index in this plugin */
-	cs_plugin_t *m_csp;
-	int m_index;
-} cs_info_t;
-
-/* Output string helper type */
-typedef struct
-{
-	char *m_str;
-	int m_len;
-	int m_allocated;
-} cs_output_t;
-
-/* Convert string between charsets */
-char *cs_convert( char *str, char *cs_in, char *cs_out, pmng_t *pmng );
-
-/* Get charset info */
-void cs_get_info( char *name, cs_info_t *info, pmng_t *pmng );
-
-/* Get next character from string */
-dword cs_get_next_ch( char **str, cs_info_t *info );
-
-/* Convert character code to unicode */
-dword cs_to_unicode( dword ch, cs_info_t *info );
-
-/* Convert unicode to character code */
-dword cs_from_unicode( dword unicode, cs_info_t *info );
-
-/* Reallocate memory for output string */
-void cs_reallocate( cs_output_t *str, int new_len );
-
-/* Append character to output string */
-void cs_append2out( cs_output_t *str, char ch );
-
-/* Add a unicode character to output string */
-void cs_unicode2str( cs_output_t *str, dword unicode, cs_info_t *info );
-
-/* Get number of bytes occupied by symbol in UTF-8 charset (looking
- * at its first byte) */
-int cs_utf8_get_num_bytes( byte first );
-
-#endif
-
-/* End of 'charset.h' file */
-

mpfc-1.3.8.1.tar.bz2/src/csp.h Deleted

@@ -1,97 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Interface for charset plugin management functions.
- * $Id: csp.h 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_CSP_H__
-#define __SG_MPFC_CSP_H__
-
-#include "types.h"
-#include "plugin.h"
-
-struct tag_pmng_t;
-
-/* Data for exchange */
-typedef struct
-{
-	/* Common plugin data */
-	plugin_data_t m_pd;
-
-	/* Get number of supported character sets */
-	int (*m_get_num_sets)( void );
-
-	/* Get charset name */
-	char *(*m_get_cs_name)( int index );
-
-	/* Get symbol code */
-	dword (*m_get_code)( byte ch, int index );
-
-	/* Expand automatic charset */
-	char *(*m_expand_auto)( char *sample_str, int index );
-
-	/* Get charset flags */
-	dword (*m_get_flags)( int index );
-
-	/* Reserved data */
-	byte m_reserved116;
-
-	/* Reserved data */
-	byte m_reserved164;
-} csp_data_t;
-
-/* Charset plugin type */
-typedef struct tag_cs_plugin_t
-{
-	/* Common plugin data */
-	plugin_t m_plugin;
-
-	/* Data for exchange */
-	csp_data_t m_pd;
-} cs_plugin_t;
-
-/* Helper macros */
-#define CHARSET_PLUGIN(p) ((cs_plugin_t *)p)
-#define CSP_DATA(pd) ((csp_data_t *)pd)
-
-/* Charset flags */
-#define CSP_AUTO 0x00000001
-
-/* Initialize charset plugin */
-plugin_t *csp_init( char *name, struct tag_pmng_t *pmng );
-
-/* Get number of supported character sets */
-int csp_get_num_sets( cs_plugin_t *p );
-
-/* Get charset name */
-char *csp_get_cs_name( cs_plugin_t *p, int index );
-
-/* Get symbol code */
-dword csp_get_code( cs_plugin_t *p, byte ch, int index );
-
-/* Expand automatic charset */
-char *csp_expand_auto( cs_plugin_t *p, char *sample_str, int index );
-
-/* Get charset flags */
-dword csp_get_flags( cs_plugin_t *p, int index );
-
-#endif
-
-/* End of 'csp.h' file */
-

mpfc-1.3.8.1.tar.bz2/src/ep.h Deleted

@@ -1,72 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Interface for effect plugin management functions.
- * $Id: ep.h 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_EP_H__
-#define __SG_MPFC_EP_H__
-
-#include "types.h"
-#include "plugin.h"
-
-struct tag_pmng_t;
-
-/* Data for exchange */
-typedef struct
-{
-	/* Common plugin data */
-	plugin_data_t m_pd;
-
-	/* Apply plugin function */
-	int (*m_apply)( byte *data, int len, int fmt, int freq, int channels );
-
-	/* Reserved */
-	byte m_reserved124;
-
-	/* Reserved data */
-	byte m_reserved164;
-} ep_data_t;
-
-/* Effect plugin type */
-typedef struct tag_effect_plugin_t
-{
-	/* Common plugin data */
-	plugin_t m_plugin;
-
-	/* Data for exchange */
-	ep_data_t m_pd;
-} effect_plugin_t;
-
-/* Helper macros */
-#define EFFECT_PLUGIN(p) ((effect_plugin_t *)p)
-#define EP_DATA(p) ((ep_data_t *)p)
-
-/* Initialize effect plugin */
-plugin_t *ep_init( char *name, struct tag_pmng_t *pmng );
-
-/* Apply plugin to audio data */
-int ep_apply( effect_plugin_t *plugin, byte *data, int len, 
-	   			int fmt, int freq, int channels );
-
-#endif
-
-/* End of 'ep.h' file */
-
-

mpfc-1.3.8.1.tar.bz2/src/eqwnd.c Deleted

@@ -1,405 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Equalizer window functions implementation.
- * $Id: eqwnd.c 308 2011-03-13 12:16:29Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include "types.h"
-#include "cfg.h"
-#include "eqwnd.h"
-#include "help_screen.h"
-#include "player.h"
-#include "wnd.h"
-#include "util.h"
-#include "wnd.h"
-#include "wnd_dialog.h"
-#include "wnd_hbox.h"
-#include "wnd_label.h"
-#include "wnd_filebox.h"
-
-/* Equalizer window parameters */
-#define EQWND_SLIDER_START(eq)	0
-#define EQWND_SLIDER_SIZE(eq) 	(WND_HEIGHT(eq) - 1)
-#define EQWND_SLIDER_END(eq)	(EQWND_SLIDER_START(eq) + \
-		EQWND_SLIDER_SIZE(eq) - 1)
-#define EQWND_SLIDER_CENTER(eq)	((EQWND_SLIDER_START(eq) + \
-			EQWND_SLIDER_END(eq)) / 2)
-#define EQWND_SLIDER_WIDTH(eq)	6
-#define EQWND_NUM_BANDS			11
-
-/* Create a new equalizer window */
-eq_wnd_t *eqwnd_new( wnd_t *parent )
-{
-	eq_wnd_t *eq;
-
-	/* Allocate memory */
-	eq = (eq_wnd_t *)malloc(sizeof(eq_wnd_t));
-	if (eq == NULL)
-		return NULL;
-	memset(eq, 0, sizeof(*eq));
-	WND_OBJ(eq)->m_class = eqwnd_class_init(WND_GLOBAL(parent));
-
-	/* Initialize equalizer window */
-	if (!eqwnd_construct(eq, parent))
-	{
-		free(eq);
-		return NULL;
-	}
-	wnd_postinit(eq);
-	return eq;
-} /* End of 'eqwnd_new' function */
-
-/* Initialize equalizer window */
-bool_t eqwnd_construct( eq_wnd_t *eq, wnd_t *parent )
-{
-	wnd_t *wnd = (wnd_t *)eq;
-
-	/* Initialize window part */
-	if (!wnd_construct(wnd, parent, _("MPFC Equalizer"), 0, 0, 0, 0,
-				WND_FLAG_FULL_BORDER | WND_FLAG_MAXIMIZED))
-		return FALSE;
-
-	/* Register handlers */
-	wnd_msg_add_handler(wnd, "display", eqwnd_on_display);
-	wnd_msg_add_handler(wnd, "action", eqwnd_on_action);
-	wnd_msg_add_handler(wnd, "mouse_ldown", eqwnd_on_mouse_ldown);
-
-	/* Set fields */
-	wnd->m_cursor_hidden = TRUE;
-	eq->m_pos = 0;
-	eq->m_cur_value = eqwnd_get_band(eq->m_pos);
-	return TRUE;
-} /* End of 'eqwnd_init' function */
-
-/* Handle display message */
-wnd_msg_retcode_t eqwnd_on_display( wnd_t *wnd )
-{
-	eq_wnd_t *eq = (eq_wnd_t *)wnd;
-	int i, start_y = 0;
-	int x;
-	char *strEQWND_NUM_BANDS = {"PREAMP", "60HZ", "170HZ", "310HZ", "600HZ",
-						"1KHZ", "3KHZ", "6KHZ", "12KHZ", "14KHZ", "16KHZ"};
-	
-	/* Display bands sliders */
-	eqwnd_scroll(eq);
-	for ( i = eq->m_scroll, x = 3; i < EQWND_NUM_BANDS; i ++ )
-	{
-		float val;
-
-		val = eqwnd_get_band(i);
-		x += eqwnd_display_slider(eq, x, (i == eq->m_pos), val, stri);
-		if (i == 0)
-		{
-			wnd_apply_style(wnd, "label-style");
-			wnd_move(wnd, 0, x, EQWND_SLIDER_START(eq));
-			wnd_printf(wnd, 0, 0, "+20 dB");
-			wnd_move(wnd, 0, x, EQWND_SLIDER_CENTER(eq));
-			wnd_printf(wnd, 0, 0, "  0 dB");
-			wnd_move(wnd, 0, x, EQWND_SLIDER_END(eq));
-			wnd_printf(wnd, 0, 0, "-20 dB");
-			x += 10;
-		}
-	}
-	return WND_MSG_RETCODE_OK;
-} /* End of 'eqwnd_display' function */
-
-/* Handle action message */
-wnd_msg_retcode_t eqwnd_on_action( wnd_t *wnd, char *action )
-{
-	eq_wnd_t *eq = (eq_wnd_t *)wnd;
-
-	if (!strcasecmp(action, "quit"))
-	{
-		wnd_close(wnd);
-	}
-	else if (!strcasecmp(action, "move_left"))
-	{
-		eq->m_pos --;
-		if (eq->m_pos < 0)
-			eq->m_pos = EQWND_NUM_BANDS - 1;
-		eq->m_cur_value = eqwnd_get_band(eq->m_pos);
-		wnd_invalidate(wnd);
-	}
-	else if (!strcasecmp(action, "move_right"))
-	{
-		eq->m_pos ++;
-		if (eq->m_pos >= EQWND_NUM_BANDS)
-			eq->m_pos = 0;
-		eq->m_cur_value = eqwnd_get_band(eq->m_pos);
-		wnd_invalidate(wnd);
-	}
-	else if (!strcasecmp(action, "decrease"))
-	{
-		eqwnd_set_band(eq->m_pos, eq->m_cur_value - 
-				(40. / (EQWND_SLIDER_SIZE(eq) - 1)));
-		eq->m_cur_value = eqwnd_get_band(eq->m_pos);
-		player_eq_changed = TRUE;
-		wnd_invalidate(wnd);
-	}
-	else if (!strcasecmp(action, "increase"))
-	{
-		eqwnd_set_band(eq->m_pos, eq->m_cur_value + 
-				(40. / (EQWND_SLIDER_SIZE(eq) - 1)));
-		eq->m_cur_value = eqwnd_get_band(eq->m_pos);
-		player_eq_changed = TRUE;
-		wnd_invalidate(wnd);
-	}
-	else if (!strcasecmp(action, "load_eqf"))
-	{
-		eqwnd_load_eqf_dlg();
-	}
-	else if (!strcasecmp(action, "help"))
-	{
-		eqwnd_help(eq);
-	}
-	if (player_eq_changed && 
-			cfg_get_var_bool(cfg_list, "equalizer.enable-on-change"))
-		cfg_set_var_bool(cfg_list, "equalizer.enabled", TRUE);
-	return WND_MSG_RETCODE_OK;
-} /* End of 'eqwnd_handle_key' function */
-
-/* Display slider */
-int eqwnd_display_slider( eq_wnd_t *eq, int x, bool_t hl, float val, char *str )
-{
-	wnd_t *wnd = WND_OBJ(eq);
-	int pos, i, y;
-	
-	wnd_apply_style(wnd, hl ? "focus-band-style" : "band-style");
-	pos = eqwnd_val2pos(val, EQWND_SLIDER_SIZE(eq));
-	for ( y = EQWND_SLIDER_START(eq), i = 0; y <= EQWND_SLIDER_END(eq); 
-			y ++, i ++ )
-	{
-		wnd_move(wnd, 0, x, y);
-		if (i == pos)
-		{
-			wnd_putchar(wnd, 0, ACS_BLOCK);
-			wnd_putchar(wnd, 0, ACS_BLOCK);
-		}
-		else
-		{
-			wnd_putchar(wnd, 0, ACS_VLINE);
-			wnd_putchar(wnd, 0, ACS_VLINE);
-		}
-	}
-	wnd_move(wnd, 0, x - 1, EQWND_SLIDER_END(eq) + 1);
-	wnd_apply_style(wnd, hl ? "focus-label-style" : "label-style");
-	wnd_printf(wnd, 0, 0, "%s", str);
-	return EQWND_SLIDER_WIDTH(eq);
-} /* End of 'eqwnd_display_slider' function */
-
-/* Launch load preset from EQF file dialog */
-void eqwnd_load_eqf_dlg( void )
-{
-	dialog_t *dlg;
-
-	dlg = dialog_new(wnd_root, _("Load preset from a Winamp EQF file"));
-	filebox_new_with_label(WND_OBJ(dlg->m_vbox), _("&Name: "), "name", "", 
-			'n', 50);
-	wnd_msg_add_handler(WND_OBJ(dlg), "ok_clicked", eqwnd_on_load);
-	dialog_arrange_children(dlg);
-} /* End of 'eqwnd_load_eqf_dlg' function */
-
-/* Handle 'ok_clicked' for EQF loading dialog */
-wnd_msg_retcode_t eqwnd_on_load( wnd_t *wnd )
-{
-	editbox_t *eb = EDITBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), "name"));
-	assert(eb);
-	eqwnd_load_eqf(EDITBOX_TEXT(eb));
-	return WND_MSG_RETCODE_OK;
-} /* End of 'eqwnd_on_load' function */
-
-/* Load a Winamp EQF file */
-void eqwnd_load_eqf( char *filename )
-{
-	FILE *fd;
-	char header31;
-	byte bandsEQWND_NUM_BANDS;
-	int i;
-
-	/* Open file */
-	fd = util_fopen(filename, "rb");
-	if (fd == NULL)
-		return;
-
-	/* Read data */
-	if (fread(header, 1, 31, fd) != 31)
-	{
-		fclose(fd);
-		return;
-	}
-	if (!strncmp(header, "Winamp EQ library file v1.1", 27))
-	{
-		if (fseek(fd, 257, SEEK_CUR) == -1)	/* Skip name */
-		{
-			fclose(fd);
-			return;
-		}
-		if (fread(bands, 1, EQWND_NUM_BANDS, fd) != EQWND_NUM_BANDS)
-		{
-			fclose(fd);
-			return;
-		}
-
-		eqwnd_set_band(0, 20.0 - ((bands10 * 40.0) / 63.0));
-		for ( i = 0; i < 10; i ++ )
-		{
-			eqwnd_set_band(i + 1, 20.0 - ((bandsi * 40.0) / 64.0));
-		}
-	}
-
-	/* Close file */
-	fclose(fd);
-
-	/* Report about changing */
-	player_eq_changed = TRUE;
-} /* End of 'eqwnd_load_eqf' function */
-
-/* Handle mouse left button click */
-wnd_msg_retcode_t eqwnd_on_mouse_ldown( wnd_t *wnd, int x, int y,
-		wnd_mouse_button_t btn, wnd_mouse_event_t type )
-{
-	int band;
-	eq_wnd_t *eq = (eq_wnd_t *)wnd;
-
-	/* Check if this point is inside any of the band sliders */
-	for ( band = 0; band < EQWND_NUM_BANDS; band ++ )
-	{
-		int sx, sy, sw, sh;
-
-		eqwnd_get_slider_pos(eq, band, &sx, &sy, &sw, &sh);
-		if (x >= sx && y >= sy && x <= sx + sw && y <= sy + sh)
-		{
-			eq->m_pos = band;
-			eq->m_cur_value = eqwnd_pos2val(y - sy, sh);
-			eqwnd_set_band(band, eq->m_cur_value);
-			wnd_invalidate(wnd);
-			break;
-		}
-	}
-	return WND_MSG_RETCODE_OK;
-} /* End of 'eqwnd_on_mouse_ldown' function */
-
-/* Get equalizer band slider position */
-void eqwnd_get_slider_pos( eq_wnd_t *eq, int band, int *x, int *y, int *w, 
-		int *h )
-{
-	*x = 2 + (band - eq->m_scroll) * EQWND_SLIDER_WIDTH(eq);
-	if (band > 0 && eq->m_scroll == 0)
-		(*x) += 10;
-	*y = EQWND_SLIDER_START(eq);
-	*w = EQWND_SLIDER_WIDTH(eq);
-	*h = EQWND_SLIDER_SIZE(eq);
-} /* End of 'eqwnd_get_slider_pos' function */
-
-/* Convert band value to position */
-int eqwnd_val2pos( float val, int height )
-{
-	return rintf(((-val) + 20.) * (height - 1) / 40.);
-} /* End of 'eqwnd_val2pos' function */
-
-/* Convert position to band value */
-float eqwnd_pos2val( int pos, int height )
-{
-	return 20. - (pos * 40. / (height - 1));
-} /* End of 'eqwnd_pos2val' function */
-
-/* Show help screen */
-void eqwnd_help( eq_wnd_t *eq )
-{
-	help_new(WND_ROOT(eq), HELP_EQWND);
-} /* End of 'eqwnd_help' function */
-
-/* Initialize equalizer window class */
-wnd_class_t *eqwnd_class_init( wnd_global_data_t *global )
-{
-	wnd_class_t *klass = wnd_class_new(global, "equalizer", 
-			wnd_basic_class_init(global), NULL, NULL,
-			eqwnd_class_set_default_styles);
-	return klass;
-} /* End of 'eqwnd_class_init' function */
-
-/* Set equalizer window class default styles */
-void eqwnd_class_set_default_styles( cfg_node_t *list )
-{
-	cfg_set_var(list, "band-style", "cyan:black");
-	cfg_set_var(list, "focus-band-style", "cyan:black:bold");
-	cfg_set_var(list, "label-style", "white:black");
-	cfg_set_var(list, "focus-label-style", "white:black:bold");
-
-	/* Set kbinds */
-	cfg_set_var(list, "kbind.quit", "q;<Escape>");
-	cfg_set_var(list, "kbind.move_left", "h;<Left>;<Ctrl-b>");
-	cfg_set_var(list, "kbind.move_right", "l;<Right>;<Ctrl-f>");
-	cfg_set_var(list, "kbind.increase", "k;<Up>;<Ctrl-p>");
-	cfg_set_var(list, "kbind.decrease", "j;<Down>;<Ctrl-n>");
-	cfg_set_var(list, "kbind.load_eqf", "p");
-	cfg_set_var(list, "kbind.help", "?");
-} /* End of 'eqwnd_class_set_default_styles' function */
-
-/* Get equlizer band value */
-float eqwnd_get_band( int band )
-{
-	char var_name256;
-
-	if (band == 0)
-		snprintf(var_name, sizeof(var_name), "equalizer.preamp");
-	else
-		snprintf(var_name, sizeof(var_name), "equalizer.band%d", band);
-	return cfg_get_var_float(cfg_list, var_name);
-} /* End of 'eqwnd_get_band' function */
-
-/* Set equalizer band value */
-void eqwnd_set_band( int band, float val )
-{
-	char var_name256;
-
-	/* Clip value */
-	if (val < -20.)
-		val = -20.;
-	else if (val > 20.)
-		val = 20.;
-
-	if (band == 0)
-		snprintf(var_name, sizeof(var_name), "equalizer.preamp");
-	else
-		snprintf(var_name, sizeof(var_name), "equalizer.band%d", band);
-	cfg_set_var_float(cfg_list, var_name, val);
-} /* End of 'eqwnd_set_band' function */
-
-/* Scroll window if current band is not visible */
-void eqwnd_scroll( eq_wnd_t *eq )
-{
-	for ( ; eq->m_scroll >= 0 && eq->m_scroll < EQWND_NUM_BANDS - 1; )
-	{
-		int x, y, w, h;
-		eqwnd_get_slider_pos(eq, eq->m_pos, &x, &y, &w, &h);
-		if (x < 0)
-			eq->m_scroll --;
-		else if (x >= WND_WIDTH(eq))
-			eq->m_scroll ++;
-		else
-			break;
-	}
-} /* End of 'eqwnd_scroll' function */
-
-/* End of 'eqwnd.c' file */
-

mpfc-1.3.8.1.tar.bz2/src/eqwnd.h Deleted

@@ -1,105 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Interface for equalizer window functions.
- * $Id: eqwnd.h 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_EQUALIZER_H__
-#define __SG_MPFC_EQUALIZER_H__
-
-#include "types.h"
-#include "wnd.h"
-
-/* Equalizer window type */
-typedef struct 
-{
-	/* Window part */
-	wnd_t m_wnd;
-
-	/* Cursor position */
-	int m_pos, m_scroll;
-
-	/* Currently selected band value */
-	float m_cur_value;
-} eq_wnd_t;
-
-/* Convert window object to equalizer window type */
-#define EQWND_OBJ(wnd) ((eq_wnd_t *)wnd)
-
-/* Create a new equalizer window */
-eq_wnd_t *eqwnd_new( wnd_t *parent );
-
-/* Initialize equalizer window */
-bool_t eqwnd_construct( eq_wnd_t *eq, wnd_t *parent );
-
-/* Handle display message */
-wnd_msg_retcode_t eqwnd_on_display( wnd_t *wnd );
-
-/* Handle 'action' message */
-wnd_msg_retcode_t eqwnd_on_action( wnd_t *wnd, char *action );
-
-/* Handle mouse left button click */
-wnd_msg_retcode_t eqwnd_on_mouse_ldown( wnd_t *wnd, int x, int y,
-		wnd_mouse_button_t btn, wnd_mouse_event_t type );
-
-/* Display slider */
-int eqwnd_display_slider( eq_wnd_t *eq, int x, bool_t hl, float val, 
-		char *str );
-
-/* Get equalizer band slider position */
-void eqwnd_get_slider_pos( eq_wnd_t *eq, int band, int *x, int *y, int *w, 
-		int *h );
-
-/* Convert band value to position */
-int eqwnd_val2pos( float value, int height );
-
-/* Convert position to band value */
-float eqwnd_pos2val( int pos, int height );
-
-/* Show help screen */
-void eqwnd_help( eq_wnd_t *eq );
-
-/* Initialize equalizer window class */
-wnd_class_t *eqwnd_class_init( wnd_global_data_t *global );
-
-/* Set equalizer window class default styles */
-void eqwnd_class_set_default_styles( cfg_node_t *list );
-
-/* Get equlizer band value */
-float eqwnd_get_band( int band );
-
-/* Set equalizer band value */
-void eqwnd_set_band( int band, float val );
-
-/* Launch load preset from EQF file dialog */
-void eqwnd_load_eqf_dlg( void );
-
-/* Handle 'ok_clicked' for EQF loading dialog */
-wnd_msg_retcode_t eqwnd_on_load( wnd_t *wnd );
-
-/* Load a Winamp EQF file */
-void eqwnd_load_eqf( char *filename );
-
-/* Scroll window if current band is not visible */
-void eqwnd_scroll( eq_wnd_t *eq );
-
-#endif
-
-/* End of 'eqwnd.h' file */
-

mpfc-1.3.8.1.tar.bz2/src/file.h Deleted

@@ -1,96 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Interface for file library functions.
- * $Id: file.h 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_FILE_H__
-#define __SG_MPFC_FILE_H__
-
-#include <stdio.h>
-#include "types.h"
-#include "logger.h"
-#include "mystring.h"
-
-/* Function used to print messages */
-typedef void (*file_print_msg_t)( char *msg, ... );
-
-/* File type */
-typedef struct tag_file_t
-{
-	/* File name */
-	char *m_name;
-
-	/* File type */
-	byte m_type;
-
-	/* Logger object */
-	logger_t *m_log;
-
-	/* Additional data */
-	void *m_data;
-} file_t;
-
-/* File types */
-#define FILE_TYPE_REGULAR	0
-#define FILE_TYPE_HTTP		1
-
-/* Open a file */
-file_t *file_open( char *filename, char *mode, logger_t *log );
-
-/* Close file */
-int file_close( file_t *f );
-
-/* Read from file */
-size_t file_read( void *buf, size_t size, size_t nmemb, file_t *f );
-
-/* Write to file */
-size_t file_write( void *buf, size_t size, size_t nmemb, file_t *f );
-
-/* Write line to file */
-void file_puts( char *s, file_t *f );
-
-/* Get line from file */
-char *file_gets( char *s, int size, file_t *f );
-
-/* Get string from file */
-str_t *file_get_str( file_t *f );
-
-/* Seek file */
-int file_seek( file_t *f, long offset, int whence );
-
-/* Tell file position */
-long file_tell( file_t *f );
-
-/* Check for end of file */
-bool_t file_eof( file_t *f );
-
-/* Set minimal buffer size */
-void file_set_min_buf_size( file_t *f, int size );
-
-/* Get content type */
-char *file_get_content_type( file_t *f );
-
-/* Get file type */
-byte file_get_type( char *name );
-
-#endif
-
-/* End of 'file.h' file */
-

mpfc-1.3.8.1.tar.bz2/src/genre_list.h Deleted

@@ -1,63 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Interface for genres list management functions.
- * $Id: genre_list.h 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_GENRE_LIST_H__
-#define __SG_MPFC_GENRE_LIST_H__
-
-#include "types.h"
-
-/* Genre list type */
-typedef struct tag_genre_list_t
-{
-	struct tag_glist_item_t
-	{
-		char *m_name;
-		byte m_data;
-	} *m_list;
-	int m_size;
-} genre_list_t;
-
-/* Create a new genre list */
-genre_list_t *glist_new( void );
-
-/* Free genre list */
-void glist_free( genre_list_t *l );
-
-/* Add genre to list */
-void glist_add( genre_list_t *l, char *name, byte data );
-
-/* Get genre name */
-char *glist_get_name( genre_list_t *l, int id );
-
-/* Get genre name by its id */
-char *glist_get_name_by_id( genre_list_t *l, int id );
-
-/* Get genre id by its name */
-byte glist_get_id_by_name( genre_list_t *l, char *name );
-
-/* Convert genre string to id */
-int glist_str2num( char *str );
-
-#endif
-
-/* End of 'genre_list.h' file */
-

mpfc-1.3.8.1.tar.bz2/src/inp.h Deleted

@@ -1,276 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Interface for input plugin management functions.
- * $Id: inp.h 261 2006-06-06 10:00:32Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_INP_H__
-#define __SG_MPFC_INP_H__
-
-#include <sys/stat.h>
-#include "types.h"
-#include "file.h"
-#include "genre_list.h"
-#include "mystring.h"
-#include "plugin.h"
-#include "song_info.h"
-
-/* Input plugin flags */
-#define INP_OWN_OUT			0x00000001
-#define INP_OWN_SOUND		0x00000002
-#define INP_VFS				0x00000004
-#define INP_VFS_NOT_FIXED	0x00000008
-
-/* Special function flags */
-#define INP_SPEC_SAVE_INFO 0x00000001
-
-/* Forward declarations */
-struct tag_pmng_t;
-struct tag_song_t;
-
-/* Special input plugin function type */
-typedef struct
-{
-	/* Function title */
-	char *m_title;
-
-	/* Flags */
-	dword m_flags;
-
-	/* Function */
-	void (*m_func)( char *filename );
-} inp_spec_func_t;
-
-/* Redirection parameters */
-typedef struct
-{
-	int m_start_time, m_end_time;
-
-	byte m_reserved120;
-} inp_redirect_params_t;
-
-/* Data for exchange with plugin */
-typedef struct
-{
-	/* Common plugin data */
-	plugin_data_t m_common_data;
-
-	/*
-	 * Functions
-	 */
-
-	/* Start playing function */
-	bool_t (*m_start)( char *filename );
-
-	/* Start playing with an opened file descriptor */
-	bool_t (*m_start_with_fd)( char *filename, file_t *fd );
-
-	/* End playing function */
-	void (*m_end)( void );
-
-	/* Get stream function */
-	int (*m_get_stream)( void *buf, int size );
-
-	/* Seek song */
-	void (*m_seek)( int seconds );
-
-	/* Pause playing */
-	void (*m_pause)( void );
-
-	/* Resume playing */
-	void (*m_resume)( void );
-
-	/* Get current time */
-	int (*m_get_cur_time)( void );
-
-	/* Get song information function */
-	song_info_t *(*m_get_info)( char *file_name, int *len );
-	
-	/* Save song information function */
-	bool_t (*m_save_info)( char *file_name, song_info_t *info );
-	
-	/* Get supported file formats */
-	void (*m_get_formats)( char *extensions, char *content_type );
-	
-	/* Get song audio parameters */
-	void (*m_get_audio_params)( int *channels, int *frequency, dword *fmt,
-									int *bitrate );
-
-	/* Update equalizer parameters */
-	void (*m_set_eq)( void );
-
-	/* Set a title for song with empty song info */
-	str_t *(*m_set_song_title)( char *filename );
-
-	/* Set next song name */
-	void (*m_set_next_song)( char *name );
-
-	/***
-	 * Virtual file system access functions
-	 ***/
-
-	/* Open a directory */
-	void *(*m_vfs_opendir)( char *name );
-
-	/* Close directory */
-	void (*m_vfs_closedir)( void *dir );
-
-	/* Read directory entry */
-	char *(*m_vfs_readdir)( void *dir );
-
-	/* Get file parameters */
-	int (*m_vfs_stat)( char *name, struct stat *sb );
-
-	/* Get type of mixer used by this plugin */
-	plugin_mixer_type_t (*m_get_mixer_type)( void );
-
-	/* Check file type */
-	bool_t (*m_is_our_file)( char *filename );
-
-	/* Redirect virtual file to a normal one */
-	char *(*m_redirect)( char *filename, inp_redirect_params_t *rp );
-
-	/* Update plugin flags (called on start of every play) */
-	dword (*m_get_plugin_flags)( void );
-
-	/* Reserved */
-	byte m_reserved36;
-
-	/*
-	 * Data
-	 */
-
-	/* Special functions list */
-	int m_num_spec_funcs;
-	inp_spec_func_t *m_spec_funcs;
-
-	/* Plugin flags */
-	dword m_flags;
-
-	/* Reserved data */
-	byte m_reserved152;
-} inp_data_t;
-
-/* Input plugin type */
-typedef struct tag_in_plugin_t
-{
-	/* Plugin object */
-	plugin_t m_plugin;
-
-	/* Data for exchange */
-	inp_data_t m_pd;
-} in_plugin_t;
-
-/* Helper macros */
-#define INPUT_PLUGIN(p) ((in_plugin_t *)p)
-#define INP_DATA(pd) ((inp_data_t *)pd)
-
-/* Initialize input plugin */
-plugin_t *inp_init( char *name, struct tag_pmng_t *pmng );
-
-/* Free input plugin object */
-void inp_free( plugin_t *plugin );
-
-/* Start playing function */
-bool_t inp_start( in_plugin_t *p, char *filename, file_t *fd );
-
-/* End playing function */
-void inp_end( in_plugin_t *p );
-
-/* Get stream function */
-int inp_get_stream( in_plugin_t *p, void *buf, int size );
-
-/* Seek song */
-void inp_seek( in_plugin_t *p, int seconds );
-
-/* Pause playing */
-void inp_pause( in_plugin_t *p );
-
-/* Resume playing */
-void inp_resume( in_plugin_t *p );
-
-/* Get current time */
-int inp_get_cur_time( in_plugin_t *p );
-
-/* Get song information function */
-song_info_t *inp_get_info( in_plugin_t *p, char *file_name, int *len );
-	
-/* Save song information function */
-bool_t inp_save_info( in_plugin_t *p, char *file_name, song_info_t *info );
-	
-/* Get supported file formats */
-void inp_get_formats( in_plugin_t *p, char *extensions, char *content_type );
-	
-/* Get song audio parameters */
-void inp_get_audio_params( in_plugin_t *p, int *channels, 
-							int *frequency, dword *fmt, int *bitrate );
-
-/* Set equalizer parameters */
-void inp_set_eq( in_plugin_t *p );
-
-/* Initialize songs array that respects to the object */
-struct tag_song_t **inp_init_obj_songs( in_plugin_t *p, char *name, 
-		int *num_songs );
-
-/* Set song title */
-str_t *inp_set_song_title( in_plugin_t *p, char *filename );
-
-/* Set next song name */
-void inp_set_next_song( in_plugin_t *p, char *name );
-
-/* Get number of special functions */
-int inp_get_num_specs( in_plugin_t *p );
-
-/* Get special function title */
-char *inp_get_spec_title( in_plugin_t *p, int index );
-
-/* Get special function flags */
-dword inp_get_spec_flags( in_plugin_t *p, int index );
-
-/* Call special function */
-void inp_spec_func( in_plugin_t *p, int index, char *filename );
-
-/* Open directory */
-void *inp_vfs_opendir( in_plugin_t *p, char *name );
-
-/* Close directory */
-void inp_vfs_closedir( in_plugin_t *p, void *dir );
-
-/* Read directory entry */
-char *inp_vfs_readdir( in_plugin_t *p, void *dir );
-
-/* Get file parameters */
-int inp_vfs_stat( in_plugin_t *p, char *name, struct stat *sb );
-
-/* Get mixer type */
-plugin_mixer_type_t inp_get_mixer_type( in_plugin_t *p );
-
-/* Check file type */
-bool_t inp_is_our_file( in_plugin_t *p, char *filename );
-
-/* Redirect file */
-char *inp_redirect( in_plugin_t *p, char *filename, inp_redirect_params_t *rp );
-
-/* Update plugin flags */
-dword inp_get_plugin_flags( in_plugin_t *p );
-
-#endif
-
-/* End of 'inp.h' file */
-

mpfc-1.3.8.1.tar.bz2/src/myid3.h Deleted

@@ -1,214 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Interface for ID3 tags handling library.
- * $Id: myid3.h 276 2009-08-08 18:41:54Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_MYID3_H__
-#define __SG_MPFC_MYID3_H__
-
-#include "types.h"
-#include "file.h"
-
-/* Tag data */
-typedef struct
-{
-	/* Stream */
-	int m_stream_len;
-	byte *m_stream;
-
-	/* ID3V2 version */
-	int m_v2_version;
-
-	/* Frames info */
-	byte *m_frames_start, *m_cur_frame;
-} id3_tag_data_t;
-
-/* Tag object type */
-typedef struct
-{
-	/* Version number (1 or 2) */
-	int m_version;
-
-	/* V1 and V2 tags data */
-	id3_tag_data_t m_v1, m_v2;
-} id3_tag_t;
-
-/* Frame type */
-typedef struct
-{
-	/* Frame ID */
-	char m_name5;
-
-	/* Value */
-	char *m_val;
-
-	/* Encoding */
-	byte m_encoding;
-
-	/* Tag version */
-	byte m_version;
-} id3_frame_t;
-
-/* ID3V1 fields offsets and sizes */
-#define ID3_V1_TITLE_OFFSET 3
-#define ID3_V1_TITLE_SIZE 30
-#define ID3_V1_ARTIST_OFFSET (ID3_V1_TITLE_OFFSET+ID3_V1_TITLE_SIZE)
-#define ID3_V1_ARTIST_SIZE 30
-#define ID3_V1_ALBUM_OFFSET (ID3_V1_ARTIST_OFFSET+ID3_V1_ARTIST_SIZE)
-#define ID3_V1_ALBUM_SIZE 30
-#define ID3_V1_YEAR_OFFSET (ID3_V1_ALBUM_OFFSET+ID3_V1_ALBUM_SIZE)
-#define ID3_V1_YEAR_SIZE 4
-#define ID3_V1_COMMENT_OFFSET (ID3_V1_YEAR_OFFSET+ID3_V1_YEAR_SIZE)
-#define ID3_V1_COMMENT_SIZE 30
-#define ID3_V1_TRACK_OFFSET (ID3_V1_COMMENT_OFFSET+ID3_V1_COMMENT_SIZE - 1)
-#define ID3_V1_TRACK_SIZE 1
-#define ID3_V1_GENRE_OFFSET (ID3_V1_COMMENT_OFFSET+ID3_V1_COMMENT_SIZE)
-#define ID3_V1_GENRE_SIZE 1
-#define ID3_V1_TOTAL_SIZE 128
-
-/* Some frame names */
-#define ID3_FRAME_TITLE    "TIT2"
-#define ID3_FRAME_ARTIST   "TPE1"
-#define ID3_FRAME_ALBUM    "TALB"
-#define ID3_FRAME_YEAR     "TYER"
-#define ID3_FRAME_TRACK    "TRCK"
-#define ID3_FRAME_GENRE    "TCON"
-#define ID3_FRAME_COMMENT  "COMM"
-#define ID3_FRAME_FINISHED ""
-
-/* ID3V2 flags */
-#define ID3_HAS_EXT_HEADER 0x40
-#define ID3_HAS_FOOTER 0x10
-
-/* ID3V2 frame flags */
-#define ID3_FRAME_GROUPING 0x4000
-#define ID3_FRAME_ENCRYPTION 0x0400
-#define ID3_FRAME_DATA_LEN 0x0100
-
-/* Get ID3V2 flags */
-#define ID3_GET_FLAGS(tag) (*(byte *)((tag)->m_stream + 5))
-
-/* ID3V2 structures sizes */
-#define ID3_HEADER_SIZE 10
-#define ID3_FOOTER_SIZE 10
-
-/* Check if this is a valid frame name */
-#define ID3_IS_VALID_FRAME_SYM(c) \
-	(((c) >= 'A' && (c) <= 'Z') || ((c) >= '0' && (c) <= '9'))
-#define ID3_IS_VALID_FRAME_NAME(name) \
-	(ID3_IS_VALID_FRAME_SYM(*(name)) && \
-	 ID3_IS_VALID_FRAME_SYM(*((name) + 1)) && \
-	 ID3_IS_VALID_FRAME_SYM(*((name) + 2)) && \
-	 ID3_IS_VALID_FRAME_SYM(*((name) + 3)))
-
-/* Convert between synchsafe and normal integers */
-#define ID3_CONVERT_FROM_SYNCHSAFE(num) \
-	((((num) & 0x7F) << 21) | (((num) & 0x7F00) << 6) | \
-	 (((num) & 0x7F0000) >> 9) | (((num) & 0x7F000000) >> 24))
-#define ID3_CONVERT_TO_SYNCHSAFE(num) \
-	((((num) & 0x7F) << 24) | (((num) & 0x3F80) << 9) | \
-	 (((num) & 0x1FC000) >> 6) | (((num) & 0xFE00000) >> 21))
-#define ID3_SWAP_BYTES(num) \
-	((((num) & 0xFF) << 24) | (((num) & 0xFF00) << 8) | \
-	 (((num) & 0xFF0000) >> 8) | (((num) & 0xFF000000) >> 24))
-
-/* Text encoding */
-#define ID3_LATIN1  0
-#define ID3_UTF16   1
-#define ID3_UTF16BE 2
-#define ID3_UTF8    3
-
-/* What tags are present */
-#define ID3_V1_PRESENT	1
-#define ID3_V2_PRESENT	2
-
-/* Create a new empty tag */
-id3_tag_t *id3_new( void );
-	
-/* Read tag from file */
-id3_tag_t *id3_read( char *filename, byte *tags_present );
-
-/* Write tag to file */
-bool_t id3_write( id3_tag_t *tag, char *filename );
-
-/* Extract next frame from tag */
-void id3_next_frame( id3_tag_t *tag, id3_frame_t *frame );
-
-/* Set frame value */
-void id3_set_frame( id3_tag_t *tag, char *name, char *val, char *cs );
-
-/* Set genre frame */
-void id3_set_genre( id3_tag_t *tag, char *val, byte id, char *cs );
-
-/* Remove tags from file */
-void id3_remove( char *filename );
-
-/* Free tag */
-void id3_free( id3_tag_t *tag );
-
-/* Free frame */
-void id3_free_frame( id3_frame_t *f );
-
-/* Create an empty ID3V1 */
-void id3_v1_new( id3_tag_data_t *tag );
-
-/* Create an empty ID3V2 */
-void id3_v2_new( id3_tag_data_t *tag );
-
-/* Read ID3V1 */
-void id3_v1_read( id3_tag_data_t *tag, file_t *fd );
-
-/* Read ID3V2 */
-void id3_v2_read( id3_tag_data_t *tag, file_t *fd );
-
-/* Read next frame in ID3V1 */
-void id3_v1_next_frame( id3_tag_data_t *tag, id3_frame_t *frame );
-
-/* Read next frame in ID3V2 */
-void id3_v2_next_frame( id3_tag_data_t *tag, id3_frame_t *frame );
-
-/* Set frame value in ID3V1 */
-void id3_v1_set_frame( id3_tag_data_t *tag, char *name, char *val );
-
-/* Set frame value in ID3V2 */
-void id3_v2_set_frame( id3_tag_data_t *tag, char *name, char *val, char *cs );
-
-/* Save ID3V1 tag to file */
-bool_t id3_v1_write( id3_tag_data_t *tag, char *filename );
-
-/* Save ID3V2 tag to file */
-bool_t id3_v2_write( id3_tag_data_t *tag, char *filename );
-
-/* Remove ending spaces in string */
-void id3_rem_end_spaces( char *str, int len );
-
-/* Copy string to frame */
-void id3_copy2frame( id3_frame_t *f, byte **ptr, int size );
-
-/* Read a size */
-int id3_read_frame_size( char *buf, int v2_version );
-
-/* Write a size */
-void id3_write_frame_size( char *buf, int size, int v2_version );
-
-#endif
-
-/* End of 'myid3.h' file */
-

mpfc-1.3.8.1.tar.bz2/src/outp.h Deleted

@@ -1,161 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Interface for output plugin management functions.
- * $Id: outp.h 248 2006-01-07 18:20:44Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_OUTP_H__
-#define __SG_MPFC_OUTP_H__
-
-#include "types.h"
-#include "plugin.h"
-
-struct tag_pmng_t;
-
-/* Data for exchange */
-typedef struct 
-{
-	/* Common plugin data */
-	plugin_data_t m_pd;
-
-	/* Plugin start function */
-	bool_t (*m_start)( void );
-
-	/* Plugin end function */
-	void (*m_end)( void );
-
-	/* Play stream function */
-	void (*m_play)( void *buf, int size );
-
-	/* Set channels number function */
-	void (*m_set_channels)( int ch );
-
-	/* Set frequency function */
-	void (*m_set_freq)( int freq );
-
-	/* Set format function */
-	void (*m_set_fmt)( dword fmt );
-	
-	/* Set/get volume */
-	void (*m_set_volume)( int left, int right );
-	void (*m_get_volume)( int *left, int *right );
-
-	/* Flush function */
-	void (*m_flush)( void );
-
-	/* Pause playing */
-	void (*m_pause)( void );
-
-	/* Resume playint */
-	void (*m_resume)( void );
-
-	/* Set current mixer type */
-	void (*m_set_mixer_type)( plugin_mixer_type_t type );
-
-	/* Get real channels number */
-	int (*m_get_channels)( void );
-
-	/* Get real frequenry */
-	int (*m_get_freq )( void );
-
-	/* Get real format */
-	dword (*m_get_fmt)( void );
-
-	/* Reserved data */
-	byte m_reserved64;
-
-	/* Flags */
-	dword m_flags;
-
-	/* Reserved data */
-	byte m_reserved160;
-} outp_data_t;
-
-/* Output plugin type */
-typedef struct tag_out_plugin_t
-{
-	/* Plugin object */
-	plugin_t m_plugin;
-
-	/* Data for exchange */
-	outp_data_t m_pd;
-} out_plugin_t;
-
-/* Helper macros */
-#define OUTPUT_PLUGIN(p) ((out_plugin_t *)p)
-#define OUTP_DATA(pd) ((outp_data_t *)pd)
-
-/* Output plugin flags */
-#define OUTP_NO_SOUND 0x00000001
-
-/* Initialize output plugin */
-plugin_t *outp_init( char *name, struct tag_pmng_t *pmng );
-
-/* Plugin start function */
-bool_t outp_start( out_plugin_t *p );
-
-/* Plugin end function */
-void outp_end( out_plugin_t *p );
-
-/* Set channels number function */
-void outp_set_channels( out_plugin_t *p, int ch );
-
-/* Set frequency function */
-void outp_set_freq( out_plugin_t *p, int freq );
-
-/* Set format function */
-void outp_set_fmt( out_plugin_t *p, dword fmt );
-	
-/* Get real channels number */
-int outp_get_channels( out_plugin_t *p );
-
-/* Get real frequenry */
-int outp_get_freq ( out_plugin_t *p );
-
-/* Get real format */
-dword outp_get_fmt( out_plugin_t *p );
-
-/* Play stream function */
-void outp_play( out_plugin_t *p, void *buf, int size );
-
-/* Flush function */
-void outp_flush( out_plugin_t *p );
-
-/* Pause playing */
-void outp_pause( out_plugin_t *p );
-
-/* Resume playing */
-void outp_resume( out_plugin_t *p );
-
-/* Set volume */
-void outp_set_volume( out_plugin_t *p, int left, int right );
-
-/* Get volume */
-void outp_get_volume( out_plugin_t *p, int *left, int *right );
-
-/* Set mixer type */
-void out_set_mixer_type( out_plugin_t *p, plugin_mixer_type_t type );
-
-/* Get plugin flags */
-dword outp_get_flags( out_plugin_t *p );
-
-#endif
-
-/* End of 'outp.h' file */
-

mpfc-1.3.8.1.tar.bz2/src/vfs.h Deleted

@@ -1,185 +0,0 @@
-/******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
- *
- * SG MPFC. Interface for virtual file system functions.
- * $Id: vfs.h 229 2005-02-21 18:36:59Z sg2 $
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#ifndef __SG_MPFC_VFS_H__
-#define __SG_MPFC_VFS_H__
-
-#include <sys/stat.h>
-#include "types.h"
-#include "inp.h"
-#include "logger.h"
-
-/* Virtual file system data type */
-typedef struct 
-{
-	/* Plugins manager */
-	struct tag_pmng_t *m_pmng;
-} vfs_t;
-
-/* Check that input plugin uses VFS */
-#define VFS_INP_HAS(inp)	(inp_get_flags(inp) & INP_VFS)
-
-/* Get logger object */
-#define VFS_LOGGER(vfs)		(((vfs) == NULL || ((vfs)->m_pmng == NULL)) ? \
-								NULL : ((vfs)->m_pmng->m_log))
-
-/* A file representation */
-typedef struct tag_vfs_file_t
-{
-	/* File name */
-	char *m_full_name, *m_name, *m_short_name, *m_extension;
-
-	/* Input plugin for this file (got from plugin prefix) */
-	in_plugin_t *m_inp;
-
-	/* File parameters */
-	struct stat m_stat;
-
-	/* 'stat' call return code */
-	int m_stat_return;
-} vfs_file_t;
-
-/* Function called for each of matching file in 'vfs_glob' */
-typedef void (*vfs_callback_t)( vfs_file_t *file, void *data );
-
-/* Flags for 'vfs_glob' */
-typedef enum
-{
-	/* Pattern parameter is in fact not pattern but a real file name */
-	VFS_GLOB_NOPATTERN = 1 << 1,
-
-	/* Return also directories */
-	VFS_GLOB_RETURN_DIRS = 1 << 2,
-
-	/* Return '.' and '..' links */
-	VFS_GLOB_RETURN_SPEC_LINKS = 1 << 3,
-
-	/* Visit only files that are placed on the specified level */
-	VFS_GLOB_AT_LEVEL_ONLY = 1 << 4,
-
-	/* Output is escaped */
-	VFS_GLOB_OUTPUT_ESCAPED = 1 << 5,
-
-	/* Space is a special symbol */
-	VFS_GLOB_SPACE_IS_SPECIAL = 1 << 6,
-} vfs_glob_flags_t;
-#define VFS_LEVEL_INFINITE 0xFFFF
-
-/* List of matching files build in 'vfs_glob' */
-typedef struct 
-{
-	struct vfs_glob_list_item_t
-	{
-		str_t *m_name;
-		struct vfs_glob_list_item_t *m_next, *m_prev;
-	} *m_head, *m_tail;
-} vfs_glob_list_t;
-
-/* Initialize VFS */
-vfs_t *vfs_init( struct tag_pmng_t *pmng );
-
-/* Free VFS */
-void vfs_free( vfs_t *vfs );
-
-/* List files matching pattern */
-void vfs_glob( vfs_t *vfs, char *pattern, vfs_callback_t callback, void *data,
-		int max_level, vfs_glob_flags_t flags );
-
-/* Visit glob match */
-void vfs_visit_match( vfs_t *vfs, vfs_file_t *fd, vfs_callback_t callback,
-		void *dat, int level, int max_level, vfs_glob_flags_t flags );
-
-/* Visit list of matches */
-void vfs_visit_matches( vfs_t *vfs, in_plugin_t *inp, vfs_glob_list_t *list,
-		vfs_callback_t callback, void *data, int level, int max_level,
-		vfs_glob_flags_t flags );
-
-/* Initialize file descriptor structure */
-void vfs_file_desc_init( vfs_t *vfs, vfs_file_t *file, char *full_name,
-		in_plugin_t *inp );
-
-/* Escape special symbols in file name */
-void vfs_file_escape( vfs_file_t *dest, vfs_file_t *src, 
-		bool_t space_is_special );
-
-/* Get input plugin from the plugin prefix. Also return file name without
- * prefix */
-in_plugin_t *vfs_plugin_from_prefix( vfs_t *vfs, char *full_name, char **name );
-
-/* Returns absolute path of this pattern */
-str_t *vfs_pattern2absolute( vfs_t *vfs, in_plugin_t *inp, char *pattern );
-
-/***
- * Virtual file system access functions
- ***/
-
-/* Directory data */
-typedef struct
-{
-	/* VFS data */
-	vfs_t *m_vfs;
-
-	/* Input plugin */
-	in_plugin_t *m_inp;
-
-	/* Plugin-specific data */
-	void *m_data;
-} vfs_dir_t;
-
-/* Open directory */
-vfs_dir_t *vfs_opendir( vfs_t *vfs, vfs_file_t *file );
-
-/* Close directory */
-void vfs_closedir( vfs_dir_t *dir );
-
-/* Read next name from directory */
-char *vfs_readdir( vfs_dir_t *dir );
-
-/* Get file parameters */
-int vfs_stat( vfs_file_t *file, struct stat *st );
-
-/* Get current directory */
-char *vfs_getcwd( vfs_t *vfs, in_plugin_t *inp, char *dir, int size );
-
-/***
- * VFS glob list management functions 
- ***/
-
-/* Initialize list */
-vfs_glob_list_t *vfs_glob_list_new( void );
-
-/* Free list */
-void vfs_glob_list_free( vfs_glob_list_t *list );
-
-/* Add a file to list */
-void vfs_glob_list_add( vfs_glob_list_t *list, str_t *name );
-
-/* Sort list */
-void vfs_glob_list_sort( vfs_glob_list_t *list );
-
-/* Concatenate directory and file name */
-str_t *vfs_cat_dir_and_name( str_t *dir, char *name );
-
-#endif
-
-/* End of 'vfs.h' file */
-

mpfc-1.3.8.1.tar.bz2/src/xconvert.c Deleted

@@ -1,773 +0,0 @@
-/******************************************************************
- * Copyright (C) 2006 by SG Software.
- *
- * SG MPFC. Audio stream conversion functions.
- * Taken from XMMS.
- * $Id$
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include "types.h"
-#include <stdlib.h>
-#include <string.h>
-#include <sys/soundcard.h>
-#include "xconvert.h"
-#include "player.h"
-
-#ifdef WORDS_BIGENDIAN
-# define IS_BIG_ENDIAN TRUE
-#else
-# define IS_BIG_ENDIAN FALSE
-#endif
-
-#define GUINT16_SWAP_LE_BE(val)    ((uint16_t) ( \
-    (uint16_t) ((uint16_t) (val) >> 8) |  \
-    (uint16_t) ((uint16_t) (val) << 8)))
-
-#ifdef WORDS_BIGENDIAN
-#define GINT16_TO_LE(val)	((int16_t)GUINT16_SWAP_LE_BE(val))
-#define GUINT16_TO_LE(val)	(GUINT16_SWAP_LE_BE(val))
-#define GINT16_TO_BE(val)	(val)
-#define GUINT16_TO_BE(val)	(val)
-#else
-#define GINT16_TO_BE(val)	((int16_t)GUINT16_SWAP_LE_BE(val))
-#define GUINT16_TO_BE(val)	(GUINT16_SWAP_LE_BE(val))
-#define GINT16_TO_LE(val)	(val)
-#define GUINT16_TO_LE(val)	(val)
-#endif
-#define GINT16_FROM_LE		GINT16_TO_LE
-#define GUINT16_FROM_LE		GUINT16_TO_LE
-#define GINT16_FROM_BE		GINT16_TO_BE
-#define GUINT16_FROM_BE		GUINT16_TO_BE
-
-struct buffer {
-	void *buffer;
-	int size;
-};
-
-struct x_convert_buffers {
-	struct buffer format_buffer, stereo_buffer, freq_buffer;
-};
-
-struct x_convert_buffers* x_convert_buffers_new(void)
-{
-	struct x_convert_buffers *b = malloc(sizeof(struct x_convert_buffers));
-	if (b == NULL)
-		return NULL;
-	memset(b, 0, sizeof(*b));
-	return b;
-}
-	
-static void* convert_get_buffer(struct buffer *buffer, size_t size)
-{
-	if (size > 0 && size <= buffer->size)
-		return buffer->buffer;
-
-	buffer->size = size;
-	buffer->buffer = realloc(buffer->buffer, size);
-	return buffer->buffer;
-}
-
-void x_convert_buffers_free(struct x_convert_buffers* buf)
-{
-	convert_get_buffer(&buf->format_buffer, 0);
-	convert_get_buffer(&buf->stereo_buffer, 0);
-	convert_get_buffer(&buf->freq_buffer, 0);
-}
-
-void x_convert_buffers_destroy(struct x_convert_buffers* buf)
-{
-	if (!buf)
-		return;
-	x_convert_buffers_free(buf);
-	free(buf);
-}
-
-static int convert_swap_endian(struct x_convert_buffers* buf, void **data, int length)
-{
-	uint16_t *ptr = *data;
-	int i;
-	for (i = 0; i < length; i += 2, ptr++)
-		*ptr = GUINT16_SWAP_LE_BE(*ptr);
-
-	return i;
-}
-
-static int convert_swap_sign_and_endian_to_native(struct x_convert_buffers* buf, void **data, int length)
-{
-	uint16_t *ptr = *data;
-	int i;
-	for (i = 0; i < length; i += 2, ptr++)
-		*ptr = GUINT16_SWAP_LE_BE(*ptr) ^ 1 << 15;
-
-	return i;
-}
-
-static int convert_swap_sign_and_endian_to_alien(struct x_convert_buffers* buf, void **data, int length)
-{
-	uint16_t *ptr = *data;
-	int i;
-	for (i = 0; i < length; i += 2, ptr++)
-		*ptr = GUINT16_SWAP_LE_BE(*ptr ^ 1 << 15);
-
-	return i;
-}
-
-static int convert_swap_sign16(struct x_convert_buffers* buf, void **data, int length)
-{
-	int16_t *ptr = *data;
-	int i;
-	for (i = 0; i < length; i += 2, ptr++)
-		*ptr ^= 1 << 15;
-
-	return i;
-}
-
-static int convert_swap_sign8(struct x_convert_buffers* buf, void **data, int length)
-{
-	int8_t *ptr = *data;
-	int i;
-	for (i = 0; i < length; i++)
-		*ptr++ ^= 1 << 7;
-
-	return i;
-}
-
-static int convert_to_8_native_endian(struct x_convert_buffers* buf, void **data, int length)
-{
-	int8_t *output = *data;
-	int16_t *input = *data;
-	int i;
-	for (i = 0; i < length / 2; i++)
-		*output++ = *input++ >> 8;
-
-	return i;
-}
-
-static int convert_to_8_native_endian_swap_sign(struct x_convert_buffers* buf, void **data, int length)
-{
-	int8_t *output = *data;
-	int16_t *input = *data;
-	int i;
-	for (i = 0; i < length / 2; i++)
-		*output++ = (*input++ >> 8) ^ (1 << 7);
-
-	return i;
-}
-
-
-static int convert_to_8_alien_endian(struct x_convert_buffers* buf, void **data, int length)
-{
-	int8_t *output = *data;
-	int16_t *input = *data;
-	int i;
-	for (i = 0; i < length / 2; i++)
-		*output++ = *input++ & 0xff;
-
-	return i;
-}
-
-static int convert_to_8_alien_endian_swap_sign(struct x_convert_buffers* buf, void **data, int length)
-{
-	int8_t *output = *data;
-	int16_t *input = *data;
-	int i;
-	for (i = 0; i < length / 2; i++)
-		*output++ = (*input++ & 0xff) ^ (1 << 7);
-
-	return i;
-}
-
-static int convert_to_16_native_endian(struct x_convert_buffers* buf, void **data, int length)
-{
-	uint8_t *input = *data;
-	uint16_t *output;
-	int i;
-	*data = convert_get_buffer(&buf->format_buffer, length * 2);
-	output = *data;
-	for (i = 0; i < length; i++)
-		*output++ = *input++ << 8;
-
-	return i * 2;
-}
-
-static int convert_to_16_native_endian_swap_sign(struct x_convert_buffers* buf, void **data, int length)
-{
-	uint8_t *input = *data;
-	uint16_t *output;
-	int i;
-	*data = convert_get_buffer(&buf->format_buffer, length * 2);
-	output = *data;
-	for (i = 0; i < length; i++)
-		*output++ = (*input++ << 8) ^ (1 << 15);
-
-	return i * 2;
-}
-
-
-static int convert_to_16_alien_endian(struct x_convert_buffers* buf, void **data, int length)
-{
-	uint8_t *input = *data;
-	uint16_t *output;
-	int i;
-	*data = convert_get_buffer(&buf->format_buffer, length * 2);
-	output = *data;
-	for (i = 0; i < length; i++)
-		*output++ = *input++;
-
-	return i * 2;
-}
-
-static int convert_to_16_alien_endian_swap_sign(struct x_convert_buffers* buf, void **data, int length)
-{
-	uint8_t *input = *data;
-	uint16_t *output;
-	int i;
-	*data = convert_get_buffer(&buf->format_buffer, length * 2);
-	output = *data;
-	for (i = 0; i < length; i++)
-		*output++ = *input++ ^ (1 << 7);
-
-	return i * 2;
-}
-
-static int unnativize(int fmt)
-{
-	if (fmt == AFMT_S16_NE)
-	{
-		if (IS_BIG_ENDIAN)
-			return AFMT_S16_BE;
-		else
-			return AFMT_S16_LE;
-	}
-/*	if (fmt == AFMT_U16_NE)
-	{
-		if (IS_BIG_ENDIAN)
-			return AFMT_U16_BE;
-		else
-			return AFMT_U16_LE;
-	}*/
-	return fmt;
-}
-
-convert_func_t x_convert_get_func(int output, int input)
-{
-	output = unnativize(output);
-	input = unnativize(input);
-
-	if (output == input)
-		return NULL;
-
-	if ((output == AFMT_U16_BE && input == AFMT_U16_LE) ||
-	    (output == AFMT_U16_LE && input == AFMT_U16_BE) ||
-	    (output == AFMT_S16_BE && input == AFMT_S16_LE) ||
-	    (output == AFMT_S16_LE && input == AFMT_S16_BE))
-		return convert_swap_endian;
-
-	if ((output == AFMT_U16_BE && input == AFMT_S16_BE) ||
-	    (output == AFMT_U16_LE && input == AFMT_S16_LE) ||
-	    (output == AFMT_S16_BE && input == AFMT_U16_BE) ||
-	    (output == AFMT_S16_LE && input == AFMT_U16_LE))
-		return convert_swap_sign16;
-
-	if ((IS_BIG_ENDIAN &&
-	     ((output == AFMT_U16_BE && input == AFMT_S16_LE) ||
-	      (output == AFMT_S16_BE && input == AFMT_U16_LE))) ||
-	    (!IS_BIG_ENDIAN &&
-	     ((output == AFMT_U16_LE && input == AFMT_S16_BE) ||
-	      (output == AFMT_S16_LE && input == AFMT_U16_BE))))
-		return convert_swap_sign_and_endian_to_native;
-		
-	if ((!IS_BIG_ENDIAN &&
-	     ((output == AFMT_U16_BE && input == AFMT_S16_LE) ||
-	      (output == AFMT_S16_BE && input == AFMT_U16_LE))) ||
-	    (IS_BIG_ENDIAN &&
-	     ((output == AFMT_U16_LE && input == AFMT_S16_BE) ||
-	      (output == AFMT_S16_LE && input == AFMT_U16_BE))))
-		return convert_swap_sign_and_endian_to_alien;
-
-	if ((IS_BIG_ENDIAN &&
-	     ((output == AFMT_U8 && input == AFMT_U16_BE) ||
-	      (output == AFMT_S8 && input == AFMT_S16_BE))) ||
-	    (!IS_BIG_ENDIAN &&
-	     ((output == AFMT_U8 && input == AFMT_U16_LE) ||
-	      (output == AFMT_S8 && input == AFMT_S16_LE))))
-		return convert_to_8_native_endian;
-
-	if ((IS_BIG_ENDIAN &&
-	     ((output == AFMT_U8 && input == AFMT_S16_BE) ||
-	      (output == AFMT_S8 && input == AFMT_U16_BE))) ||
-	    (!IS_BIG_ENDIAN &&
-	     ((output == AFMT_U8 && input == AFMT_S16_LE) ||
-	      (output == AFMT_S8 && input == AFMT_U16_LE))))
-		return convert_to_8_native_endian_swap_sign;
-
-	if ((!IS_BIG_ENDIAN &&
-	     ((output == AFMT_U8 && input == AFMT_U16_BE) ||
-	      (output == AFMT_S8 && input == AFMT_S16_BE))) ||
-	    (IS_BIG_ENDIAN &&
-	     ((output == AFMT_U8 && input == AFMT_U16_LE) ||
-	      (output == AFMT_S8 && input == AFMT_S16_LE))))
-		return convert_to_8_alien_endian;
-
-	if ((!IS_BIG_ENDIAN &&
-	     ((output == AFMT_U8 && input == AFMT_S16_BE) ||
-	      (output == AFMT_S8 && input == AFMT_U16_BE))) ||
-	    (IS_BIG_ENDIAN &&
-	     ((output == AFMT_U8 && input == AFMT_S16_LE) ||
-	      (output == AFMT_S8 && input == AFMT_U16_LE))))
-		return convert_to_8_alien_endian_swap_sign;
-
-	if ((output == AFMT_U8 && input == AFMT_S8) ||
-	    (output == AFMT_S8 && input == AFMT_U8))
-		return convert_swap_sign8;
-
-	if ((IS_BIG_ENDIAN &&
-	     ((output == AFMT_U16_BE && input == AFMT_U8) ||
-	      (output == AFMT_S16_BE && input == AFMT_S8))) ||
-	    (!IS_BIG_ENDIAN &&
-	     ((output == AFMT_U16_LE && input == AFMT_U8) ||
-	      (output == AFMT_S16_LE && input == AFMT_S8))))
-		return convert_to_16_native_endian;
-
-	if ((IS_BIG_ENDIAN &&
-	     ((output == AFMT_U16_BE && input == AFMT_S8) ||
-	      (output == AFMT_S16_BE && input == AFMT_U8))) ||
-	    (!IS_BIG_ENDIAN &&
-	     ((output == AFMT_U16_LE && input == AFMT_S8) ||
-	      (output == AFMT_S16_LE && input == AFMT_U8))))
-		return convert_to_16_native_endian_swap_sign;
-
-	if ((!IS_BIG_ENDIAN &&
-	     ((output == AFMT_U16_BE && input == AFMT_U8) ||
-	      (output == AFMT_S16_BE && input == AFMT_S8))) ||
-	    (IS_BIG_ENDIAN &&
-	     ((output == AFMT_U16_LE && input == AFMT_U8) ||
-	      (output == AFMT_S16_LE && input == AFMT_S8))))
-		return convert_to_16_alien_endian;
-
-	if ((!IS_BIG_ENDIAN &&
-	     ((output == AFMT_U16_BE && input == AFMT_S8) ||
-	      (output == AFMT_S16_BE && input == AFMT_U8))) ||
-	    (IS_BIG_ENDIAN &&
-	     ((output == AFMT_U16_LE && input == AFMT_S8) ||
-	      (output == AFMT_S16_LE && input == AFMT_U8))))
-		return convert_to_16_alien_endian_swap_sign;
-	return NULL;
-}
-
-static int convert_mono_to_stereo(struct x_convert_buffers* buf, void **data, int length, int b16)
-{
-	int i;
-	void *outbuf = convert_get_buffer(&buf->stereo_buffer, length * 2);
-
-	if (b16)
-	{
-		uint16_t *output = outbuf, *input = *data;
-		for (i = 0; i < length / 2; i++)
-		{
-			*output++ = *input;
-			*output++ = *input;
-			input++;
-		}
-	}
-	else 
-	{
-		uint8_t *output = outbuf, *input = *data;
-		for (i = 0; i < length; i++)
-		{
-			*output++ = *input;
-			*output++ = *input;
-			input++;
-		}
-	}
-	*data = outbuf;
-
-	return length * 2;
-}
-
-static int convert_mono_to_stereo_8(struct x_convert_buffers* buf, void **data, int length)
-{
-	return convert_mono_to_stereo(buf, data, length, FALSE);
-}
-
-static int convert_mono_to_stereo_16(struct x_convert_buffers* buf, void **data, int length)
-{
-	return convert_mono_to_stereo(buf, data, length, TRUE);
-}
-
-static int convert_stereo_to_mono_u8(struct x_convert_buffers* buf, void **data, int length)
-{
-	uint8_t *output = *data, *input = *data;
-	int i;
-	for (i = 0; i < length / 2; i++)
-	{
-		uint16_t tmp;
-		tmp = *input++;
-		tmp += *input++;
-		*output++ = tmp / 2;
-	}
-	return length / 2;
-}
-static int convert_stereo_to_mono_s8(struct x_convert_buffers* buf, void **data, int length)
-{
-	int8_t *output = *data, *input = *data;
-	int i;
-	for (i = 0; i < length / 2; i++)
-	{
-		int16_t tmp;
-		tmp = *input++;
-		tmp += *input++;
-		*output++ = tmp / 2;
-	}
-	return length / 2;
-}
-static int convert_stereo_to_mono_u16le(struct x_convert_buffers* buf, void **data, int length)
-{
-	uint16_t *output = *data, *input = *data;
-	int i;
-	for (i = 0; i < length / 4; i++)
-	{
-		uint32_t tmp;
-		uint16_t stmp;
-		tmp = GUINT16_FROM_LE(*input);
-		input++;
-		tmp += GUINT16_FROM_LE(*input);
-		input++;
-		stmp = tmp / 2;
-		*output++ = GUINT16_TO_LE(stmp);
-	}
-	return length / 2;
-}
-
-static int convert_stereo_to_mono_u16be(struct x_convert_buffers* buf, void **data, int length)
-{
-	uint16_t *output = *data, *input = *data;
-	int i;
-	for (i = 0; i < length / 4; i++)
-	{
-		uint32_t tmp;
-		uint16_t stmp;
-		tmp = GUINT16_FROM_BE(*input);
-		input++;
-		tmp += GUINT16_FROM_BE(*input);
-		input++;
-		stmp = tmp / 2;
-		*output++ = GUINT16_TO_BE(stmp);
-	}
-	return length / 2;
-}
-
-static int convert_stereo_to_mono_s16le(struct x_convert_buffers* buf, void **data, int length)
-{
-	int16_t *output = *data, *input = *data;
-	int i;
-	for (i = 0; i < length / 4; i++)
-	{
-		int32_t tmp;
-		int16_t stmp;
-		tmp = GINT16_FROM_LE(*input);
-		input++;
-		tmp += GINT16_FROM_LE(*input);
-		input++;
-		stmp = tmp / 2;
-		*output++ = GINT16_TO_LE(stmp);
-	}
-	return length / 2;
-}
-
-static int convert_stereo_to_mono_s16be(struct x_convert_buffers* buf, void **data, int length)
-{
-	int16_t *output = *data, *input = *data;
-	int i;
-	for (i = 0; i < length / 4; i++)
-	{
-		int32_t tmp;
-		int16_t stmp;
-		tmp = GINT16_FROM_BE(*input);
-		input++;
-		tmp += GINT16_FROM_BE(*input);
-		input++;
-		stmp = tmp / 2;
-		*output++ = GINT16_TO_BE(stmp);
-	}
-	return length / 2;
-}
-
-convert_channel_func_t x_convert_get_channel_func(int fmt, int output, int input)
-{
-	fmt = unnativize(fmt);
-
-	if (output == input)
-		return NULL;
-
-	if (input == 1 && output == 2)
-		switch (fmt)
-		{
-			case AFMT_U8:
-			case AFMT_S8:
-				return convert_mono_to_stereo_8;
-			case AFMT_U16_LE:
-			case AFMT_U16_BE:
-			case AFMT_S16_LE:
-			case AFMT_S16_BE:
-				return convert_mono_to_stereo_16;
-			default:
-				logger_warning(player_log, 0, "Unknown format: %d"
-					  "No conversion available.", fmt);
-				return NULL;
-		}
-	if (input == 2 && output == 1)
-		switch (fmt)
-		{
-			case AFMT_U8:
-				return convert_stereo_to_mono_u8;
-			case AFMT_S8:
-				return convert_stereo_to_mono_s8;
-			case AFMT_U16_LE:
-				return convert_stereo_to_mono_u16le;
-			case AFMT_U16_BE:
-				return convert_stereo_to_mono_u16be;
-			case AFMT_S16_LE:
-				return convert_stereo_to_mono_s16le;
-			case AFMT_S16_BE:
-				return convert_stereo_to_mono_s16be;
-			default:
-				logger_warning(player_log, 0, "Unknown format: %d.  "
-					  "No conversion available.", fmt);
-				return NULL;
-				
-		}
-
-	logger_warning(player_log, 0, 
-			"Input has %d channels, soundcard uses %d channels\n"
-		  "No conversion is available", input, output);
-	return NULL;
-}
-
-
-#define RESAMPLE_STEREO(sample_type, bswap)			\
-do {								\
-	const int shift = sizeof (sample_type);			\
-        int i, in_samples, out_samples, x, delta;		\
-	sample_type *inptr = *data, *outptr;			\
-	unsigned int nlen = (((length >> shift) * ofreq) / ifreq);	\
-	void *nbuf;						\
-	if (nlen == 0)						\
-		break;						\
-	nlen <<= shift;						\
-	if (bswap)						\
-		convert_swap_endian(NULL, data, length);	\
-	nbuf = convert_get_buffer(&buf->freq_buffer, nlen);	\
-	outptr = nbuf;						\
-	in_samples = length >> shift;				\
-        out_samples = nlen >> shift;				\
-	delta = (in_samples << 12) / out_samples;		\
-	for (x = 0, i = 0; i < out_samples; i++)		\
-	{							\
-		int x1, frac;					\
-		x1 = (x >> 12) << 12;				\
-		frac = x - x1;					\
-		*outptr++ =					\
-			((inptr(x1 >> 12) << 1 *		\
-			  ((1<<12) - frac) +			\
-			  inptr((x1 >> 12) + 1) << 1 *	\
-			  frac) >> 12);				\
-		*outptr++ =					\
-			((inptr((x1 >> 12) << 1) + 1 *	\
-			  ((1<<12) - frac) +			\
-			  inptr(((x1 >> 12) + 1) << 1) + 1 *	\
-			  frac) >> 12);				\
-		x += delta;					\
-	}							\
-	if (bswap)						\
-		convert_swap_endian(NULL, &nbuf, nlen);		\
-	*data = nbuf;						\
-	return nlen;						\
-} while (0)
-
-
-#define RESAMPLE_MONO(sample_type, bswap)			\
-do {								\
-	const int shift = sizeof (sample_type) - 1;		\
-        int i, x, delta, in_samples, out_samples;		\
-	sample_type *inptr = *data, *outptr;			\
-	unsigned int nlen = (((length >> shift) * ofreq) / ifreq);	\
-	void *nbuf;						\
-	if (nlen == 0)						\
-		break;						\
-	nlen <<= shift;						\
-	if (bswap)						\
-		convert_swap_endian(NULL, data, length);	\
-	nbuf = convert_get_buffer(&buf->freq_buffer, nlen);	\
-	outptr = nbuf;						\
-	in_samples = length >> shift;				\
-        out_samples = nlen >> shift;				\
-	delta = ((length >> shift) << 12) / out_samples;	\
-	for (x = 0, i = 0; i < out_samples; i++)		\
-	{							\
-		int x1, frac;					\
-		x1 = (x >> 12) << 12;				\
-		frac = x - x1;					\
-		*outptr++ =					\
-			((inptrx1 >> 12 * ((1<<12) - frac) +	\
-			  inptr(x1 >> 12) + 1 * frac) >> 12);	\
-		x += delta;					\
-	}							\
-	if (bswap)						\
-		convert_swap_endian(NULL, &nbuf, nlen);		\
-	*data = nbuf;						\
-	return nlen;						\
-} while (0)
-
-static int convert_resample_stereo_s16ne(struct x_convert_buffers* buf, void **data, int length, int ifreq, int ofreq)
-{
-	RESAMPLE_STEREO(int16_t, FALSE);
-	return 0;
-}
-
-static int convert_resample_stereo_s16ae(struct x_convert_buffers* buf, void **data, int length, int ifreq, int ofreq)
-{
-	RESAMPLE_STEREO(int16_t, TRUE);
-	return 0;
-}
-
-static int convert_resample_stereo_u16ne(struct x_convert_buffers* buf, void **data, int length, int ifreq, int ofreq)
-{
-	RESAMPLE_STEREO(uint16_t, FALSE);
-	return 0;
-}
-
-static int convert_resample_stereo_u16ae(struct x_convert_buffers* buf, void **data, int length, int ifreq, int ofreq)
-{
-	RESAMPLE_STEREO(uint16_t, TRUE);
-	return 0;
-}
-
-static int convert_resample_mono_s16ne(struct x_convert_buffers* buf, void **data, int length, int ifreq, int ofreq)
-{
-	RESAMPLE_MONO(int16_t, FALSE);
-	return 0;
-}
-
-static int convert_resample_mono_s16ae(struct x_convert_buffers* buf, void **data, int length, int ifreq, int ofreq)
-{
-	RESAMPLE_MONO(int16_t, TRUE);
-	return 0;
-}
-
-static int convert_resample_mono_u16ne(struct x_convert_buffers* buf, void **data, int length, int ifreq, int ofreq)
-{
-	RESAMPLE_MONO(uint16_t, FALSE);
-	return 0;
-}
-
-static int convert_resample_mono_u16ae(struct x_convert_buffers* buf, void **data, int length, int ifreq, int ofreq)
-{
-	RESAMPLE_MONO(uint16_t, TRUE);
-	return 0;
-}
-
-static int convert_resample_stereo_u8(struct x_convert_buffers* buf, void **data, int length, int ifreq, int ofreq)
-{
-	RESAMPLE_STEREO(uint8_t, FALSE);
-	return 0;
-}
-
-static int convert_resample_mono_u8(struct x_convert_buffers* buf, void **data, int length, int ifreq, int ofreq)
-{
-	RESAMPLE_MONO(uint8_t, FALSE);
-	return 0;
-}
-
-static int convert_resample_stereo_s8(struct x_convert_buffers* buf, void **data, int length, int ifreq, int ofreq)
-{
-	RESAMPLE_STEREO(int8_t, FALSE);
-	return 0;
-}
-
-static int convert_resample_mono_s8(struct x_convert_buffers* buf, void **data, int length, int ifreq, int ofreq)
-{
-	RESAMPLE_MONO(int8_t, FALSE);
-	return 0;
-}
-
-
-convert_freq_func_t x_convert_get_frequency_func(int fmt, int channels)
-{
-	fmt = unnativize(fmt);
-	logger_debug(player_log, "fmt %d, channels: %d", fmt, channels);
-
-	if (channels < 1 || channels > 2)
-	{
-		logger_warning(player_log, 0, "Unsupported number of channels: %d.  "
-			  "Resample function not available", channels);
-		return NULL;
-	}
-	if ((IS_BIG_ENDIAN && fmt == AFMT_U16_BE) ||
-	    (!IS_BIG_ENDIAN && fmt == AFMT_U16_LE))
-	{
-		if (channels == 1)
-			return convert_resample_mono_u16ne;
-		else
-			return convert_resample_stereo_u16ne;
-	}
-	if ((IS_BIG_ENDIAN && fmt == AFMT_S16_BE) ||
-	    (!IS_BIG_ENDIAN && fmt == AFMT_S16_LE))
-	{
-		if (channels == 1)
-			return convert_resample_mono_s16ne;
-		else
-			return convert_resample_stereo_s16ne;
-	}
-	if ((!IS_BIG_ENDIAN && fmt == AFMT_U16_BE) ||
-	    (IS_BIG_ENDIAN && fmt == AFMT_U16_LE))
-	{
-		if (channels == 1)
-			return convert_resample_mono_u16ae;
-		else
-			return convert_resample_stereo_u16ae;
-	}
-	if ((!IS_BIG_ENDIAN && fmt == AFMT_S16_BE) ||
-	    (IS_BIG_ENDIAN && fmt == AFMT_S16_LE))
-	{
-		if (channels == 1)
-			return convert_resample_mono_s16ae;
-		else
-			return convert_resample_stereo_s16ae;
-	}
-	if (fmt == AFMT_U8)
-	{
-		if (channels == 1)
-			return convert_resample_mono_u8;
-		else
-			return convert_resample_stereo_u8;
-	}
-	if (fmt == AFMT_S8)
-	{
-		if (channels == 1)
-			return convert_resample_mono_s8;
-		else
-			return convert_resample_stereo_s8;
-	}
-	logger_warning(player_log, 0, "Resample function not available"
-		  "Format %d.", fmt);
-	return NULL;
-}
-
-/* End of 'xconvert.c' file */
-

mpfc-1.3.8.1.tar.bz2/src/xconvert.h Deleted

@@ -1,49 +0,0 @@
-/******************************************************************
- * Copyright (C) 2006 by SG Software.
- *
- * SG MPFC. Audio stream conversion functions.
- * Taken from XMMS.
- * $Id$
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation; either version 2 
- * of the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public 
- * License along with this program; if not, write to the Free 
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
- */
-
-#include <sys/soundcard.h>
-
-void convert_free_buffer(void);
-
-struct x_convert_buffers;
-
-struct x_convert_buffers* x_convert_buffers_new(void);
-/*
- * Free the data assosiated with the buffers, without destroying the
- * context.  The context can be reused.
- */
-void x_convert_buffers_free(struct x_convert_buffers* buf);
-void x_convert_buffers_destroy(struct x_convert_buffers* buf);
-
-
-typedef int (*convert_func_t)(struct x_convert_buffers* buf, void **data, int length);
-typedef int (*convert_channel_func_t)(struct x_convert_buffers* buf, void **data, int length);
-typedef int (*convert_freq_func_t)(struct x_convert_buffers* buf, void **data, int length, int ifreq, int ofreq);
-
-
-convert_func_t x_convert_get_func(int output, int input);
-convert_channel_func_t x_convert_get_channel_func(int fmt, int output, int input);
-convert_freq_func_t x_convert_get_frequency_func(int fmt, int channels);
-
-/* End of 'xconvert.h' file */
-

mpfc-1.3.8.1.tar.bz2/AUTHORS -> mpfc-2.0.tar.bz2/AUTHORS Changed

mpfc-1.3.8.1.tar.bz2/COPYING -> mpfc-2.0.tar.bz2/COPYING Changed

@@ -1,622 +1,281 @@
                     GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                       Version 2, June 1991
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
 this License.
 
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
 
                      END OF TERMS AND CONDITIONS
 
@@ -628,15 +287,15 @@
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
+convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software: you can redistribute it and/or modify
+    This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -644,31 +303,37 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

mpfc-1.3.8.1.tar.bz2/INSTALL -> mpfc-2.0.tar.bz2/INSTALL Changed

@@ -1,365 +1,15 @@
-Installation Instructions
-*************************
+MPFC depends on several libraries. To build MPFC you will need to install development packages for:
+  * ncursesw
+  * gpm
+  * gstreamer and gstreamer-plugins-base (version 1.x)
+  * taglib_c (C bindings for TagLib)
+  * json-glib
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+After you have installed them just issue:
+  $ ./configure --prefix=<where-to-install> && make
 
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-   The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package, generally using the just-built uninstalled binaries.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.  When installing into a prefix owned by root, it is
-     recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
-     privileges.
-
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
-     this time using the binaries in their final installed location.
-     This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
-     root privileges, verifies that the installation completed
-     correctly.
-
-  6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  7. Often, you can also type `make uninstall' to remove the installed
-     files again.  In practice, not all packages have tested that
-     uninstallation works correctly, even though it is required by the
-     GNU Coding Standards.
-
-  8. Some packages, particularly those that use Automake, provide `make
-     distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
-     This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
-   The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
-   The first method involves providing an override variable for each
-affected directory.  For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters.  On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-   Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
+Then (as root):
+  # make install
+  # ldconfig 
 
+The last command is required on some systems to update the shared libraries cache.

mpfc-1.3.8.1.tar.bz2/Makefile.am -> mpfc-2.0.tar.bz2/Makefile.am Changed

mpfc-1.3.8.1.tar.bz2/Makefile.in -> mpfc-2.0.tar.bz2/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,14 +79,32 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/mpfc-config.h.in \
-	$(srcdir)/mpfc.pc.in $(top_srcdir)/configure \
-	$(top_srcdir)/intl/Makefile.in ABOUT-NLS AUTHORS COPYING \
-	ChangeLog INSTALL NEWS config.guess config.rpath config.sub \
-	depcomp install-sh ltmain.sh missing
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/mpfc-config.h.in $(top_srcdir)/intl/Makefile.in \
+	$(srcdir)/mpfc.pc.in ABOUT-NLS AUTHORS COPYING INSTALL README \
+	compile config.guess config.rpath config.sub depcomp \
+	install-sh missing ylwrap ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -51,15 +113,33 @@
 CONFIG_HEADER = mpfc-config.h
 CONFIG_CLEAN_FILES = intl/Makefile mpfc.pc
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -81,24 +161,54 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \
-	"$(DESTDIR)$(sysconfdir)"
-DATA = $(pkgconfig_DATA) $(sysconf_DATA)
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+DATA = $(pkgconfig_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)mpfc-config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^$^/*$/.*$$,\1,'; \
@@ -126,13 +236,16 @@
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -143,10 +256,10 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
 COMMON_LIBS = @COMMON_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURSES_CFLAGS = @CURSES_CFLAGS@
 CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
@@ -159,28 +272,26 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC2 = @GLIBC2@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GPM_LIBS = @GPM_LIBS@
 GREP = @GREP@
+GSTREAMER_AUDIO_CFLAGS = @GSTREAMER_AUDIO_CFLAGS@
+GSTREAMER_AUDIO_LIBS = @GSTREAMER_AUDIO_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -190,30 +301,31 @@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSON_CFLAGS = @JSON_CFLAGS@
+JSON_LIBS = @JSON_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
 LIBOBJS = @LIBOBJS@
 LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTLIBC = @LTLIBC@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIBS = @MATH_LIBS@
@@ -225,10 +337,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -237,6 +347,10 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLIST_PLUGINS = @PLIST_PLUGINS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -246,15 +360,16 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
+TAGLIB_LIBS = @TAGLIB_LIBS@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
 WOE32DLL = @WOE32DLL@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -307,31 +422,30 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = doc intl po libmpfc libmpfcwnd src plugins 
+SUBDIRS = doc intl po libmpfc libmpfcwnd libcue src plugins 
 ACLOCAL_AMFLAGS = -I m4
-sysconf_DATA = mpfcrc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = mpfc.pc
-EXTRA_DIST = mpfc.pc.in config.rpath install-sh m4 build_rcfile.pl
+EXTRA_DIST = mpfc.pc.in config.rpath install-sh m4 
 all: mpfc-config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu Makefile
+	  $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -353,10 +467,8 @@
 $(am__aclocal_m4_deps):
 
 mpfc-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/mpfc-config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -383,8 +495,11 @@
 	-rm -f libtool config.lt
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -398,47 +513,28 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
-install-sysconfDATA: $(sysconf_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
-	done
-
-uninstall-sysconfDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(sysconfdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(sysconfdir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -453,57 +549,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --!k*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) mpfc-config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -519,12 +570,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) mpfc-config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -536,15 +582,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) mpfc-config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) mpfc-config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -553,9 +595,31 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -591,13 +655,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -626,36 +687,42 @@
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -666,8 +733,8 @@
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -677,18 +744,20 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^^:\\/:\\/,/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
 	    --with-included-gettext \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -711,13 +780,21 @@
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -738,7 +815,7 @@
 all-am: Makefile $(DATA) mpfc-config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(sysconfdir)"; do \
+	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -751,10 +828,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -794,7 +876,7 @@
 
 install-dvi-am:
 
-install-exec-am: install-sysconfDATA
+install-exec-am:
 
 install-html: install-html-recursive
 
@@ -834,28 +916,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-pkgconfigDATA uninstall-sysconfDATA
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
-	install-ps-am install-strip install-sysconfDATA installcheck \
+uninstall-am: uninstall-pkgconfigDATA
+
+.MAKE: $(am__recursive_targets) all install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-pkgconfigDATA \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-pkgconfigDATA \
-	uninstall-sysconfDATA
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-pkgconfigDATA
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

mpfc-1.3.8.1.tar.bz2/aclocal.m4 -> mpfc-2.0.tar.bz2/aclocal.m4 Changed

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  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.
@@ -11,12281 +11,16 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef(AC_CONFIG_MACRO_DIRS, m4_defun(_AM_CONFIG_MACRO_DIRS, )m4_defun(AC_CONFIG_MACRO_DIRS, _AM_CONFIG_MACRO_DIRS($@)))
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.68,,
-m4_warning(this file was generated for autoconf 2.68.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.69,,
+m4_warning(this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.))
-
-# codeset.m4 serial 4 (gettext-0.18)
-dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN(AM_LANGINFO_CODESET,
-
-  AC_CACHE_CHECK(for nl_langinfo and CODESET, am_cv_langinfo_codeset,
-    AC_TRY_LINK(#include <langinfo.h>,
-      char* cs = nl_langinfo(CODESET); return !cs;,
-      am_cv_langinfo_codeset=yes,
-      am_cv_langinfo_codeset=no)
-    )
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      Define if you have <langinfo.h> and nl_langinfo(CODESET).)
-  fi
-)
-
-# fcntl-o.m4 serial 1
-dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Written by Paul Eggert.
-
-# Test whether the flags O_NOATIME and O_NOFOLLOW actually work.
-# Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise.
-# Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise.
-AC_DEFUN(gl_FCNTL_O_FLAGS,
-
-  dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
-  AC_REQUIRE(AC_USE_SYSTEM_EXTENSIONS)
-  AC_CACHE_CHECK(for working fcntl.h, gl_cv_header_working_fcntl_h,
-    AC_RUN_IFELSE(
-       AC_LANG_PROGRAM(
-          #include <sys/types.h>
-           #include <sys/stat.h>
-           #include <unistd.h>
-           #include <fcntl.h>
-           #ifndef O_NOATIME
-            #define O_NOATIME 0
-           #endif
-           #ifndef O_NOFOLLOW
-            #define O_NOFOLLOW 0
-           #endif
-           static int const constants =
-            {
-              O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
-              O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
-            };
-          ,
-          
-            int status = !constants;
-            {
-              static char const sym = "conftest.sym";
-              if (symlink (".", sym) != 0
-                  || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0)
-                status |= 32;
-              unlink (sym);
-            }
-            {
-              static char const file = "confdefs.h";
-              int fd = open (file, O_RDONLY | O_NOATIME);
-              char c;
-              struct stat st0, st1;
-              if (fd < 0
-                  || fstat (fd, &st0) != 0
-                  || sleep (1) != 0
-                  || read (fd, &c, 1) != 1
-                  || close (fd) != 0
-                  || stat (file, &st1) != 0
-                  || st0.st_atime != st1.st_atime)
-                status |= 64;
-            }
-            return status;),
-       gl_cv_header_working_fcntl_h=yes,
-       case $? in #(
-        32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
-        64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
-        96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
-         *) gl_cv_header_working_fcntl_h='no';;
-        esac,
-       gl_cv_header_working_fcntl_h=cross-compiling))
-
-  case $gl_cv_header_working_fcntl_h in #(
-  *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
-  *) ac_val=1;;
-  esac
-  AC_DEFINE_UNQUOTED(HAVE_WORKING_O_NOATIME, $ac_val,
-    Define to 1 if O_NOATIME works.)
-
-  case $gl_cv_header_working_fcntl_h in #(
-  *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
-  *) ac_val=1;;
-  esac
-  AC_DEFINE_UNQUOTED(HAVE_WORKING_O_NOFOLLOW, $ac_val,
-    Define to 1 if O_NOFOLLOW works.)
-)
-
-# gettext.m4 serial 63 (gettext-0.18)
-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT(INTLSYMBOL, NEEDSYMBOL, INTLDIR).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl    default (if it is not specified or empty) is 'no-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl    $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.  If NEEDSYMBOL is specified and is
-dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN(AM_GNU_GETTEXT,
-
-  dnl Argument checking.
-  ifelse($1, , , ifelse($1, external, , ifelse($1, no-libtool, , ifelse($1, use-libtool, ,
-    errprint(ERROR: invalid first argument to AM_GNU_GETTEXT
-)))))
-  ifelse(ifelse($1, , old)ifelse($1, no-libtool, old), old,
-    AC_DIAGNOSE(obsolete, Use of AM_GNU_GETTEXT without external argument is deprecated.))
-  ifelse($2, , , ifelse($2, need-ngettext, , ifelse($2, need-formatstring-macros, ,
-    errprint(ERROR: invalid second argument to AM_GNU_GETTEXT
-))))
-  define(gt_included_intl,
-    ifelse($1, external,
-      ifdef(AM_GNU_GETTEXT_INTL_SUBDIR, yes, no),
-      yes))
-  define(gt_libtool_suffix_prefix, ifelse($1, use-libtool, l, ))
-  gt_NEEDS_INIT
-  AM_GNU_GETTEXT_NEED($2)
-
-  AC_REQUIRE(AM_PO_SUBDIRS)dnl
-  ifelse(gt_included_intl, yes, 
-    AC_REQUIRE(AM_INTL_SUBDIR)dnl
-  )
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE(AC_LIB_PREPARE_PREFIX)
-  AC_REQUIRE(AC_LIB_RPATH)
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-  dnl documented, we avoid it.
-  ifelse(gt_included_intl, yes, , 
-    AC_REQUIRE(AM_ICONV_LINKFLAGS_BODY)
-  )
-
-  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
-  gt_INTL_MACOSX
-
-  dnl Set USE_NLS.
-  AC_REQUIRE(AM_NLS)
-
-  ifelse(gt_included_intl, yes, 
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  )
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl Add a version number to the cache macros.
-  case " $gt_needs " in
-    *" need-formatstring-macros "*) gt_api_version=3 ;;
-    *" need-ngettext "*) gt_api_version=2 ;;
-    *) gt_api_version=1 ;;
-  esac
-  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, 
-      AC_MSG_CHECKING(whether included gettext is requested)
-      AC_ARG_WITH(included-gettext,
-          --with-included-gettext use the GNU gettext library included here,
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    )
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        if test $gt_api_version -ge 3; then
-          gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array 2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1;
-changequote(,)dnl
-'
-        else
-          gt_revision_test_code=
-        fi
-        if test $gt_api_version -ge 2; then
-          gt_expression_test_code=' + * ngettext ("", "", 0)'
-        else
-          gt_expression_test_code=
-        fi
-
-        AC_CACHE_CHECK(for GNU gettext in libc, $gt_func_gnugettext_libc,
-         AC_TRY_LINK(#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;,
-            bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings,
-            eval "$gt_func_gnugettext_libc=yes",
-            eval "$gt_func_gnugettext_libc=no"))
-
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , 
-            AM_ICONV_LINK
-          )
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY(intl,iconv)
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY(intl)
-          AC_CACHE_CHECK(for GNU gettext in libintl,
-            $gt_func_gnugettext_libintl,
-           gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK(#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);,
-              bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias (""),
-              eval "$gt_func_gnugettext_libintl=yes",
-              eval "$gt_func_gnugettext_libintl=no")
-            dnl Now see whether libintl exists and depends on libiconv.
-            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_TRY_LINK(#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);,
-                bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias (""),
-               LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                eval "$gt_func_gnugettext_libintl=yes"
-               )
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS")
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, 
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse($3,,\${top_builddir}/intl,$3)/libintl.gt_libtool_suffix_prefixa $LIBICONV $LIBTHREAD"
-        LTLIBINTL="ifelse($3,,\${top_builddir}/intl,$3)/libintl.gt_libtool_suffix_prefixa $LTLIBICONV $LTLIBTHREAD"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      CATOBJEXT=
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    )
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Some extra flags are needed during linking.
-        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        Define to 1 if translation of program messages to the user's native language
-   is requested.)
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  AC_MSG_CHECKING(whether to use NLS)
-  AC_MSG_RESULT($USE_NLS)
-  if test "$USE_NLS" = "yes"; then
-    AC_MSG_CHECKING(where the gettext function comes from)
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    AC_MSG_RESULT($gt_source)
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        AC_MSG_CHECKING(how to link with libintl)
-        AC_MSG_RESULT($LIBINTL)
-        AC_LIB_APPENDTOVAR(CPPFLAGS, $INCINTL)
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE(HAVE_GETTEXT, 1,
-       Define if the GNU gettext() function is already present or preinstalled.)
-      AC_DEFINE(HAVE_DCGETTEXT, 1,
-       Define if the GNU dcgettext() function is already present or preinstalled.)
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, 
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATOBJEXT)
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST(GENCAT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INTLOBJS=
-    if test "$USE_INCLUDED_LIBINTL" = yes; then
-      INTLOBJS="\$(GETTOBJS)"
-    fi
-    AC_SUBST(INTLOBJS)
-
-    dnl Enable libtool support if the surrounding package wishes it.
-    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-  )
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST(INTLLIBS)
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST(LIBINTL)
-  AC_SUBST(LTLIBINTL)
-  AC_SUBST(POSUB)
-)
-
-
-dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-m4_define(gt_NEEDS_INIT,
-
-  m4_divert_text(DEFAULTS, gt_needs=)
-  m4_define(gt_NEEDS_INIT, )
-)
-
-
-dnl Usage: AM_GNU_GETTEXT_NEED(NEEDSYMBOL)
-AC_DEFUN(AM_GNU_GETTEXT_NEED,
-
-  m4_divert_text(INIT_PREPARE, gt_needs="$gt_needs $1")
-)
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION(gettext-version)
-AC_DEFUN(AM_GNU_GETTEXT_VERSION, )
-
-# glibc2.m4 serial 2
-dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-# Test for the GNU C Library, version 2.0 or newer.
-# From Bruno Haible.
-
-AC_DEFUN(gt_GLIBC2,
-  
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer,
-      ac_cv_gnu_library_2,
-      AC_EGREP_CPP(Lucky GNU user,
-        
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2)
-  Lucky GNU user
- #endif
-#endif
-        ,
-        ac_cv_gnu_library_2=yes,
-        ac_cv_gnu_library_2=no)
-      
-    )
-    AC_SUBST(GLIBC2)
-    GLIBC2="$ac_cv_gnu_library_2"
-  
-)
-
-# glibc21.m4 serial 4
-dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-# Test for the GNU C Library, version 2.1 or newer.
-# From Bruno Haible.
-
-AC_DEFUN(gl_GLIBC21,
-  
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-      ac_cv_gnu_library_2_1,
-      AC_EGREP_CPP(Lucky GNU user,
-        
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-        ,
-        ac_cv_gnu_library_2_1=yes,
-        ac_cv_gnu_library_2_1=no)
-      
-    )
-    AC_SUBST(GLIBC21)
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  
-)
-
-# iconv.m4 serial 11 (gettext-0.18.1)
-dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN(AM_ICONV_LINKFLAGS_BODY,
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE(AC_LIB_PREPARE_PREFIX)
-  AC_REQUIRE(AC_LIB_RPATH)
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY(iconv)
-)
-
-AC_DEFUN(AM_ICONV_LINK,
-
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-  AC_REQUIRE(AC_CANONICAL_HOST) dnl for cross-compiles
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE(AM_ICONV_LINKFLAGS_BODY)
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR(CPPFLAGS, $INCICONV)
-
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, 
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_TRY_LINK(#include <stdlib.h>
-#include <iconv.h>,
-      iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);,
-      am_cv_func_iconv=yes)
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_TRY_LINK(#include <stdlib.h>
-#include <iconv.h>,
-        iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);,
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
-      LIBS="$am_save_LIBS"
-    fi
-  )
-  if test "$am_cv_func_iconv" = yes; then
-    AC_CACHE_CHECK(for working iconv, am_cv_func_iconv_works, 
-      dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
-      am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      AC_TRY_RUN(
-#include <iconv.h>
-#include <string.h>
-int main ()
-{
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static const char input = "\342\202\254"; /* EURO SIGN */
-        char buf10;
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          return 1;
-      }
-  }
-  /* Test against Solaris 10 bug: Failures are not distinguishable from
-     successful returns.  */
-  {
-    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-    if (cd_ascii_to_88591 != (iconv_t)(-1))
-      {
-        static const char input = "\263";
-        char buf10;
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_ascii_to_88591,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          return 1;
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static const char input = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf50;
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          return 1;
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
-}, am_cv_func_iconv_works=yes, am_cv_func_iconv_works=no,
-        case "$host_os" in
-           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-           *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac)
-      LIBS="$am_save_LIBS"
-    )
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
-  fi
-  if test "$am_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1,
-      Define if you have the iconv() function and it works.)
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING(how to link with libiconv)
-    AC_MSG_RESULT($LIBICONV)
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST(LIBICONV)
-  AC_SUBST(LTLIBICONV)
-)
-
-dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
-dnl avoid warnings like
-dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
-dnl This is tricky because of the way 'aclocal' is implemented:
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
-dnl   warnings.
-m4_define(gl_iconv_AC_DEFUN,
-  m4_version_prereq(2.64,
-    AC_DEFUN_ONCE(
-        $1, $2),
-    AC_DEFUN(
-        $1, $2)))
-gl_iconv_AC_DEFUN(AM_ICONV,
-
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING(for iconv declaration)
-    AC_CACHE_VAL(am_cv_proto_iconv, 
-      AC_TRY_COMPILE(
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-, , am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);")
-    am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT(
-         $am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-      Define as const if the declaration of iconv() needs const.)
-  fi
-)
-
-# intdiv0.m4 serial 3 (gettext-0.18)
-dnl Copyright (C) 2002, 2007-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN(gt_INTDIV0,
-
-  AC_REQUIRE(AC_PROG_CC)dnl
-  AC_REQUIRE(AC_CANONICAL_HOST)dnl
-
-  AC_CACHE_CHECK(whether integer division by zero raises SIGFPE,
-    gt_cv_int_divbyzero_sigfpe,
-    
-      gt_cv_int_divbyzero_sigfpe=
-changequote(,)dnl
-      case "$host_os" in
-        macos* | darwin6-9* | darwin1-90-9*)
-          # On MacOS X 10.2 or newer, just assume the same as when cross-
-          # compiling. If we were to perform the real test, 1 Crash Report
-          # dialog window would pop up.
-          case "$host_cpu" in
-            i3456786 | x86_64)
-              gt_cv_int_divbyzero_sigfpe="guessing yes" ;;
-          esac
-          ;;
-      esac
-changequote(,)dnl
-      if test -z "$gt_cv_int_divbyzero_sigfpe"; then
-        AC_TRY_RUN(
-#include <stdlib.h>
-#include <signal.h>
-
-static void
-sigfpe_handler (int sig)
-{
-  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  exit (sig != SIGFPE);
-}
-
-int x = 1;
-int y = 0;
-int z;
-int nan;
-
-int main ()
-{
-  signal (SIGFPE, sigfpe_handler);
-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-  signal (SIGTRAP, sigfpe_handler);
-#endif
-/* Linux/SPARC yields signal SIGILL.  */
-#if defined (__sparc__) && defined (__linux__)
-  signal (SIGILL, sigfpe_handler);
-#endif
-
-  z = x / y;
-  nan = y / y;
-  exit (1);
-}
-, gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
-          
-            # Guess based on the CPU.
-changequote(,)dnl
-            case "$host_cpu" in
-              alpha* | i3456786 | x86_64 | m68k | s390*)
-                gt_cv_int_divbyzero_sigfpe="guessing yes";;
-              *)
-                gt_cv_int_divbyzero_sigfpe="guessing no";;
-            esac
-changequote(,)dnl
-          )
-      fi
-    )
-  case "$gt_cv_int_divbyzero_sigfpe" in
-    *yes) value=1;;
-    *) value=0;;
-  esac
-  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
-    Define if integer division by zero raises signal SIGFPE.)
-)
-
-# intl.m4 serial 17 (gettext-0.18)
-dnl Copyright (C) 1995-2009 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2009.
-
-AC_PREREQ(2.52)
-
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN(AM_INTL_SUBDIR,
-
-  AC_REQUIRE(AC_PROG_INSTALL)dnl
-  AC_REQUIRE(AM_PROG_MKDIR_P)dnl defined by automake
-  AC_REQUIRE(AC_PROG_CC)dnl
-  AC_REQUIRE(AC_CANONICAL_HOST)dnl
-  AC_REQUIRE(gt_GLIBC2)dnl
-  AC_REQUIRE(AC_PROG_RANLIB)dnl
-  AC_REQUIRE(gl_VISIBILITY)dnl
-  AC_REQUIRE(gt_INTL_SUBDIR_CORE)dnl
-  AC_REQUIRE(AC_TYPE_LONG_LONG_INT)dnl
-  AC_REQUIRE(gt_TYPE_WCHAR_T)dnl
-  AC_REQUIRE(gt_TYPE_WINT_T)dnl
-  AC_REQUIRE(gl_AC_HEADER_INTTYPES_H)
-  AC_REQUIRE(gt_TYPE_INTMAX_T)
-  AC_REQUIRE(gt_PRINTF_POSIX)
-  AC_REQUIRE(gl_GLIBC21)dnl
-  AC_REQUIRE(gl_XSIZE)dnl
-  AC_REQUIRE(gl_FCNTL_O_FLAGS)dnl
-  AC_REQUIRE(gt_INTL_MACOSX)dnl
-
-  dnl Support for automake's --enable-silent-rules.
-  case "$enable_silent_rules" in
-    yes) INTL_DEFAULT_VERBOSITY=0;;
-    no)  INTL_DEFAULT_VERBOSITY=1;;
-    *)   INTL_DEFAULT_VERBOSITY=1;;
-  esac
-  AC_SUBST(INTL_DEFAULT_VERBOSITY)
-
-  AC_CHECK_TYPE(ptrdiff_t, ,
-    AC_DEFINE(ptrdiff_t, long,
-       Define as the type of the result of subtracting two pointers, if the system doesn't define it.)
-    )
-  AC_CHECK_HEADERS(stddef.h stdlib.h string.h)
-  AC_CHECK_FUNCS(asprintf fwprintf newlocale putenv setenv setlocale \
-    snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb)
-
-  dnl Use the _snprintf function only if it is declared (because on NetBSD it
-  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
-  gt_CHECK_DECL(_snprintf, #include <stdio.h>)
-  gt_CHECK_DECL(_snwprintf, #include <stdio.h>)
-
-  dnl Use the *_unlocked functions only if they are declared.
-  dnl (because some of them were defined without being declared in Solaris
-  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-  dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
-  gt_CHECK_DECL(getc_unlocked, #include <stdio.h>)
-
-  case $gt_cv_func_printf_posix in
-    *yes) HAVE_POSIX_PRINTF=1 ;;
-    *) HAVE_POSIX_PRINTF=0 ;;
-  esac
-  AC_SUBST(HAVE_POSIX_PRINTF)
-  if test "$ac_cv_func_asprintf" = yes; then
-    HAVE_ASPRINTF=1
-  else
-    HAVE_ASPRINTF=0
-  fi
-  AC_SUBST(HAVE_ASPRINTF)
-  if test "$ac_cv_func_snprintf" = yes; then
-    HAVE_SNPRINTF=1
-  else
-    HAVE_SNPRINTF=0
-  fi
-  AC_SUBST(HAVE_SNPRINTF)
-  if test "$ac_cv_func_newlocale" = yes; then
-    HAVE_NEWLOCALE=1
-  else
-    HAVE_NEWLOCALE=0
-  fi
-  AC_SUBST(HAVE_NEWLOCALE)
-  if test "$ac_cv_func_wprintf" = yes; then
-    HAVE_WPRINTF=1
-  else
-    HAVE_WPRINTF=0
-  fi
-  AC_SUBST(HAVE_WPRINTF)
-
-  AM_LANGINFO_CODESET
-  gt_LC_MESSAGES
-
-  dnl Compilation on mingw and Cygwin needs special Makefile rules, because
-  dnl 1. when we install a shared library, we must arrange to export
-  dnl    auxiliary pointer variables for every exported variable,
-  dnl 2. when we install a shared library and a static library simultaneously,
-  dnl    the include file specifies __declspec(dllimport) and therefore we
-  dnl    must arrange to define the auxiliary pointer variables for the
-  dnl    exported variables _also_ in the static library.
-  if test "$enable_shared" = yes; then
-    case "$host_os" in
-      mingw* | cygwin*) is_woe32dll=yes ;;
-      *) is_woe32dll=no ;;
-    esac
-  else
-    is_woe32dll=no
-  fi
-  WOE32DLL=$is_woe32dll
-  AC_SUBST(WOE32DLL)
-
-  dnl On mingw and Cygwin, we can activate special Makefile rules which add
-  dnl version information to the shared libraries and executables.
-  case "$host_os" in
-    mingw* | cygwin*) is_woe32=yes ;;
-    *) is_woe32=no ;;
-  esac
-  WOE32=$is_woe32
-  AC_SUBST(WOE32)
-  if test $WOE32 = yes; then
-    dnl Check for a program that compiles Windows resource files.
-    AC_CHECK_TOOL(WINDRES, windres)
-  fi
-
-  dnl Determine whether when creating a library, "-lc" should be passed to
-  dnl libtool or not. On many platforms, it is required for the libtool option
-  dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool
-  dnl in the *.la files - makes it impossible to create multithreaded programs,
-  dnl because libtool also reorders the -lc to come before the -pthread, and
-  dnl this disables pthread_create() <http://docs.hp.com/en/1896/pthreads.html>.
-  case "$host_os" in
-    hpux*) LTLIBC="" ;;
-    *)     LTLIBC="-lc" ;;
-  esac
-  AC_SUBST(LTLIBC)
-
-  dnl Rename some macros and functions used for locking.
-  AH_BOTTOM(
-#define __libc_lock_t                   gl_lock_t
-#define __libc_lock_define              gl_lock_define
-#define __libc_lock_define_initialized  gl_lock_define_initialized
-#define __libc_lock_init                gl_lock_init
-#define __libc_lock_lock                gl_lock_lock
-#define __libc_lock_unlock              gl_lock_unlock
-#define __libc_lock_recursive_t                   gl_recursive_lock_t
-#define __libc_lock_define_recursive              gl_recursive_lock_define
-#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
-#define __libc_lock_init_recursive                gl_recursive_lock_init
-#define __libc_lock_lock_recursive                gl_recursive_lock_lock
-#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
-#define glthread_in_use  libintl_thread_in_use
-#define glthread_lock_init_func     libintl_lock_init_func
-#define glthread_lock_lock_func     libintl_lock_lock_func
-#define glthread_lock_unlock_func   libintl_lock_unlock_func
-#define glthread_lock_destroy_func  libintl_lock_destroy_func
-#define glthread_rwlock_init_multithreaded     libintl_rwlock_init_multithreaded
-#define glthread_rwlock_init_func              libintl_rwlock_init_func
-#define glthread_rwlock_rdlock_multithreaded   libintl_rwlock_rdlock_multithreaded
-#define glthread_rwlock_rdlock_func            libintl_rwlock_rdlock_func
-#define glthread_rwlock_wrlock_multithreaded   libintl_rwlock_wrlock_multithreaded
-#define glthread_rwlock_wrlock_func            libintl_rwlock_wrlock_func
-#define glthread_rwlock_unlock_multithreaded   libintl_rwlock_unlock_multithreaded
-#define glthread_rwlock_unlock_func            libintl_rwlock_unlock_func
-#define glthread_rwlock_destroy_multithreaded  libintl_rwlock_destroy_multithreaded
-#define glthread_rwlock_destroy_func           libintl_rwlock_destroy_func
-#define glthread_recursive_lock_init_multithreaded     libintl_recursive_lock_init_multithreaded
-#define glthread_recursive_lock_init_func              libintl_recursive_lock_init_func
-#define glthread_recursive_lock_lock_multithreaded     libintl_recursive_lock_lock_multithreaded
-#define glthread_recursive_lock_lock_func              libintl_recursive_lock_lock_func
-#define glthread_recursive_lock_unlock_multithreaded   libintl_recursive_lock_unlock_multithreaded
-#define glthread_recursive_lock_unlock_func            libintl_recursive_lock_unlock_func
-#define glthread_recursive_lock_destroy_multithreaded  libintl_recursive_lock_destroy_multithreaded
-#define glthread_recursive_lock_destroy_func           libintl_recursive_lock_destroy_func
-#define glthread_once_func            libintl_once_func
-#define glthread_once_singlethreaded  libintl_once_singlethreaded
-#define glthread_once_multithreaded   libintl_once_multithreaded
-)
-)
-
-
-dnl Checks for the core files of the intl subdirectory:
-dnl   dcigettext.c
-dnl   eval-plural.h
-dnl   explodename.c
-dnl   finddomain.c
-dnl   gettextP.h
-dnl   gmo.h
-dnl   hash-string.h hash-string.c
-dnl   l10nflist.c
-dnl   libgnuintl.h.in (except the *printf stuff)
-dnl   loadinfo.h
-dnl   loadmsgcat.c
-dnl   localealias.c
-dnl   log.c
-dnl   plural-exp.h plural-exp.c
-dnl   plural.y
-dnl Used by libglocale.
-AC_DEFUN(gt_INTL_SUBDIR_CORE,
-
-  AC_REQUIRE(AC_C_INLINE)dnl
-  AC_REQUIRE(AC_TYPE_SIZE_T)dnl
-  AC_REQUIRE(gl_AC_HEADER_STDINT_H)
-  AC_REQUIRE(AC_FUNC_ALLOCA)dnl
-  AC_REQUIRE(AC_FUNC_MMAP)dnl
-  AC_REQUIRE(gt_INTDIV0)dnl
-  AC_REQUIRE(gl_AC_TYPE_UINTMAX_T)dnl
-  AC_REQUIRE(gt_INTTYPES_PRI)dnl
-  AC_REQUIRE(gl_LOCK)dnl
-
-  AC_TRY_LINK(
-    int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; },
-    ,
-    AC_DEFINE(HAVE_BUILTIN_EXPECT, 1,
-       Define to 1 if the compiler understands __builtin_expect.))
-
-  AC_CHECK_HEADERS(argz.h inttypes.h limits.h unistd.h sys/param.h)
-  AC_CHECK_FUNCS(getcwd getegid geteuid getgid getuid mempcpy munmap \
-    stpcpy strcasecmp strdup strtoul tsearch uselocale argz_count \
-    argz_stringify argz_next __fsetlocking)
-
-  dnl Use the *_unlocked functions only if they are declared.
-  dnl (because some of them were defined without being declared in Solaris
-  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-  dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
-  gt_CHECK_DECL(feof_unlocked, #include <stdio.h>)
-  gt_CHECK_DECL(fgets_unlocked, #include <stdio.h>)
-
-  AM_ICONV
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  AC_CHECK_PROGS(INTLBISON, bison)
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING(version of bison)
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* $0-9*\.0-9.*$.*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.26-9* | 1.3-90-9* | 2-9.*)
-changequote(,)dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    AC_MSG_RESULT($ac_prog_version)
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
-)
-
-
-dnl gt_CHECK_DECL(FUNC, INCLUDES)
-dnl Check whether a function is declared.
-AC_DEFUN(gt_CHECK_DECL,
-
-  AC_CACHE_CHECK(whether $1 is declared, ac_cv_have_decl_$1,
-    AC_TRY_COMPILE($2, 
-#ifndef $1
-  char *p = (char *) $1;
-#endif
-, ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no))
-  if test $ac_cv_have_decl_$1 = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-  AC_DEFINE_UNQUOTED(HAVE_DECL_translit($1, a-z, A-Z), $gt_value,
-    Define to 1 if you have the declaration of `$1', and to 0 if you don't.)
-)
-
-# intlmacosx.m4 serial 3 (gettext-0.18)
-dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Checks for special options needed on MacOS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN(gt_INTL_MACOSX,
-
-  dnl Check for API introduced in MacOS X 10.2.
-  AC_CACHE_CHECK(for CFPreferencesCopyAppValue,
-    gt_cv_func_CFPreferencesCopyAppValue,
-    gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK(#include <CoreFoundation/CFPreferences.h>,
-       CFPreferencesCopyAppValue(NULL, NULL),
-       gt_cv_func_CFPreferencesCopyAppValue=yes,
-       gt_cv_func_CFPreferencesCopyAppValue=no)
-     LIBS="$gt_save_LIBS")
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-    AC_DEFINE(HAVE_CFPREFERENCESCOPYAPPVALUE, 1,
-      Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.)
-  fi
-  dnl Check for API introduced in MacOS X 10.3.
-  AC_CACHE_CHECK(for CFLocaleCopyCurrent, gt_cv_func_CFLocaleCopyCurrent,
-    gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK(#include <CoreFoundation/CFLocale.h>, CFLocaleCopyCurrent();,
-       gt_cv_func_CFLocaleCopyCurrent=yes,
-       gt_cv_func_CFLocaleCopyCurrent=no)
-     LIBS="$gt_save_LIBS")
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    AC_DEFINE(HAVE_CFLOCALECOPYCURRENT, 1,
-      Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.)
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-  AC_SUBST(INTL_MACOSX_LIBS)
-)
-
-# intmax.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 2002-2005, 2008-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether the system has the 'intmax_t' type, but don't attempt to
-dnl find a replacement if it is lacking.
-
-AC_DEFUN(gt_TYPE_INTMAX_T,
-
-  AC_REQUIRE(gl_AC_HEADER_INTTYPES_H)
-  AC_REQUIRE(gl_AC_HEADER_STDINT_H)
-  AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
-    AC_TRY_COMPILE(
-#include <stddef.h>
-#include <stdlib.h>
-#if HAVE_STDINT_H_WITH_UINTMAX
-#include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-#include <inttypes.h>
-#endif
-,     intmax_t x = -1;
-        return !x;,
-       gt_cv_c_intmax_t=yes,
-       gt_cv_c_intmax_t=no))
-  if test $gt_cv_c_intmax_t = yes; then
-    AC_DEFINE(HAVE_INTMAX_T, 1,
-      Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.)
-  fi
-)
-
-# inttypes-pri.m4 serial 6 (gettext-0.18)
-dnl Copyright (C) 1997-2002, 2006, 2008-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ(2.52)
-
-# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-# macros to non-string values.  This is the case on AIX 4.3.3.
-
-AC_DEFUN(gt_INTTYPES_PRI,
-
-  AC_CHECK_HEADERS(inttypes.h)
-  if test $ac_cv_header_inttypes_h = yes; then
-    AC_CACHE_CHECK(whether the inttypes.h PRIxNN macros are broken,
-      gt_cv_inttypes_pri_broken,
-      
-        AC_TRY_COMPILE(#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
-, , gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
-      )
-  fi
-  if test "$gt_cv_inttypes_pri_broken" = yes; then
-    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
-      Define if <inttypes.h> exists and defines unusable PRI* macros.)
-    PRI_MACROS_BROKEN=1
-  else
-    PRI_MACROS_BROKEN=0
-  fi
-  AC_SUBST(PRI_MACROS_BROKEN)
-)
-
-# inttypes_h.m4 serial 9
-dnl Copyright (C) 1997-2004, 2006, 2008-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN(gl_AC_HEADER_INTTYPES_H,
-
-  AC_CACHE_CHECK(for inttypes.h, gl_cv_header_inttypes_h,
-  AC_TRY_COMPILE(
-    #include <sys/types.h>
-#include <inttypes.h>,
-    uintmax_t i = (uintmax_t) -1; return !i;,
-    gl_cv_header_inttypes_h=yes,
-    gl_cv_header_inttypes_h=no))
-  if test $gl_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-      Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-       and declares uintmax_t. )
-  fi
-)
-
-# lcmessage.m4 serial 6 (gettext-0.18)
-dnl Copyright (C) 1995-2002, 2004-2005, 2008-2010 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-
-AC_DEFUN(gt_LC_MESSAGES,
-
-  AC_CACHE_CHECK(for LC_MESSAGES, gt_cv_val_LC_MESSAGES,
-    AC_TRY_LINK(#include <locale.h>, return LC_MESSAGES,
-       gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no))
-  if test $gt_cv_val_LC_MESSAGES = yes; then
-    AC_DEFINE(HAVE_LC_MESSAGES, 1,
-      Define if your <locale.h> file defines LC_MESSAGES.)
-  fi
-)
-
-# lib-ld.m4 serial 4 (gettext-0.18)
-dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
-
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN(AC_LIB_PROG_LD_GNU,
-AC_CACHE_CHECK(if the linker ($LD) is GNU ld, acl_cv_prog_gnu_ld,
-# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
-*)
-  acl_cv_prog_gnu_ld=no ;;
-esac)
-with_gnu_ld=$acl_cv_prog_gnu_ld
-)
-
-dnl From libtool-1.4. Sets the variable LD.
-AC_DEFUN(AC_LIB_PROG_LD,
-AC_ARG_WITH(gnu-ld,
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no,
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE(AC_PROG_CC)dnl
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING(for ld used by GCC)
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    \\/* | A-Za-z:\\/*)
-      re_direlt='/^/^/*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING(for GNU ld)
-else
-  AC_MSG_CHECKING(for non-GNU ld)
-fi
-AC_CACHE_VAL(acl_cv_path_LD,
-if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
-      *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break ;;
-      *)
-        test "$with_gnu_ld" != yes && break ;;
-      esac
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi)
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR(no acceptable ld found in \$PATH)
-AC_LIB_PROG_LD_GNU
-)
-
-# lib-link.m4 serial 21 (gettext-0.18)
-dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ(2.54)
-
-dnl AC_LIB_LINKFLAGS(name , dependencies) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN(AC_LIB_LINKFLAGS,
-
-  AC_REQUIRE(AC_LIB_PREPARE_PREFIX)
-  AC_REQUIRE(AC_LIB_RPATH)
-  pushdef(Name,translit($1,./-, ___))
-  pushdef(NAME,translit($1,abcdefghijklmnopqrstuvwxyz./-,
-                                ABCDEFGHIJKLMNOPQRSTUVWXYZ___))
-  AC_CACHE_CHECK(how to link with lib$1, ac_cv_libName_libs, 
-    AC_LIB_LINKFLAGS_BODY($1, $2)
-    ac_cv_libName_libs="$LIBNAME"
-    ac_cv_libName_ltlibs="$LTLIBNAME"
-    ac_cv_libName_cppflags="$INCNAME"
-    ac_cv_libName_prefix="$LIBNAME_PREFIX"
-  )
-  LIBNAME="$ac_cv_libName_libs"
-  LTLIBNAME="$ac_cv_libName_ltlibs"
-  INCNAME="$ac_cv_libName_cppflags"
-  LIBNAME_PREFIX="$ac_cv_libName_prefix"
-  AC_LIB_APPENDTOVAR(CPPFLAGS, $INCNAME)
-  AC_SUBST(LIBNAME)
-  AC_SUBST(LTLIBNAME)
-  AC_SUBST(LIBNAME_PREFIX)
-  dnl Also set HAVE_LIBNAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
-  HAVE_LIBNAME=yes
-  popdef(NAME)
-  popdef(Name)
-)
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, missing-message)
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. The missing-message
-dnl defaults to 'no' and may contain additional hints for the user.
-dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
-dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN(AC_LIB_HAVE_LINKFLAGS,
-
-  AC_REQUIRE(AC_LIB_PREPARE_PREFIX)
-  AC_REQUIRE(AC_LIB_RPATH)
-  pushdef(Name,translit($1,./-, ___))
-  pushdef(NAME,translit($1,abcdefghijklmnopqrstuvwxyz./-,
-                                ABCDEFGHIJKLMNOPQRSTUVWXYZ___))
-
-  dnl Search for libName and define LIBNAME, LTLIBNAME and INCNAME
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY($1, $2)
-
-  dnl Add $INCNAME to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libName and not disabled its use
-  dnl via --without-libName-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR(CPPFLAGS, $INCNAME)
-
-  AC_CACHE_CHECK(for lib$1, ac_cv_libName, 
-    ac_save_LIBS="$LIBS"
-    dnl If $LIBNAME contains some -l options, add it to the end of LIBS,
-    dnl because these -l options might require -L options that are present in
-    dnl LIBS. -l options benefit only from the -L options listed before it.
-    dnl Otherwise, add it to the front of LIBS, because it may be a static
-    dnl library that depends on another static library that is present in LIBS.
-    dnl Static libraries benefit only from the static libraries listed after
-    dnl it.
-    case " $LIBNAME" in
-      *" -l"*) LIBS="$LIBS $LIBNAME" ;;
-      *)       LIBS="$LIBNAME $LIBS" ;;
-    esac
-    AC_TRY_LINK($3, $4,
-      ac_cv_libName=yes,
-      ac_cv_libName='m4_if($5, , no, $5)')
-    LIBS="$ac_save_LIBS"
-  )
-  if test "$ac_cv_libName" = yes; then
-    HAVE_LIBNAME=yes
-    AC_DEFINE(HAVE_LIBNAME, 1, Define if you have the lib$1 library.)
-    AC_MSG_CHECKING(how to link with lib$1)
-    AC_MSG_RESULT($LIBNAME)
-  else
-    HAVE_LIBNAME=no
-    dnl If $LIBNAME didn't lead to a usable library, we don't need
-    dnl $INCNAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIBNAME=
-    LTLIBNAME=
-    LIBNAME_PREFIX=
-  fi
-  AC_SUBST(HAVE_LIBNAME)
-  AC_SUBST(LIBNAME)
-  AC_SUBST(LTLIBNAME)
-  AC_SUBST(LIBNAME_PREFIX)
-  popdef(NAME)
-  popdef(Name)
-)
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl   acl_libext,
-dnl   acl_shlibext,
-dnl   acl_hardcode_libdir_flag_spec,
-dnl   acl_hardcode_libdir_separator,
-dnl   acl_hardcode_direct,
-dnl   acl_hardcode_minus_L.
-AC_DEFUN(AC_LIB_RPATH,
-
-  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
-  m4_ifdef(AC_REQUIRE_AUX_FILE, AC_REQUIRE_AUX_FILE(config.rpath))
-  AC_REQUIRE(AC_PROG_CC)                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE(AC_LIB_PROG_LD)            dnl we use $LD, $with_gnu_ld
-  AC_REQUIRE(AC_CANONICAL_HOST)         dnl we use $host
-  AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK(for shared library run path origin, acl_cv_rpath, 
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-  )
-  wl="$acl_cv_wl"
-  acl_libext="$acl_cv_libext"
-  acl_shlibext="$acl_cv_shlibext"
-  acl_libname_spec="$acl_cv_libname_spec"
-  acl_library_names_spec="$acl_cv_library_names_spec"
-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  acl_hardcode_direct="$acl_cv_hardcode_direct"
-  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
-      --disable-rpath         do not hardcode runtime library paths,
-    :, enable_rpath=yes)
-)
-
-dnl AC_LIB_FROMPACKAGE(name, package)
-dnl declares that libname comes from the given package. The configure file
-dnl will then not have a --with-libname-prefix option but a
-dnl --with-package-prefix option. Several libraries can come from the same
-dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
-dnl macro call that searches for libname.
-AC_DEFUN(AC_LIB_FROMPACKAGE,
-
-  pushdef(NAME,translit($1,abcdefghijklmnopqrstuvwxyz./-,
-                                ABCDEFGHIJKLMNOPQRSTUVWXYZ___))
-  define(acl_frompackage_NAME, $2)
-  popdef(NAME)
-  pushdef(PACK,$2)
-  pushdef(PACKUP,translit(PACK,abcdefghijklmnopqrstuvwxyz./-,
-                                  ABCDEFGHIJKLMNOPQRSTUVWXYZ___))
-  define(acl_libsinpackage_PACKUP,
-    m4_ifdef(acl_libsinpackage_PACKUP, acl_libsinpackage_PACKUP, ,)lib$1)
-  popdef(PACKUP)
-  popdef(PACK)
-)
-
-dnl AC_LIB_LINKFLAGS_BODY(name , dependencies) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
-dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN(AC_LIB_LINKFLAGS_BODY,
-
-  AC_REQUIRE(AC_LIB_PREPARE_MULTILIB)
-  pushdef(NAME,translit($1,abcdefghijklmnopqrstuvwxyz./-,
-                                ABCDEFGHIJKLMNOPQRSTUVWXYZ___))
-  pushdef(PACK,m4_ifdef(acl_frompackage_NAME, acl_frompackage_NAME, lib$1))
-  pushdef(PACKUP,translit(PACK,abcdefghijklmnopqrstuvwxyz./-,
-                                  ABCDEFGHIJKLMNOPQRSTUVWXYZ___))
-  pushdef(PACKLIBS,m4_ifdef(acl_frompackage_NAME, acl_libsinpackage_PACKUP, lib$1))
-  dnl Autoconf >= 2.61 supports dots in --with options.
-  pushdef(P_A_C_K,m4_if(m4_version_compare(m4_defn(m4_PACKAGE_VERSION),2.61),-1,translit(PACK,.,_),PACK))
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX(
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  )
-  AC_ARG_WITH(P_A_C_K-prefix,
-  --with-P_A_C_K-prefix=DIR  search for PACKLIBS in DIR/include and DIR/lib
-  --without-P_A_C_K-prefix     don't search for PACKLIBS in includedir and libdir,
-
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX(
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        )
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && ! test -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
-      fi
-    fi
-)
-  dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
-  LIBNAME=
-  LTLIBNAME=
-  INCNAME=
-  LIBNAME_PREFIX=
-  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
-  dnl computed. So it has to be reset here.
-  HAVE_LIBNAME=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='$1 $2'
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIBNAME="${LIBNAME}${LIBNAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIBNAME="${LTLIBNAME}${LTLIBNAME:+ }$value"
-          else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
-          if test $use_additional = yes; then
-            dir="$additional_libdir"
-            dnl The same code as in the loop below:
-            dnl First look for a shared library.
-            if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
-              else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
-              fi
-            fi
-            dnl Then look for a static library.
-            if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
-              fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIBNAME; do
-              AC_LIB_WITH_FINAL_PREFIX(eval x=\"$x\")
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  dnl First look for a shared library.
-                  if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
-                    else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
-                    fi
-                  fi
-                  dnl Then look for a static library.
-                  if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
-                    fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIBNAME="${LTLIBNAME}${LTLIBNAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
-                dnl No hardcoding is needed.
-                LIBNAME="${LIBNAME}${LIBNAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$acl_hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIBNAME="${LIBNAME}${LIBNAME:+ }$found_so"
-                else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIBNAME="${LIBNAME}${LIBNAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIBNAME; do
-                      AC_LIB_WITH_FINAL_PREFIX(eval x=\"$x\")
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIBNAME="${LIBNAME}${LIBNAME:+ }-L$found_dir"
-                    fi
-                    if test "$acl_hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIBNAME="${LIBNAME}${LIBNAME:+ }$found_so"
-                    else
-                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIBNAME="${LIBNAME}${LIBNAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIBNAME="${LIBNAME}${LIBNAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIBNAME="${LIBNAME}${LIBNAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = '$1'; then
-                  LIBNAME_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = '$1'; then
-                  LIBNAME_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INCNAME; do
-                    AC_LIB_WITH_FINAL_PREFIX(eval x=\"$x\")
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INCNAME="${INCNAME}${INCNAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIBNAME; do
-                          AC_LIB_WITH_FINAL_PREFIX(eval x=\"$x\")
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LIBNAME.
-                            LIBNAME="${LIBNAME}${LIBNAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIBNAME; do
-                          AC_LIB_WITH_FINAL_PREFIX(eval x=\"$x\")
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LTLIBNAME.
-                            LTLIBNAME="${LTLIBNAME}${LTLIBNAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                      dnl Potentially add DIR to rpathdirs.
-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-                      haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                      dnl Potentially add DIR to ltrpathdirs.
-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                      haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIBNAME="${LIBNAME}${LIBNAME:+ }$dep"
-                    LTLIBNAME="${LTLIBNAME}${LTLIBNAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIBNAME="${LIBNAME}${LIBNAME:+ }-l$name"
-            LTLIBNAME="${LTLIBNAME}${LTLIBNAME:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
-      dnl single library, but not when more than one $LIBNAMEs are used.
-      alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
-      done
-      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIBNAME="${LIBNAME}${LIBNAME:+ }$flag"
-    else
-      dnl The -rpath options are cumulative.
-      for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIBNAME="${LIBNAME}${LIBNAME:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-    dnl When using libtool, the option that works for both libraries and
-    dnl executables is -R. The -R options are cumulative.
-    for found_dir in $ltrpathdirs; do
-      LTLIBNAME="${LTLIBNAME}${LTLIBNAME:+ }-R$found_dir"
-    done
-  fi
-  popdef(P_A_C_K)
-  popdef(PACKLIBS)
-  popdef(PACKUP)
-  popdef(PACK)
-  popdef(NAME)
-)
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN(AC_LIB_APPENDTOVAR,
-
-  for element in $2; do
-    haveit=
-    for x in $$1; do
-      AC_LIB_WITH_FINAL_PREFIX(eval x=\"$x\")
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      $1="${$1}${$1:+ }$element"
-    fi
-  done
-)
-
-dnl For those cases where a variable contains several -L and -l options
-dnl referring to unknown libraries and directories, this macro determines the
-dnl necessary additional linker options for the runtime path.
-dnl AC_LIB_LINKFLAGS_FROM_LIBS(LDADDVAR, LIBSVALUE, USE-LIBTOOL)
-dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
-dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
-dnl otherwise linking without libtool is assumed.
-AC_DEFUN(AC_LIB_LINKFLAGS_FROM_LIBS,
-
-  AC_REQUIRE(AC_LIB_RPATH)
-  AC_REQUIRE(AC_LIB_PREPARE_MULTILIB)
-  $1=
-  if test "$enable_rpath" != no; then
-    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-      dnl Use an explicit option to hardcode directories into the resulting
-      dnl binary.
-      rpathdirs=
-      next=
-      for opt in $2; do
-        if test -n "$next"; then
-          dir="$next"
-          dnl No need to hardcode the standard /usr/lib.
-          if test "X$dir" != "X/usr/$acl_libdirstem" \
-             && test "X$dir" != "X/usr/$acl_libdirstem2"; then
-            rpathdirs="$rpathdirs $dir"
-          fi
-          next=
-        else
-          case $opt in
-            -L) next=yes ;;
-            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
-                 dnl No need to hardcode the standard /usr/lib.
-                 if test "X$dir" != "X/usr/$acl_libdirstem" \
-                    && test "X$dir" != "X/usr/$acl_libdirstem2"; then
-                   rpathdirs="$rpathdirs $dir"
-                 fi
-                 next= ;;
-            *) next= ;;
-          esac
-        fi
-      done
-      if test "X$rpathdirs" != "X"; then
-        if test -n ""$3""; then
-          dnl libtool is used for linking. Use -R options.
-          for dir in $rpathdirs; do
-            $1="${$1}${$1:+ }-R$dir"
-          done
-        else
-          dnl The linker is used for linking directly.
-          if test -n "$acl_hardcode_libdir_separator"; then
-            dnl Weird platform: only the last -rpath option counts, the user
-            dnl must pass all path elements in one option.
-            alldirs=
-            for dir in $rpathdirs; do
-              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
-            done
-            acl_save_libdir="$libdir"
-            libdir="$alldirs"
-            eval flag=\"$acl_hardcode_libdir_flag_spec\"
-            libdir="$acl_save_libdir"
-            $1="$flag"
-          else
-            dnl The -rpath options are cumulative.
-            for dir in $rpathdirs; do
-              acl_save_libdir="$libdir"
-              libdir="$dir"
-              eval flag=\"$acl_hardcode_libdir_flag_spec\"
-              libdir="$acl_save_libdir"
-              $1="${$1}${$1:+ }$flag"
-            done
-          fi
-        fi
-      fi
-    fi
-  fi
-  AC_SUBST($1)
-)
-
-# lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef(AC_HELP_STRING,
-AC_DEFUN(AC_LIB_ARG_WITH, AC_ARG_WITH($1,$2,$3,$4)),
-AC_DEFUN(AC_LIB_ARG_WITH, AC_ARG_WITH($1,$2,$3,$4)))
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN(AC_LIB_PREFIX,
-
-  AC_BEFORE($0, AC_LIB_LINKFLAGS)
-  AC_REQUIRE(AC_PROG_CC)
-  AC_REQUIRE(AC_CANONICAL_HOST)
-  AC_REQUIRE(AC_LIB_PREPARE_MULTILIB)
-  AC_REQUIRE(AC_LIB_PREPARE_PREFIX)
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX(
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  )
-  AC_LIB_ARG_WITH(lib-prefix,
-  --with-lib-prefix=DIR search for libraries in DIR/include and DIR/lib
-  --without-lib-prefix    don't search for libraries in includedir and libdir,
-
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX(
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        )
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-      fi
-    fi
-)
-  if test $use_additional = yes; then
-    dnl Potentially add $additional_includedir to $CPPFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/include,
-    dnl   2. if it's already present in $CPPFLAGS,
-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX(eval x=\"$x\")
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
-      fi
-    fi
-    dnl Potentially add $additional_libdir to $LDFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/lib,
-    dnl   2. if it's already present in $LDFLAGS,
-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
-      haveit=
-      for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX(eval x=\"$x\")
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-)
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN(AC_LIB_PREPARE_PREFIX,
-
-  dnl Unfortunately, prefix and exec_prefix get only finally determined
-  dnl at the end of configure.
-  if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-)
-
-dnl AC_LIB_WITH_FINAL_PREFIX(statement) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN(AC_LIB_WITH_FINAL_PREFIX,
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-)
-
-dnl AC_LIB_PREPARE_MULTILIB creates
-dnl - a variable acl_libdirstem, containing the basename of the libdir, either
-dnl   "lib" or "lib64" or "lib/64",
-dnl - a variable acl_libdirstem2, as a secondary possible value for
-dnl   acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
-dnl   "lib/amd64".
-AC_DEFUN(AC_LIB_PREPARE_MULTILIB,
-
-  dnl There is no formal standard regarding lib and lib64.
-  dnl On glibc systems, the current practice is that on a system supporting
-  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
-  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
-  dnl the compiler's default mode by looking at the compiler's library search
-  dnl path. If at least one of its elements ends in /lib64 or points to a
-  dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
-  dnl Otherwise we use the default, namely "lib".
-  dnl On Solaris systems, the current practice is that on a system supporting
-  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
-  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
-  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
-  AC_REQUIRE(AC_CANONICAL_HOST)
-  acl_libdirstem=lib
-  acl_libdirstem2=
-  case "$host_os" in
-    solaris*)
-      dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
-      dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
-      dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
-      dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
-      dnl symlink is missing, so we set acl_libdirstem2 too.
-      AC_CACHE_CHECK(for 64-bit host, gl_cv_solaris_64bit,
-        AC_EGREP_CPP(sixtyfour bits, 
-#ifdef _LP64
-sixtyfour bits
-#endif
-           , gl_cv_solaris_64bit=yes, gl_cv_solaris_64bit=no)
-        )
-      if test $gl_cv_solaris_64bit = yes; then
-        acl_libdirstem=lib/64
-        case "$host_cpu" in
-          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
-          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
-        esac
-      fi
-      ;;
-    *)
-      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-      if test -n "$searchpath"; then
-        acl_save_IFS="${IFS= 	}"; IFS=":"
-        for searchdir in $searchpath; do
-          if test -d "$searchdir"; then
-            case "$searchdir" in
-              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-              */../ | */.. )
-                # Better ignore directories of this form. They are misleading.
-                ;;
-              *) searchdir=`cd "$searchdir" && pwd`
-                 case "$searchdir" in
-                   */lib64 ) acl_libdirstem=lib64 ;;
-                 esac ;;
-            esac
-          fi
-        done
-        IFS="$acl_save_IFS"
-      fi
-      ;;
-  esac
-  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-)
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# 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.
-
-m4_define(_LT_COPYING, dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-)
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun(LT_PREREQ,
-m4_if(m4_version_compare(m4_defn(LT_PACKAGE_VERSION), $1), -1,
-       m4_default($3,
-		   m4_fatal(Libtool version $1 or higher is required,
-		             63)),
-       $2))
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun(_LT_CHECK_BUILDDIR,
-case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN(Libtool does not cope well with whitespace in `pwd`) ;;
-esac
-)
-
-
-# LT_INIT(OPTIONS)
-# ------------------
-AC_DEFUN(LT_INIT,
-AC_PREREQ(2.58)dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl
-AC_BEFORE($0, LT_LANG)dnl
-AC_BEFORE($0, LT_OUTPUT)dnl
-AC_BEFORE($0, LTDL_INIT)dnl
-m4_require(_LT_CHECK_BUILDDIR)dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid(^_?LT_A-Z_+$)dnl
-m4_pattern_allow(^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$)dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE(LTOPTIONS_VERSION)dnl
-AC_REQUIRE(LTSUGAR_VERSION)dnl
-AC_REQUIRE(LTVERSION_VERSION)dnl
-AC_REQUIRE(LTOBSOLETE_VERSION)dnl
-m4_require(_LT_PROG_LTMAIN)dnl
-
-_LT_SHELL_INIT(SHELL=${CONFIG_SHELL-/bin/sh})
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS($0, $1)
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define(LT_INIT)
-)# LT_INIT
-
-# Old names:
-AU_ALIAS(AC_PROG_LIBTOOL, LT_INIT)
-AU_ALIAS(AM_PROG_LIBTOOL, LT_INIT)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_PROG_LIBTOOL, )
-dnl AC_DEFUN(AM_PROG_LIBTOOL, )
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun(_LT_CC_BASENAME,
-for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *\\/compile | ccache | *\\/ccache ) ;;
-    distcc | *\\/distcc | purify | *\\/purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-)
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require(_LT_FILEUTILS_DEFAULTS)'.
-m4_defun(_LT_FILEUTILS_DEFAULTS,
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-)# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun(_LT_SETUP,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-AC_REQUIRE(AC_CANONICAL_BUILD)dnl
-AC_REQUIRE(_LT_PREPARE_SED_QUOTE_VARS)dnl
-AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
-
-_LT_DECL(, host_alias, 0, The host system)dnl
-_LT_DECL(, host, 0)dnl
-_LT_DECL(, host_os, 0)dnl
-dnl
-_LT_DECL(, build_alias, 0, The build system)dnl
-_LT_DECL(, build, 0)dnl
-_LT_DECL(, build_os, 0)dnl
-dnl
-AC_REQUIRE(AC_PROG_CC)dnl
-AC_REQUIRE(LT_PATH_LD)dnl
-AC_REQUIRE(LT_PATH_NM)dnl
-dnl
-AC_REQUIRE(AC_PROG_LN_S)dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL(, LN_S, 1, Whether we need soft or hard links)dnl
-dnl
-AC_REQUIRE(LT_CMD_MAX_LEN)dnl
-_LT_DECL(objext, ac_objext, 0, Object file suffix (normally "o"))dnl
-_LT_DECL(, exeext, 0, Executable file suffix (normally ""))dnl
-dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_CHECK_SHELL_FEATURES)dnl
-m4_require(_LT_PATH_CONVERSION_FUNCTIONS)dnl
-m4_require(_LT_CMD_RELOAD)dnl
-m4_require(_LT_CHECK_MAGIC_METHOD)dnl
-m4_require(_LT_CHECK_SHAREDLIB_FROM_LINKLIB)dnl
-m4_require(_LT_CMD_OLD_ARCHIVE)dnl
-m4_require(_LT_CMD_GLOBAL_SYMBOLS)dnl
-m4_require(_LT_WITH_SYSROOT)dnl
-
-_LT_CONFIG_LIBTOOL_INIT(
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-)
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require(_LT_TAG_COMPILER)dnl
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME($compiler)
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG(CC)
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-)# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun(_LT_PREPARE_SED_QUOTE_VARS,
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/$"`$\\$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$"`\\$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-)
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun(_LT_PROG_LTMAIN,
-m4_ifdef(AC_REQUIRE_AUX_FILE, AC_REQUIRE_AUX_FILE(ltmain.sh))dnl
-_LT_CONFIG_LIBTOOL_INIT(ac_aux_dir='$ac_aux_dir')
-ltmain="$ac_aux_dir/ltmain.sh"
-)# _LT_PROG_LTMAIN
-
-
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT(INIT-COMMANDS)
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define(_LT_CONFIG_LIBTOOL_INIT,
-m4_ifval($1,
-          m4_append(_LT_OUTPUT_LIBTOOL_INIT,
-                     $1
-)))
-
-# Initialize.
-m4_define(_LT_OUTPUT_LIBTOOL_INIT)
-
-
-# _LT_CONFIG_LIBTOOL(COMMANDS)
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define(_LT_CONFIG_LIBTOOL,
-m4_ifval($1,
-          m4_append(_LT_OUTPUT_LIBTOOL_COMMANDS,
-                     $1
-)))
-
-# Initialize.
-m4_define(_LT_OUTPUT_LIBTOOL_COMMANDS)
-
-
-# _LT_CONFIG_SAVE_COMMANDS(COMMANDS, INIT_COMMANDS)
-# -----------------------------------------------------
-m4_defun(_LT_CONFIG_SAVE_COMMANDS,
-_LT_CONFIG_LIBTOOL($1)
-_LT_CONFIG_LIBTOOL_INIT($2)
-)
-
-
-# _LT_FORMAT_COMMENT(COMMENT)
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define(_LT_FORMAT_COMMENT,
-m4_ifval($1, 
-m4_bpatsubst(m4_bpatsubst($1, ^ *, # ),
-              '`$\, \\\&)m4_bmatch($1, !?.$, , .)
-))
-
-
-
-
-
-# _LT_DECL(CONFIGNAME, VARNAME, VALUE, DESCRIPTION, IS-TAGGED?)
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define(_LT_DECL,
-lt_if_append_uniq(lt_decl_varnames, $2, , ,
-    lt_dict_add_subkey(lt_decl_dict, $2, libtool_name,
-	m4_ifval($1, $1, $2))
-    lt_dict_add_subkey(lt_decl_dict, $2, value, $3)
-    m4_ifval($4,
-	lt_dict_add_subkey(lt_decl_dict, $2, description, $4))
-    lt_dict_add_subkey(lt_decl_dict, $2,
-	tagged?, m4_ifval($5, yes, no)))
-)
-
-
-# _LT_TAGDECL(CONFIGNAME, VARNAME, VALUE, DESCRIPTION)
-# --------------------------------------------------------
-m4_define(_LT_TAGDECL, _LT_DECL($1, $2, $3, $4, yes))
-
-
-# lt_decl_tag_varnames(SEPARATOR, VARNAME1...)
-# ------------------------------------------------
-m4_define(lt_decl_tag_varnames,
-_lt_decl_filter(tagged?, yes, $@))
-
-
-# _lt_decl_filter(SUBKEY, VALUE, SEPARATOR, VARNAME1..)
-# ---------------------------------------------------------
-m4_define(_lt_decl_filter,
-m4_case($#,
-  0, m4_fatal($0: too few arguments: $#),
-  1, m4_fatal($0: too few arguments: $#: $1),
-  2, lt_dict_filter(lt_decl_dict, $1, $2, , lt_decl_varnames),
-  3, lt_dict_filter(lt_decl_dict, $1, $2, $3, lt_decl_varnames),
-  lt_dict_filter(lt_decl_dict, $@))dnl
-)
-
-
-# lt_decl_quote_varnames(SEPARATOR, VARNAME1...)
-# --------------------------------------------------
-m4_define(lt_decl_quote_varnames,
-_lt_decl_filter(value, 1, $@))
-
-
-# lt_decl_dquote_varnames(SEPARATOR, VARNAME1...)
-# ---------------------------------------------------
-m4_define(lt_decl_dquote_varnames,
-_lt_decl_filter(value, 2, $@))
-
-
-# lt_decl_varnames_tagged(SEPARATOR, VARNAME1...)
-# ---------------------------------------------------
-m4_define(lt_decl_varnames_tagged,
-m4_assert($# <= 2)dnl
-_$0(m4_quote(m4_default($1, , )),
-    m4_ifval($2, $2, m4_dquote(lt_decl_tag_varnames)),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)),  )))
-m4_define(_lt_decl_varnames_tagged,
-m4_ifval($3, lt_combine($1, $2, _, $3)))
-
-
-# lt_decl_all_varnames(SEPARATOR, VARNAME1...)
-# ------------------------------------------------
-m4_define(lt_decl_all_varnames,
-_$0(m4_quote(m4_default($1, , )),
-     m4_if($2, ,
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))dnl
-)
-m4_define(_lt_decl_all_varnames,
-lt_join($@, lt_decl_varnames_tagged($1,
-			lt_decl_tag_varnames(, , m4_shift($@))))dnl
-)
-
-
-# _LT_CONFIG_STATUS_DECLARE(VARNAME)
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define(_LT_CONFIG_STATUS_DECLARE,
-$1='`$ECHO "$$1" | $SED "$delay_single_quote_subst"`')
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun(_LT_CONFIG_STATUS_DECLARATIONS,
-m4_foreach(_lt_var, m4_quote(lt_decl_all_varnames),
-    m4_n(_LT_CONFIG_STATUS_DECLARE(_lt_var))))
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun(_LT_LIBTOOL_TAGS,
-_LT_FORMAT_COMMENT(The names of the tagged configurations supported by this script)dnl
-available_tags="_LT_TAGS"dnl
-)
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, TAG)
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define(_LT_LIBTOOL_DECLARE,
-_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch(lt_decl_dict, $1,
-					   description)))dnl
-m4_pushdef(_libtool_name,
-    m4_quote(lt_dict_fetch(lt_decl_dict, $1, libtool_name)))dnl
-m4_case(m4_quote(lt_dict_fetch(lt_decl_dict, $1, value)),
-    0, _libtool_name=$$1,
-    1, _libtool_name=$lt_$1,
-    2, _libtool_name=$lt_$1,
-    _libtool_name=lt_dict_fetch(lt_decl_dict, $1, value))dnl
-m4_ifval($2, _$2)m4_popdef(_libtool_name)dnl
-)
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun(_LT_LIBTOOL_CONFIG_VARS,
-m4_foreach(_lt_var,
-    m4_quote(_lt_decl_filter(tagged?, no, , lt_decl_varnames)),
-    m4_n(_LT_LIBTOOL_DECLARE(_lt_var))))
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define(_LT_LIBTOOL_TAG_VARS,
-m4_foreach(_lt_var, m4_quote(lt_decl_tag_varnames),
-    m4_n(_LT_LIBTOOL_DECLARE(_lt_var, $1))))
-
-
-# _LT_TAGVAR(VARNAME, TAGNAME)
-# ------------------------------
-m4_define(_LT_TAGVAR, m4_ifval($2, $1_$2, $1))
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun(_LT_CONFIG_COMMANDS,
-AC_PROVIDE_IFELSE(LT_OUTPUT,
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        AC_CONFIG_COMMANDS(libtool,
-            $SHELL $CONFIG_LT || AS_EXIT(1), CONFIG_LT='$CONFIG_LT'),
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    AC_CONFIG_COMMANDS(libtool,
-        _LT_OUTPUT_LIBTOOL_COMMANDS, _LT_OUTPUT_LIBTOOL_COMMANDS_INIT))
-)#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define(_LT_OUTPUT_LIBTOOL_COMMANDS_INIT,
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames( \
-, lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *\\\\\\\`\\"\\\$*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames( \
-, lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *\\\\\\\`\\"\\\$*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-)
-
-# _LT_GENERATED_FILE_INIT(FILE, COMMENT)
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef(AS_INIT_GENERATED,
-m4_defun(_LT_GENERATED_FILE_INIT,AS_INIT_GENERATED($@)),
-m4_defun(_LT_GENERATED_FILE_INIT,
-m4_require(AS_PREPARE)dnl
-m4_pushdef(AS_MESSAGE_LOG_FD)dnl
-lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1dnl
-m4_popdef(AS_MESSAGE_LOG_FD)))# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN(LT_OUTPUT,
-: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE(creating $CONFIG_LT)
-_LT_GENERATED_FILE_INIT("$CONFIG_LT",
-# Run this file to recreate a libtool stub with the current configuration.)
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX(Running $as_me.)
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $0 OPTIONS
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset(AC_PACKAGE_NAME, AC_PACKAGE_NAME )config.ltdnl
-m4_ifset(AC_PACKAGE_VERSION,  AC_PACKAGE_VERSION)
-configured by $0, generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $# != 0
-do
-  case $1 in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR(unrecognized option: $1
-Try \`$0 --help' for more information.) ;;
-
-    *) AC_MSG_ERROR(unrecognized argument: $1
-Try \`$0 --help' for more information.) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE(creating $ofile)
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-)# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun(_LT_CONFIG,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-_LT_CONFIG_SAVE_COMMANDS(
-  m4_define(_LT_TAG, m4_if($1, , C, $1))dnl
-  m4_if(_LT_TAG, C, 
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_REPLACE_SHELLFNS
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-,
-cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-)dnl /m4_if
-,
-m4_if($1, , 
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile', )
-)dnl /_LT_CONFIG_SAVE_COMMANDS
-)# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN(LT_SUPPORTED_TAG, )
-
-
-# C support is built-in for now
-m4_define(_LT_LANG_C_enabled, )
-m4_define(_LT_TAGS, )
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN(LT_LANG,
-AC_BEFORE($0, LT_OUTPUT)dnl
-m4_case($1,
-  C,			_LT_LANG(C),
-  C++,		_LT_LANG(CXX),
-  Java,		_LT_LANG(GCJ),
-  Fortran 77,		_LT_LANG(F77),
-  Fortran,		_LT_LANG(FC),
-  Windows Resource,	_LT_LANG(RC),
-  m4_ifdef(_LT_LANG_$1_CONFIG,
-    _LT_LANG($1),
-    m4_fatal($0: unsupported language: "$1")))dnl
-)# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun(_LT_LANG,
-m4_ifdef(_LT_LANG_$1_enabled, ,
-  LT_SUPPORTED_TAG($1)dnl
-  m4_append(_LT_TAGS, $1 )dnl
-  m4_define(_LT_LANG_$1_enabled, )dnl
-  _LT_LANG_$1_CONFIG($1))dnl
-)# _LT_LANG
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun(_LT_LANG_DEFAULT_CONFIG,
-AC_PROVIDE_IFELSE(AC_PROG_CXX,
-  LT_LANG(CXX),
-  m4_define(AC_PROG_CXX, defn(AC_PROG_CXX)LT_LANG(CXX)))
-
-AC_PROVIDE_IFELSE(AC_PROG_F77,
-  LT_LANG(F77),
-  m4_define(AC_PROG_F77, defn(AC_PROG_F77)LT_LANG(F77)))
-
-AC_PROVIDE_IFELSE(AC_PROG_FC,
-  LT_LANG(FC),
-  m4_define(AC_PROG_FC, defn(AC_PROG_FC)LT_LANG(FC)))
-
-dnl The call to AM_PROG_GCJ is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE(AC_PROG_GCJ,
-  LT_LANG(GCJ),
-  AC_PROVIDE_IFELSE(AM_PROG_GCJ,
-    LT_LANG(GCJ),
-    AC_PROVIDE_IFELSE(LT_PROG_GCJ,
-      LT_LANG(GCJ),
-      m4_ifdef(AC_PROG_GCJ,
-	m4_define(AC_PROG_GCJ, defn(AC_PROG_GCJ)LT_LANG(GCJ)))
-       m4_ifdef(AM_PROG_GCJ,
-	m4_define(AM_PROG_GCJ, defn(AM_PROG_GCJ)LT_LANG(GCJ)))
-       m4_ifdef(LT_PROG_GCJ,
-	m4_define(LT_PROG_GCJ, defn(LT_PROG_GCJ)LT_LANG(GCJ))))))
-
-AC_PROVIDE_IFELSE(LT_PROG_RC,
-  LT_LANG(RC),
-  m4_define(LT_PROG_RC, defn(LT_PROG_RC)LT_LANG(RC)))
-)# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN(AC_LIBTOOL_CXX, LT_LANG(C++))
-AU_DEFUN(AC_LIBTOOL_F77, LT_LANG(Fortran 77))
-AU_DEFUN(AC_LIBTOOL_FC, LT_LANG(Fortran))
-AU_DEFUN(AC_LIBTOOL_GCJ, LT_LANG(Java))
-AU_DEFUN(AC_LIBTOOL_RC, LT_LANG(Windows Resource))
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_CXX, )
-dnl AC_DEFUN(AC_LIBTOOL_F77, )
-dnl AC_DEFUN(AC_LIBTOOL_FC, )
-dnl AC_DEFUN(AC_LIBTOOL_GCJ, )
-dnl AC_DEFUN(AC_LIBTOOL_RC, )
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun(_LT_TAG_COMPILER,
-AC_REQUIRE(AC_PROG_CC)dnl
-
-_LT_DECL(LTCC, CC, 1, A C compiler)dnl
-_LT_DECL(LTCFLAGS, CFLAGS, 1, LTCC compiler flags)dnl
-_LT_TAGDECL(CC, compiler, 1, A language specific compiler)dnl
-_LT_TAGDECL(with_gcc, GCC, 0, Is the compiler the GNU compiler?)dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-)# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun(_LT_COMPILER_BOILERPLATE,
-m4_require(_LT_DECL_SED)dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-)# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun(_LT_LINKER_BOILERPLATE,
-m4_require(_LT_DECL_SED)dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-)# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once(_LT_REQUIRED_DARWIN_CHECKS,
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL(DSYMUTIL, dsymutil, :)
-    AC_CHECK_TOOL(NMEDIT, nmedit, :)
-    AC_CHECK_TOOL(LIPO, lipo, :)
-    AC_CHECK_TOOL(OTOOL, otool, :)
-    AC_CHECK_TOOL(OTOOL64, otool64, :)
-    _LT_DECL(, DSYMUTIL, 1,
-      Tool to manipulate archived DWARF debug symbol files on Mac OS X)
-    _LT_DECL(, NMEDIT, 1,
-      Tool to change global to local symbols on Mac OS X)
-    _LT_DECL(, LIPO, 1,
-      Tool to manipulate fat objects and archives on Mac OS X)
-    _LT_DECL(, OTOOL, 1,
-      ldd/readelf like tool for Mach-O binaries on Mac OS X)
-    _LT_DECL(, OTOOL64, 1,
-      ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4)
-
-    AC_CACHE_CHECK(for -single_module linker flag,lt_cv_apple_cc_single_mod,
-      lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi)
-    AC_CACHE_CHECK(for -exported_symbols_list linker flag,
-      lt_cv_ld_exported_symbols_list,
-      lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE(AC_LANG_PROGRAM(,),
-	lt_cv_ld_exported_symbols_list=yes,
-	lt_cv_ld_exported_symbols_list=no)
-	LDFLAGS="$save_LDFLAGS"
-    )
-    AC_CACHE_CHECK(for -force_load linker flag,lt_cv_ld_force_load,
-      lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    )
-    case $host_os in
-    rhapsody* | darwin1.012)
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin91*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.012*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-)
-
-
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
-# Checks for linker and compiler features on darwin
-m4_defun(_LT_DARWIN_LINKER_FEATURES,
-
-  m4_require(_LT_REQUIRED_DARWIN_CHECKS)
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if($1, CXX,
-   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-,)
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-)
-
-# _LT_SYS_MODULE_PATH_AIX(TAGNAME)
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun(_LT_SYS_MODULE_PATH_AIX,
-m4_require(_LT_DECL_SED)dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  AC_CACHE_VAL(_LT_TAGVAR(lt_cv_aix_libpath_, $1),
-  AC_LINK_IFELSE(AC_LANG_PROGRAM,
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *$^ *$ *$/\1/
-	      p
-	  }
-      }'
-  _LT_TAGVAR(lt_cv_aix_libpath_, $1)=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$_LT_TAGVAR(lt_cv_aix_libpath_, $1)"; then
-    _LT_TAGVAR(lt_cv_aix_libpath_, $1)=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi,)
-  if test -z "$_LT_TAGVAR(lt_cv_aix_libpath_, $1)"; then
-    _LT_TAGVAR(lt_cv_aix_libpath_, $1)="/usr/lib:/lib"
-  fi
-  )
-  aix_libpath=$_LT_TAGVAR(lt_cv_aix_libpath_, $1)
-fi
-)# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define(_LT_SHELL_INIT,
-m4_divert_text(M4SH-INIT, $1
-))# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
-m4_defun(_LT_PROG_ECHO_BACKSLASH,
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING(how to print strings)
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*" 
-}
-
-case "$ECHO" in
-  printf*) AC_MSG_RESULT(printf) ;;
-  print*) AC_MSG_RESULT(print -r) ;;
-  *) AC_MSG_RESULT(cat) ;;
-esac
-
-m4_ifdef(_AS_DETECT_SUGGESTED,
-_AS_DETECT_SUGGESTED(
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )))
-
-_LT_DECL(, SHELL, 1, Shell to use when invoking shell scripts)
-_LT_DECL(, ECHO, 1, An echo program that protects backslashes)
-)# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN(_LT_WITH_SYSROOT,
-AC_MSG_CHECKING(for sysroot)
-AC_ARG_WITH(sysroot,
-  --with-sysroot=DIR Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).,
-, with_sysroot=no)
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT(${with_sysroot})
-   AC_MSG_ERROR(The sysroot must be an absolute path.)
-   ;;
-esac
-
- AC_MSG_RESULT(${lt_sysroot:-no})
-_LT_DECL(, lt_sysroot, 0, The root where to search for dnl
-dependent libraries, and in which our libraries should be installed.))
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun(_LT_ENABLE_LOCK,
-AC_ARG_ENABLE(libtool-lock,
-  AS_HELP_STRING(--disable-libtool-lock,
-    avoid locking (might break parallel builds)))
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK(whether the C compiler needs -belf, lt_cv_cc_needs_belf,
-    AC_LANG_PUSH(C)
-     AC_LINK_IFELSE(AC_LANG_PROGRAM(,),lt_cv_cc_needs_belf=yes,lt_cv_cc_needs_belf=no)
-     AC_LANG_POP)
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-)# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun(_LT_PROG_AR,
-AC_CHECK_TOOLS(AR, ar, false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL(, AR, 1, The archiver)
-_LT_DECL(, AR_FLAGS, 1, Flags to create an archive)
-
-AC_CACHE_CHECK(for archiver @FILE support, lt_cv_ar_at_file,
-  lt_cv_ar_at_file=no
-   AC_COMPILE_IFELSE(AC_LANG_PROGRAM,
-     echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL(lt_ar_try)
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	AC_TRY_EVAL(lt_ar_try)
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-     )
-  )
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL(, archiver_list_spec, 1,
-  How to feed a file listing to the archiver)
-)# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun(_LT_CMD_OLD_ARCHIVE,
-_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL(, STRIP, 1, A symbol stripping program)
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL(, RANLIB, 1,
-    Commands used to install an old-style archive)
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-_LT_DECL(, old_postinstall_cmds, 2)
-_LT_DECL(, old_postuninstall_cmds, 2)
-_LT_TAGDECL(, old_archive_cmds, 2,
-    Commands used to build an old-style archive)
-_LT_DECL(, lock_old_archive_extraction, 0,
-    Whether to use a lock for old archive extraction)
-)# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		OUTPUT-FILE, ACTION-SUCCESS, ACTION-FAILURE)
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN(_LT_COMPILER_OPTION,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_SED)dnl
-AC_CACHE_CHECK($1, $2,
-  $2=no
-   m4_if($4, , ac_outfile=conftest.$ac_objext, ac_outfile=$4)
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # 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 \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   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 other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-)
-
-if test x"$$2" = xyes; then
-    m4_if($5, , :, $5)
-else
-    m4_if($6, , :, $6)
-fi
-)# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS(AC_LIBTOOL_COMPILER_OPTION, _LT_COMPILER_OPTION)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_COMPILER_OPTION, )
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  ACTION-SUCCESS, ACTION-FAILURE)
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN(_LT_LINKER_OPTION,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_SED)dnl
-AC_CACHE_CHECK($1, $2,
-  $2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-)
-
-if test x"$$2" = xyes; then
-    m4_if($4, , :, $4)
-else
-    m4_if($5, , :, $5)
-fi
-)# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS(AC_LIBTOOL_LINKER_OPTION, _LT_LINKER_OPTION)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_LINKER_OPTION, )
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN(LT_CMD_MAX_LEN,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING(the maximum length of command line arguments)
-AC_CACHE_VAL(lt_cv_sys_max_cmd_len, dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*	 //'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # 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.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-)
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL(, max_cmd_len, 0,
-    What is the maximum length of a command?)
-)# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS(AC_LIBTOOL_SYS_MAX_CMD_LEN, LT_CMD_MAX_LEN)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_SYS_MAX_CMD_LEN, )
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun(_LT_HEADER_DLFCN,
-AC_CHECK_HEADERS(dlfcn.h, , , AC_INCLUDES_DEFAULT)dnl
-)# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun(_LT_TRY_DLOPEN_SELF,
-m4_require(_LT_HEADER_DLFCN)dnl
-if test "$cross_compiling" = yes; then :
-  $4
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-)# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN(LT_SYS_DLOPEN_SELF,
-m4_require(_LT_HEADER_DLFCN)dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB(dl, dlopen,
-		lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl",
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    )
-    ;;
-
-  *)
-    AC_CHECK_FUNC(shl_load,
-	  lt_cv_dlopen="shl_load",
-      AC_CHECK_LIB(dld, shl_load,
-	    lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld",
-	AC_CHECK_FUNC(dlopen,
-	      lt_cv_dlopen="dlopen",
-	  AC_CHECK_LIB(dl, dlopen,
-		lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl",
-	    AC_CHECK_LIB(svld, dlopen,
-		  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld",
-	      AC_CHECK_LIB(dld, dld_link,
-		    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld")
-	      )
-	    )
-	  )
-	)
-      )
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK(whether a program can dlopen itself,
-	  lt_cv_dlopen_self, dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    )
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK(whether a statically linked program can dlopen itself,
-	  lt_cv_dlopen_self_static, dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      )
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  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 ;;
-  esac
-fi
-_LT_DECL(dlopen_support, enable_dlopen, 0,
-	 Whether dlopen is supported)
-_LT_DECL(dlopen_self, enable_dlopen_self, 0,
-	 Whether dlopen of programs is supported)
-_LT_DECL(dlopen_self_static, enable_dlopen_self_static, 0,
-	 Whether dlopen of statically linked programs is supported)
-)# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS(AC_LIBTOOL_DLOPEN_SELF, LT_SYS_DLOPEN_SELF)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF, )
-
-
-# _LT_COMPILER_C_O(TAGNAME)
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun(_LT_COMPILER_C_O,
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_TAG_COMPILER)dnl
-AC_CACHE_CHECK(if $compiler supports -c -o file.$ac_objext,
-  _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1),
-  _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-)
-_LT_TAGDECL(compiler_c_o, lt_cv_prog_compiler_c_o, 1,
-	Does compiler simultaneously support -c and -o options?)
-)# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS(TAGNAME)
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun(_LT_COMPILER_FILE_LOCKS,
-m4_require(_LT_ENABLE_LOCK)dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-_LT_COMPILER_C_O($1)
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING(if we can lock with hard links)
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT($hard_links)
-  if test "$hard_links" = no; then
-    AC_MSG_WARN(`$CC' does not support `-c -o', so `make -j' may be unsafe)
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL(, need_locks, 1, Must we lock files when doing compilation?)
-)# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun(_LT_CHECK_OBJDIR,
-AC_CACHE_CHECK(for objdir, lt_cv_objdir,
-rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null)
-objdir=$lt_cv_objdir
-_LT_DECL(, objdir, 0,
-         The name of the directory that contains temporary libtool files)dnl
-m4_pattern_allow(LT_OBJDIR)dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  Define to the sub-directory in which libtool stores uninstalled libraries.)
-)# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH(TAGNAME)
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun(_LT_LINKER_HARDCODE_LIBPATH,
-AC_MSG_CHECKING(how to hardcode library paths into programs)
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT($_LT_TAGVAR(hardcode_action, $1))
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL(, hardcode_action, 0,
-    How to hardcode a shared library path into an executable)
-)# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun(_LT_CMD_STRIPLIB,
-m4_require(_LT_DECL_EGREP)
-striplib=
-old_striplib=
-AC_MSG_CHECKING(whether stripping libraries is possible)
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT(yes)
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT(no)
-    ;;
-  esac
-fi
-_LT_DECL(, old_striplib, 1, Commands to strip libraries)
-_LT_DECL(, striplib, 1)
-)# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER(TAG)
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun(_LT_SYS_DYNAMIC_LINKER,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_OBJDUMP)dnl
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_CHECK_SHELL_FEATURES)dnl
-AC_MSG_CHECKING(dynamic linker characteristics)
-m4_if($1,
-	, 
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=$A-Za-z:$,\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freqlt_foo++; }
-  if (lt_freqlt_foo == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/$A-Za-z:$,\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi)
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4-9*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.01 | aix4.01.*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$^/*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi45*)
-  version_type=linux
-  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 $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-m4_if($1, ,
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api")
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';c-zC-Z:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if($1, ,
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib")
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  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
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd123*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  # Handle Gentoo/FreeBSD as it was Linux
-  case $host_vendor in
-    gentoo)
-      version_type=linux ;;
-    *)
-      version_type=freebsd-$objformat ;;
-  esac
-
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-    linux)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-      soname_spec='${libname}${release}${shared_ext}$major'
-      need_lib_prefix=no
-      need_version=no
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.2-9* | freebsdelf3.2-9* | \
-  freebsd4.0-5 | freebsdelf4.0-5 | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-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
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      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'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix3-9*)
-  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 ;;
-    *)
-	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* | k*bsd*-gnu | kopensolaris*-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
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  AC_CACHE_VAL(lt_cv_shlibpath_overrides_runpath,
-    lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-    AC_LINK_IFELSE(AC_LANG_PROGRAM(,),
-      AS_IF( ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null,
-	 lt_cv_shlibpath_overrides_runpath=yes))
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-    )
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # 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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^	 *hwcap	 /d;s/:,	/ /g;s/=^=*$//;s/=^= * / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  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'
-  ;;
-
-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
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-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
-  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_cmds=".dll"
-  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"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-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.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
-      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
-  ;;
-
-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
-  shlibpath_overrides_runpath=yes
-  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'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  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}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-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
-AC_MSG_RESULT($dynamic_linker)
-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
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL(, variables_saved_for_relink, 1,
-    Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time)
-_LT_DECL(, need_lib_prefix, 0,
-    Do we need the "lib" prefix for modules?)
-_LT_DECL(, need_version, 0, Do we need a version for libraries?)
-_LT_DECL(, version_type, 0, Library versioning type)
-_LT_DECL(, runpath_var, 0,  Shared library runtime path variable)
-_LT_DECL(, shlibpath_var, 0,Shared library path variable)
-_LT_DECL(, shlibpath_overrides_runpath, 0,
-    Is shlibpath searched before the hard-coded library search path?)
-_LT_DECL(, libname_spec, 1, Format of library name prefix)
-_LT_DECL(, library_names_spec, 1,
-    List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME)
-_LT_DECL(, soname_spec, 1,
-    The coded name of the library, if different from the real name)
-_LT_DECL(, install_override_mode, 1,
-    Permission mode override for installation of shared libraries)
-_LT_DECL(, postinstall_cmds, 2,
-    Command to use after installation of a shared archive)
-_LT_DECL(, postuninstall_cmds, 2,
-    Command to use after uninstallation of a shared archive)
-_LT_DECL(, finish_cmds, 2,
-    Commands used to finish a libtool library installation in a directory)
-_LT_DECL(, finish_eval, 1,
-    As "finish_cmds", except a single script fragment to be evaled but
-    not shown)
-_LT_DECL(, hardcode_into_libs, 0,
-    Whether we should hardcode library paths into libraries)
-_LT_DECL(, sys_lib_search_path_spec, 2,
-    Compile-time system search path for libraries)
-_LT_DECL(, sys_lib_dlsearch_path_spec, 2,
-    Run-time system search path for libraries)
-)# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN(_LT_PATH_TOOL_PREFIX,
-m4_require(_LT_DECL_EGREP)dnl
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-case $MAGIC_CMD in
-\\/* |  ?:\\/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if($2, , $PATH, $2)"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac)
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL(, MAGIC_CMD, 0,
-	 Used to examine libraries when file_magic_cmd begins with "file")dnl
-)# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS(AC_PATH_TOOL_PREFIX, _LT_PATH_TOOL_PREFIX)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_PATH_TOOL_PREFIX, )
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun(_LT_PATH_MAGIC,
-_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-)# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN(LT_PATH_LD,
-AC_REQUIRE(AC_PROG_CC)dnl
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-AC_REQUIRE(AC_CANONICAL_BUILD)dnl
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_PROG_ECHO_BACKSLASH)dnl
-
-AC_ARG_WITH(gnu-ld,
-    AS_HELP_STRING(--with-gnu-ld,
-	assume the C compiler uses GNU ld @<:@default=no@:>@),
-    test "$withval" = no || with_gnu_ld=yes,
-    with_gnu_ld=no)dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING(for ld used by $CC)
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    \\/* | ?:\\/*)
-      re_direlt='/^/^/*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING(for GNU ld)
-else
-  AC_MSG_CHECKING(for non-GNU ld)
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi)
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR(no acceptable ld found in \$PATH)
-_LT_PATH_LD_GNU
-AC_SUBST(LD)
-
-_LT_TAGDECL(, LD, 1, The linker used to build libraries)
-)# LT_PATH_LD
-
-# Old names:
-AU_ALIAS(AM_PROG_LD, LT_PATH_LD)
-AU_ALIAS(AC_PROG_LD, LT_PATH_LD)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AM_PROG_LD, )
-dnl AC_DEFUN(AC_PROG_LD, )
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun(_LT_PATH_LD_GNU,
-AC_CACHE_CHECK(if the linker ($LD) is GNU ld, lt_cv_prog_gnu_ld,
-# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac)
-with_gnu_ld=$lt_cv_prog_gnu_ld
-)# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun(_LT_CMD_RELOAD,
-AC_CACHE_CHECK(for $LD option to reload object files,
-  lt_cv_ld_reload_flag,
-  lt_cv_ld_reload_flag='-r')
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-_LT_TAGDECL(, reload_flag, 1, How to create reloadable object files)dnl
-_LT_TAGDECL(, reload_cmds, 2)dnl
-)# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun(_LT_CHECK_MAGIC_METHOD,
-m4_require(_LT_DECL_EGREP)
-m4_require(_LT_DECL_OBJDUMP)
-AC_CACHE_CHECK(how to recognize dependent libraries,
-lt_cv_deplibs_check_method,
-lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic regex' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4-9*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi45*)
-  lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i3-986 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF-0-90-9) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF -0-90-9)(-bit)?( LMSB)? shared object( file)?, -* PA-RISC 0-9\.0-9'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s0-90-90-9|PA-RISC0-9\.0-9) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix3-9*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  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
-    lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib) M0-90-9* Version 0-9'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit LMSB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF 0-90-9*-bit LMSB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-)
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/\1\/\1\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-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
-
-_LT_DECL(, deplibs_check_method, 1,
-    Method to check whether dependent libraries are shared objects)
-_LT_DECL(, file_magic_cmd, 1,
-    Command to use when deplibs_check_method = "file_magic")
-_LT_DECL(, file_magic_glob, 1,
-    How to find potential files when deplibs_check_method = "file_magic")
-_LT_DECL(, want_nocaseglob, 1,
-    Find potential files using nocaseglob when deplibs_check_method = "file_magic")
-)# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN(LT_PATH_NM,
-AC_REQUIRE(AC_PROG_CC)dnl
-AC_CACHE_CHECK(for BSD- or MS-compatible name lister (nm), lt_cv_path_NM,
-if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi)
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, dumpbin "link -dump", :)
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-  AC_SUBST(DUMPBIN)
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST(NM)
-_LT_DECL(, NM, 1, A BSD- or MS-compatible name lister)dnl
-
-AC_CACHE_CHECK(the name lister ($NM) interface, lt_cv_nm_interface,
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*)
-)# LT_PATH_NM
-
-# Old names:
-AU_ALIAS(AM_PROG_NM, LT_PATH_NM)
-AU_ALIAS(AC_PROG_NM, LT_PATH_NM)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AM_PROG_NM, )
-dnl AC_DEFUN(AC_PROG_NM, )
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun(_LT_CHECK_SHAREDLIB_FROM_LINKLIB,
-m4_require(_LT_DECL_EGREP)
-m4_require(_LT_DECL_OBJDUMP)
-m4_require(_LT_DECL_DLLTOOL)
-AC_CACHE_CHECK(how to associate runtime and link libraries,
-lt_cv_sharedlib_from_linklib_cmd,
-lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-)
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL(, sharedlib_from_linklib_cmd, 1,
-    Command to associate shared and link libraries)
-)# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun(_LT_PATH_MANIFEST_TOOL,
-AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK(if $MANIFEST_TOOL is a manifest tool, lt_cv_path_mainfest_tool,
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*)
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-_LT_DECL(, MANIFEST_TOOL, 1, Manifest tool)dnl
-)# _LT_PATH_MANIFEST_TOOL
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN(LT_LIB_M,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-AC_SUBST(LIBM)
-)# LT_LIB_M
-
-# Old name:
-AU_ALIAS(AC_CHECK_LIBM, LT_LIB_M)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_CHECK_LIBM, )
-
-
-# _LT_COMPILER_NO_RTTI(TAGNAME)
-# -------------------------------
-m4_defun(_LT_COMPILER_NO_RTTI,
-m4_require(_LT_TAG_COMPILER)dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-  esac
-
-  _LT_COMPILER_OPTION(if $compiler supports -fno-rtti -fno-exceptions,
-    lt_cv_prog_compiler_rtti_exceptions,
-    -fno-rtti -fno-exceptions, ,
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions")
-fi
-_LT_TAGDECL(no_builtin_flag, lt_prog_compiler_no_builtin_flag, 1,
-	Compiler flag to turn off builtin functions)
-)# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun(_LT_CMD_GLOBAL_SYMBOLS,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-AC_REQUIRE(AC_PROG_CC)dnl
-AC_REQUIRE(AC_PROG_AWK)dnl
-AC_REQUIRE(LT_PATH_NM)dnl
-AC_REQUIRE(LT_PATH_LD)dnl
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_TAG_COMPILER)dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING(command to parse $NM output from $compiler object)
-AC_CACHE_VAL(lt_cv_sys_global_symbol_pipe,
-
-# These are sane defaults that work on at least a few old systems.
-# They come from Ultrix.  What could be older than Ultrix?!! ;)
-
-# Character class describing NM global symbol codes.
-symcode='BCDEGRST'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='$_A-Za-z_A-Za-z0-9*$'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='BCDT'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='ABCDGISTW'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='ABCDEGRST'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='BCDEGRST'
-  ;;
-osf*)
-  symcode='BCDEGQRST'
-  ;;
-solaris*)
-  symcode='BDRT'
-  ;;
-sco3.2v5*)
-  symcode='DT'
-  ;;
-sysv4.2uw2*)
-  symcode='DT'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='ABDT'
-  ;;
-sysv4)
-  symcode='DFNSTU'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='ABCDGIRSTW' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $^ *$ *$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $^ *$ $^ *$$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: $^ *$ *$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $^ *$ $lib^ *$$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* $^ *$ $^ *$$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF $^|$*()/{next};"\
-"     {if(hidesection) next};"\
-"     {f=0}; \$ 0~/.*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a2, s)};"\
-"     s1~/^@?/{print s1, s1; next};"\
-"     s1~prfx {split(s1,t,\"@\"); print t1, substr(t1,length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT@&t@_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT@&t@_DLSYM_CONST
-#else
-# define LT@&t@_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT@&t@_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-)
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  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
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '@FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-_LT_DECL(global_symbol_pipe, lt_cv_sys_global_symbol_pipe, 1,
-    Take the output of nm and produce a listing of raw symbols and C names)
-_LT_DECL(global_symbol_to_cdecl, lt_cv_sys_global_symbol_to_cdecl, 1,
-    Transform the output of nm in a proper C declaration)
-_LT_DECL(global_symbol_to_c_name_address,
-    lt_cv_sys_global_symbol_to_c_name_address, 1,
-    Transform the output of nm in a C name address pair)
-_LT_DECL(global_symbol_to_c_name_address_lib_prefix,
-    lt_cv_sys_global_symbol_to_c_name_address_lib_prefix, 1,
-    Transform the output of nm in a C name address pair when lib prefix is needed)
-_LT_DECL(, nm_file_list_spec, 1,
-    Specify filename containing input files for $NM)
-) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC(TAGNAME)
-# ---------------------------
-m4_defun(_LT_COMPILER_PIC,
-m4_require(_LT_TAG_COMPILER)dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-m4_if($1, CXX, 
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if($1, GCJ, ,
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-    interix3-9*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix4-9*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	m4_if($1, GCJ, ,
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxlcC* | mpixlcC*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-,
-
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if($1, GCJ, ,
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix3-9*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if($1, GCJ, ,
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-)
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if($1,, -DPIC,m4_if($1,CXX, -DPIC,))"
-    ;;
-esac
+To do so, use the procedure documented by the package, typically 'autoreconf'.))
 
-AC_CACHE_CHECK(for $compiler option to produce PIC,
-  _LT_TAGVAR(lt_cv_prog_compiler_pic, $1),
-  _LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1))
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION(if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works,
-    _LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
-    $_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if($1,, -DPIC,m4_if($1,CXX, -DPIC,)), ,
-    case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac,
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no)
-fi
-_LT_TAGDECL(pic_flag, lt_prog_compiler_pic, 1,
-	Additional compiler flags for building library objects)
-
-_LT_TAGDECL(wl, lt_prog_compiler_wl, 1,
-	How to pass a linker flag through the compiler)
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION(if $compiler static flag $lt_tmp_static_flag works,
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  ,
-  _LT_TAGVAR(lt_prog_compiler_static, $1)=)
-_LT_TAGDECL(link_static_flag, lt_prog_compiler_static, 1,
-	Compiler flag to prevent dynamic linking)
-)# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS(TAGNAME)
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun(_LT_LINKER_SHLIBS,
-AC_REQUIRE(LT_PATH_LD)dnl
-AC_REQUIRE(LT_PATH_NM)dnl
-m4_require(_LT_PATH_MANIFEST_TOOL)dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_CMD_GLOBAL_SYMBOLS)dnl
-m4_require(_LT_TAG_COMPILER)dnl
-AC_MSG_CHECKING(whether the $compiler linker ($LD) supports shared libraries)
-m4_if($1, CXX, 
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(exclude_expsyms, $1)='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
-  case $host_os in
-  aix4-9*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*) ;;
-    *)
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/;s/^.* __nm__$^ *$ ^ */\1 DATA/;/^I /d;/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
-      ;;
-    esac
-    ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-, 
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_TAGVAR(exclude_expsyms, $1)='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ $GNU\ Binutils$\ 2.19.5*) ;;
-	  *\ $GNU\ Binutils$\ 2.2-9*) ;;
-	  *\ $GNU\ Binutils$\ 3-9*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3-9*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/;s/^.* __nm__$^ *$ ^ */\1 DATA/;/^I /d;/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    interix3-9*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	  tmp_sharedflag='--shared' ;;
-	xlcC* | bgxlcC* | mpixlcC*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ 01.* | *\ 2.0-9.* | *\ 2.10-5.*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix4-9*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.23|aix4.23.*|aix5-9*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX($1)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX($1)
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  fi
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi45*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	_LT_TAGVAR(always_export_symbols, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1,DATA/'\'' | $SED -e '\''/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	# FIXME: Should let the user specify the lib program.
-	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.012 allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	m4_if($1, , 
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  _LT_LINKER_OPTION(if $CC understands -b,
-	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), -b,
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags',
-	    _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'),
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags')
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	AC_CACHE_CHECK(whether the $host_os linker accepts -exported_symbol,
-	  lt_cv_irix_exported_symbol,
-	  save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   AC_LINK_IFELSE(
-	     AC_LANG_SOURCE(
-	        AC_LANG_CASE(C, int foo (void) { return 0; },
-			      C++, int foo (void) { return 0; },
-			      Fortran 77, 
-      subroutine foo
-      end,
-			      Fortran, 
-      subroutine foo
-      end)),
-	      lt_cv_irix_exported_symbol=yes,
-	      lt_cv_irix_exported_symbol=no)
-           LDFLAGS="$save_LDFLAGS")
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd01.* | openbsd2.0-7 | openbsd2.0-7.*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.0-5 | solaris2.0-5.*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      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.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-)
-AC_MSG_RESULT($_LT_TAGVAR(ld_shlibs, $1))
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL(, libext, 0, Old archive suffix (normally "a"))dnl
-_LT_DECL(, shrext_cmds, 1, Shared library suffix (normally ".so"))dnl
-_LT_DECL(, extract_expsyms_cmds, 2,
-    The commands to extract the exported symbol list from a shared archive)
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # 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.
-      AC_CACHE_CHECK(whether -lc should be explicitly linked in,
-	lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1),
-	$RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-	  _LT_TAGVAR(allow_undefined_flag, $1)=
-	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-	  then
-	    lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	  else
-	    lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  fi
-	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-	)
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL(build_libtool_need_lc, archive_cmds_need_lc, 0,
-    Whether or not to add -lc for building shared libraries)
-_LT_TAGDECL(allow_libtool_libs_with_static_runtimes,
-    enable_shared_with_static_runtimes, 0,
-    Whether or not to disallow shared libs when runtime libs are static)
-_LT_TAGDECL(, export_dynamic_flag_spec, 1,
-    Compiler flag to allow reflexive dlopens)
-_LT_TAGDECL(, whole_archive_flag_spec, 1,
-    Compiler flag to generate shared objects directly from archives)
-_LT_TAGDECL(, compiler_needs_object, 1,
-    Whether the compiler copes with passing no objects directly)
-_LT_TAGDECL(, old_archive_from_new_cmds, 2,
-    Create an old-style archive from a shared archive)
-_LT_TAGDECL(, old_archive_from_expsyms_cmds, 2,
-    Create a temporary old-style archive to link instead of a shared archive)
-_LT_TAGDECL(, archive_cmds, 2, Commands used to build a shared archive)
-_LT_TAGDECL(, archive_expsym_cmds, 2)
-_LT_TAGDECL(, module_cmds, 2,
-    Commands used to build a loadable module if different from building
-    a shared archive.)
-_LT_TAGDECL(, module_expsym_cmds, 2)
-_LT_TAGDECL(, with_gnu_ld, 1,
-    Whether we are building with GNU ld or not)
-_LT_TAGDECL(, allow_undefined_flag, 1,
-    Flag that allows shared libraries with undefined symbols to be built)
-_LT_TAGDECL(, no_undefined_flag, 1,
-    Flag that enforces no undefined symbols)
-_LT_TAGDECL(, hardcode_libdir_flag_spec, 1,
-    Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist)
-_LT_TAGDECL(, hardcode_libdir_flag_spec_ld, 1,
-    If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist)
-_LT_TAGDECL(, hardcode_libdir_separator, 1,
-    Whether we need a single "-rpath" flag with a separated argument)
-_LT_TAGDECL(, hardcode_direct, 0,
-    Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary)
-_LT_TAGDECL(, hardcode_direct_absolute, 0,
-    Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated)
-_LT_TAGDECL(, hardcode_minus_L, 0,
-    Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary)
-_LT_TAGDECL(, hardcode_shlibpath_var, 0,
-    Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary)
-_LT_TAGDECL(, hardcode_automatic, 0,
-    Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it)
-_LT_TAGDECL(, inherit_rpath, 0,
-    Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list)
-_LT_TAGDECL(, link_all_deplibs, 0,
-    Whether libtool must link a program against all its dependency libraries)
-_LT_TAGDECL(, always_export_symbols, 0,
-    Set to "yes" if exported symbols are required)
-_LT_TAGDECL(, export_symbols_cmds, 2,
-    The commands to list exported symbols)
-_LT_TAGDECL(, exclude_expsyms, 1,
-    Symbols that should not be listed in the preloaded symbols)
-_LT_TAGDECL(, include_expsyms, 1,
-    Symbols that must always be exported)
-_LT_TAGDECL(, prelink_cmds, 2,
-    Commands necessary for linking programs (against libraries) with templates)
-_LT_TAGDECL(, postlink_cmds, 2,
-    Commands necessary for finishing linking programs)
-_LT_TAGDECL(, file_list_spec, 1,
-    Specify filename containing input files)
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL(, thread_safe_flag_spec, 1,
-dnl    Compiler flag to generate thread safe objects)
-)# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG(TAG)
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun(_LT_LANG_C_CONFIG,
-m4_require(_LT_DECL_EGREP)dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, ) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will actually be built
-  AC_MSG_CHECKING(if libtool supports shared libraries)
-  AC_MSG_RESULT($can_build_shared)
-
-  AC_MSG_CHECKING(whether to build shared libraries)
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix4-9*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT($enable_shared)
-
-  AC_MSG_CHECKING(whether to build static libraries)
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  AC_MSG_RESULT($enable_static)
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-)# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG(TAG)
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun(_LT_LANG_CXX_CONFIG,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_PATH_MANIFEST_TOOL)dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME($compiler)
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # 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.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING(whether the $compiler linker ($LD) supports shared libraries)
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix4-9*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.23|aix4.23.*|aix5-9*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.012|aix4.012.*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
-	    else
-	      shared_flag='${wl}-bM:SRE'
-	    fi
-          fi
-        fi
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX($1)
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX($1)
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    fi
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=yes
-	  _LT_TAGVAR(file_list_spec, $1)='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=".dll"
-	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      $SED -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	    else
-	      $SED -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	    fi~
-	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	    linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	  # Don't use ranlib
-	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-	    case $lt_outputfile in
-	      *.exe|*.EXE) ;;
-	      *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	    esac~
-	    func_to_tool_file "$lt_outputfile"~
-	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	      $RM "$lt_outputfile.manifest";
-	    fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=no
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file (1st line
-	    # is EXPORTS), use it as is; otherwise, prepend...
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      cp $export_symbols $output_objdir/$soname.def;
-	    else
-	      echo EXPORTS > $output_objdir/$soname.def;
-	      cat $export_symbols >> $output_objdir/$soname.def;
-	    fi~
-	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd12*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix3-9*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ 1-5.* | *pgcpp\ 1-5.*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-		$RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# 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::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.0-5 | solaris2.0-5.*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.0-5 | solaris2.0-5.*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
-	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-	      '"$_LT_TAGVAR(reload_cmds, $1)"
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT($_LT_TAGVAR(ld_shlibs, $1))
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## 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
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-)# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun(_LT_FUNC_STRIPNAME_CNF,dnl
-AC_REQUIRE(_LT_DECL_SED)
-AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)
-func_stripname_cnf ()
-{
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-} # func_stripname_cnf
-)# _LT_FUNC_STRIPNAME_CNF
-
-# _LT_SYS_HIDDEN_LIBDEPS(TAGNAME)
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun(_LT_SYS_HIDDEN_LIBDEPS,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-AC_REQUIRE(_LT_FUNC_STRIPNAME_CNF)dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if($1, , cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-, $1, CXX, cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-, $1, F77, cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-, $1, FC, cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-, $1, GCJ, cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-)
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-esac
-
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if($1, CXX,
-case $host_os in
-interix3-9*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC* | sunCC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-)
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL(, compiler_lib_search_dirs, 1,
-    The directories searched by this compiler when creating a shared library)
-_LT_TAGDECL(, predep_objects, 1,
-    Dependencies to place before and after the objects being linked to
-    create a shared library)
-_LT_TAGDECL(, postdep_objects, 1)
-_LT_TAGDECL(, predeps, 1)
-_LT_TAGDECL(, postdeps, 1)
-_LT_TAGDECL(, compiler_lib_search_path, 1,
-    The library search path used internally by the compiler when linking
-    a shared library)
-)# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG(TAG)
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun(_LT_LANG_F77_CONFIG,
-AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${F77-"f77"}
-  CFLAGS=$FFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME($compiler)
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING(if libtool supports shared libraries)
-    AC_MSG_RESULT($can_build_shared)
-
-    AC_MSG_CHECKING(whether to build shared libraries)
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix4-9*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT($enable_shared)
-
-    AC_MSG_CHECKING(whether to build static libraries)
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT($enable_static)
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## 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
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-  CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-)# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG(TAG)
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun(_LT_LANG_FC_CONFIG,
-AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME($compiler)
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING(if libtool supports shared libraries)
-    AC_MSG_RESULT($can_build_shared)
-
-    AC_MSG_CHECKING(whether to build shared libraries)
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix4-9*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT($enable_shared)
-
-    AC_MSG_CHECKING(whether to build static libraries)
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT($enable_static)
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-)# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG(TAG)
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun(_LT_LANG_GCJ_CONFIG,
-AC_REQUIRE(LT_PROG_GCJ)dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME($compiler)
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-)# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_RC_CONFIG(TAG)
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun(_LT_LANG_RC_CONFIG,
-AC_REQUIRE(LT_PROG_RC)dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME($compiler)
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-)# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN(LT_PROG_GCJ,
-m4_ifdef(AC_PROG_GCJ, AC_PROG_GCJ,
-  m4_ifdef(AM_PROG_GCJ, AM_PROG_GCJ,
-    AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)))dnl
-)
-
-# Old name:
-AU_ALIAS(LT_AC_PROG_GCJ, LT_PROG_GCJ)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(LT_AC_PROG_GCJ, )
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN(LT_PROG_RC,
-AC_CHECK_TOOL(RC, windres,)
-)
-
-# Old name:
-AU_ALIAS(LT_AC_PROG_RC, LT_PROG_RC)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(LT_AC_PROG_RC, )
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun(_LT_DECL_EGREP,
-AC_REQUIRE(AC_PROG_EGREP)dnl
-AC_REQUIRE(AC_PROG_FGREP)dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL(, GREP, 1, A grep program that handles long lines)
-_LT_DECL(, EGREP, 1, An ERE matcher)
-_LT_DECL(, FGREP, 1, A literal string matcher)
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST(GREP)
-)
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun(_LT_DECL_OBJDUMP,
-AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL(, OBJDUMP, 1, An object symbol dumper)
-AC_SUBST(OBJDUMP)
-)
-
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun(_LT_DECL_DLLTOOL,
-AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL(, DLLTOOL, 1, DLL creation program)
-AC_SUBST(DLLTOOL)
-)
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun(_LT_DECL_SED,
-AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL(, SED, 1, A sed program that does not truncate output)
-_LT_DECL(, Xsed, "\$SED -e 1s/^X//",
-    Sed that helps us avoid accidentally triggering echo(1) options like -n)
-)# _LT_DECL_SED
-
-m4_ifndef(AC_PROG_SED, 
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-
-m4_defun(AC_PROG_SED,
-AC_MSG_CHECKING(for a sed that does not truncate output)
-AC_CACHE_VAL(lt_cv_path_SED,
-# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-)
-SED=$lt_cv_path_SED
-AC_SUBST(SED)
-AC_MSG_RESULT($SED)
-)#AC_PROG_SED
-)#m4_ifndef
-
-# Old name:
-AU_ALIAS(LT_AC_PROG_SED, AC_PROG_SED)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(LT_AC_PROG_SED, )
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun(_LT_CHECK_SHELL_FEATURES,
-AC_MSG_CHECKING(whether the shell understands some XSI constructs)
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT($xsi_shell)
-_LT_CONFIG_LIBTOOL_INIT(xsi_shell='$xsi_shell')
-
-AC_MSG_CHECKING(whether the shell understands "+=")
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT($lt_shell_append)
-_LT_CONFIG_LIBTOOL_INIT(lt_shell_append='$lt_shell_append')
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL(, lt_unset, 0, whether the shell understands "unset")dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL(SP2NL, lt_SP2NL, 1, turn spaces into newlines)dnl
-_LT_DECL(NL2SP, lt_NL2SP, 1, turn newlines into spaces)dnl
-)# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun(_LT_PROG_FUNCTION_REPLACE,
-dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts($2, $, \\, ^, \\\1)
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-)
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun(_LT_PROG_REPLACE_SHELLFNS,
-if test x"$xsi_shell" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE(func_dirname, dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac)
-
-  _LT_PROG_FUNCTION_REPLACE(func_basename, dnl
-    func_basename_result="${1##*/}")
-
-  _LT_PROG_FUNCTION_REPLACE(func_dirname_and_basename, dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac
-    func_basename_result="${1##*/}")
-
-  _LT_PROG_FUNCTION_REPLACE(func_stripname, dnl
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary parameter first.
-    func_stripname_result=${3}
-    func_stripname_result=${func_stripname_result#"${1}"}
-    func_stripname_result=${func_stripname_result%"${2}"})
-
-  _LT_PROG_FUNCTION_REPLACE(func_split_long_opt, dnl
-    func_split_long_opt_name=${1%%=*}
-    func_split_long_opt_arg=${1#*=})
-
-  _LT_PROG_FUNCTION_REPLACE(func_split_short_opt, dnl
-    func_split_short_opt_arg=${1#??}
-    func_split_short_opt_name=${1%"$func_split_short_opt_arg"})
-
-  _LT_PROG_FUNCTION_REPLACE(func_lo2o, dnl
-    case ${1} in
-      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-      *)    func_lo2o_result=${1} ;;
-    esac)
-
-  _LT_PROG_FUNCTION_REPLACE(func_xform,     func_xform_result=${1%.*}.lo)
-
-  _LT_PROG_FUNCTION_REPLACE(func_arith,     func_arith_result=$(( $* )))
-
-  _LT_PROG_FUNCTION_REPLACE(func_len,     func_len_result=${#1})
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE(func_append,     eval "${1}+=\\${2}")
-
-  _LT_PROG_FUNCTION_REPLACE(func_append_quoted, dnl
-    func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-    eval "${1}+=\\\\ \\$func_quote_for_eval_result")
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append $a-zA-Z_\{1,\}$ "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append $a-zA-Z_\{1,\}$ "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  AC_MSG_WARN(Unable to substitute extended shell functions in $ofile)
-fi
-)
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun(_LT_PATH_CONVERSION_FUNCTIONS,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-AC_REQUIRE(AC_CANONICAL_BUILD)dnl
-AC_MSG_CHECKING(how to convert $build file names to $host format)
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-)
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT($lt_cv_to_host_file_cmd)
-_LT_DECL(to_host_file_cmd, lt_cv_to_host_file_cmd,
-         0, convert $build file names to $host format)dnl
-
-AC_MSG_CHECKING(how to convert $build file names to toolchain format)
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-)
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT($lt_cv_to_tool_file_cmd)
-_LT_DECL(to_tool_file_cmd, lt_cv_to_tool_file_cmd,
-         0, convert $build files to toolchain format)dnl
-)# _LT_PATH_CONVERSION_FUNCTIONS
-
-# lock.m4 serial 10 (gettext-0.18)
-dnl Copyright (C) 2005-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN(gl_LOCK,
-
-  AC_REQUIRE(gl_THREADLIB)
-  if test "$gl_threads_api" = posix; then
-    # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
-    # pthread_rwlock_* functions.
-    AC_CHECK_TYPE(pthread_rwlock_t,
-      AC_DEFINE(HAVE_PTHREAD_RWLOCK, 1,
-         Define if the POSIX multithreading library has read/write locks.),
-      ,
-      #include <pthread.h>)
-    # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
-    AC_TRY_COMPILE(#include <pthread.h>,
-      #if __FreeBSD__ == 4
-error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
-#else
-int x = (int)PTHREAD_MUTEX_RECURSIVE;
-return !x;
-#endif,
-      AC_DEFINE(HAVE_PTHREAD_MUTEX_RECURSIVE, 1,
-         Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.))
-  fi
-  gl_PREREQ_LOCK
-)
-
-# Prerequisites of lib/lock.c.
-AC_DEFUN(gl_PREREQ_LOCK, 
-  AC_REQUIRE(AC_C_INLINE)
-)
-
-# longlong.m4 serial 14
-dnl Copyright (C) 1999-2007, 2009-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_LONG_LONG_INT if 'long long int' works.
-# This fixes a bug in Autoconf 2.61, but can be removed once we
-# assume 2.62 everywhere.
-
-# Note: If the type 'long long int' exists but is only 32 bits large
-# (as on some very old compilers), HAVE_LONG_LONG_INT will not be
-# defined. In this case you can treat 'long long int' like 'long int'.
-
-AC_DEFUN(AC_TYPE_LONG_LONG_INT,
-
-  AC_CACHE_CHECK(for long long int, ac_cv_type_long_long_int,
-    AC_LINK_IFELSE(
-       _AC_TYPE_LONG_LONG_SNIPPET,
-       dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
-        dnl If cross compiling, assume the bug isn't important, since
-        dnl nobody cross compiles for this platform as far as we know.
-        AC_RUN_IFELSE(
-          AC_LANG_PROGRAM(
-             @%:@include <limits.h>
-               @%:@ifndef LLONG_MAX
-               @%:@ define HALF \
-                        (1LL << (sizeof (long long int) * CHAR_BIT - 2))
-               @%:@ define LLONG_MAX (HALF - 1 + HALF)
-               @%:@endif,
-             long long int n = 1;
-               int i;
-               for (i = 0; ; i++)
-                 {
-                   long long int m = n << i;
-                   if (m >> i != n)
-                     return 1;
-                   if (LLONG_MAX / 2 < m)
-                     break;
-                 }
-               return 0;),
-          ac_cv_type_long_long_int=yes,
-          ac_cv_type_long_long_int=no,
-          ac_cv_type_long_long_int=yes),
-       ac_cv_type_long_long_int=no))
-  if test $ac_cv_type_long_long_int = yes; then
-    AC_DEFINE(HAVE_LONG_LONG_INT, 1,
-      Define to 1 if the system has the type `long long int'.)
-  fi
-)
-
-# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
-# This fixes a bug in Autoconf 2.61, but can be removed once we
-# assume 2.62 everywhere.
-
-# Note: If the type 'unsigned long long int' exists but is only 32 bits
-# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
-# will not be defined. In this case you can treat 'unsigned long long int'
-# like 'unsigned long int'.
-
-AC_DEFUN(AC_TYPE_UNSIGNED_LONG_LONG_INT,
-
-  AC_CACHE_CHECK(for unsigned long long int,
-    ac_cv_type_unsigned_long_long_int,
-    AC_LINK_IFELSE(
-       _AC_TYPE_LONG_LONG_SNIPPET,
-       ac_cv_type_unsigned_long_long_int=yes,
-       ac_cv_type_unsigned_long_long_int=no))
-  if test $ac_cv_type_unsigned_long_long_int = yes; then
-    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG_INT, 1,
-      Define to 1 if the system has the type `unsigned long long int'.)
-  fi
-)
-
-# Expands to a C program that can be used to test for simultaneous support
-# of 'long long' and 'unsigned long long'. We don't want to say that
-# 'long long' is available if 'unsigned long long' is not, or vice versa,
-# because too many programs rely on the symmetry between signed and unsigned
-# integer types (excluding 'bool').
-AC_DEFUN(_AC_TYPE_LONG_LONG_SNIPPET,
-
-  AC_LANG_PROGRAM(
-    /* For now, do not test the preprocessor; as of 2007 there are too many
-         implementations with broken preprocessors.  Perhaps this can
-         be revisited in 2012.  In the meantime, code should not expect
-         #if to work with literals wider than 32 bits.  */
-      /* Test literals.  */
-      long long int ll = 9223372036854775807ll;
-      long long int nll = -9223372036854775807LL;
-      unsigned long long int ull = 18446744073709551615ULL;
-      /* Test constant expressions.   */
-      typedef int a((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
-                     ? 1 : -1);
-      typedef int b(18446744073709551615ULL <= (unsigned long long int) -1
-                     ? 1 : -1);
-      int i = 63;,
-    /* Test availability of runtime routines for shift and division.  */
-      long long int llmax = 9223372036854775807ll;
-      unsigned long long int ullmax = 18446744073709551615ull;
-      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
-              | (llmax / ll) | (llmax % ll)
-              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
-              | (ullmax / ull) | (ullmax % ull));)
-)
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-#   Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 7 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN(LTOPTIONS_VERSION, m4_if(1))
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define(_LT_MANGLE_OPTION,
-_LT_OPTION_m4_bpatsubst($1__$2, ^a-zA-Z0-9_, _))
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define(_LT_SET_OPTION,
-m4_define(_LT_MANGLE_OPTION($1, $2))dnl
-m4_ifdef(_LT_MANGLE_DEFUN($1, $2),
-        _LT_MANGLE_DEFUN($1, $2),
-    m4_warning(Unknown $1 option `$2'))dnl
-)
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, IF-NOT-SET)
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define(_LT_IF_OPTION,
-m4_ifdef(_LT_MANGLE_OPTION($1, $2), $3, $4))
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define(_LT_UNLESS_OPTIONS,
-m4_foreach(_LT_Option, m4_split(m4_normalize($2)),
-	    m4_ifdef(_LT_MANGLE_OPTION($1, _LT_Option),
-		      m4_define($0_found)))dnl
-m4_ifdef($0_found, m4_undefine($0_found), $3
-)dnl
-)
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun(_LT_SET_OPTIONS,
-# Set options
-m4_foreach(_LT_Option, m4_split(m4_normalize($2)),
-    _LT_SET_OPTION($1, _LT_Option))
-
-m4_if($1,LT_INIT,
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS(LT_INIT, dlopen, enable_dlopen=no
-  )
-  _LT_UNLESS_OPTIONS(LT_INIT, win32-dll, enable_win32_dll=no
-  )
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS(LT_INIT, shared disable-shared, _LT_ENABLE_SHARED)
-  _LT_UNLESS_OPTIONS(LT_INIT, static disable-static, _LT_ENABLE_STATIC)
-  _LT_UNLESS_OPTIONS(LT_INIT, pic-only no-pic, _LT_WITH_PIC)
-  _LT_UNLESS_OPTIONS(LT_INIT, fast-install disable-fast-install,
-  		   _LT_ENABLE_FAST_INSTALL)
-  )
-)# _LT_SET_OPTIONS
-
-
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define(_LT_MANGLE_DEFUN,
-_LT_OPTION_DEFUN_m4_bpatsubst(m4_toupper($1__$2), ^A-Z0-9_, _))
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define(LT_OPTION_DEFINE,
-m4_define(_LT_MANGLE_DEFUN($1, $2), $3)dnl
-)# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE(LT_INIT, dlopen, enable_dlopen=yes
-)
-
-AU_DEFUN(AC_LIBTOOL_DLOPEN,
-_LT_SET_OPTION(LT_INIT, dlopen)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.)
-)
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_DLOPEN, )
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE(LT_INIT, win32-dll,
-enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL(, AS,      1, Assembler program)dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL(, DLLTOOL, 1, DLL creation program)dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL(, OBJDUMP, 1, Object dumper program)dnl
-)# win32-dll
-
-AU_DEFUN(AC_LIBTOOL_WIN32_DLL,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-_LT_SET_OPTION(LT_INIT, win32-dll)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.)
-)
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_WIN32_DLL, )
-
-
-# _LT_ENABLE_SHARED(DEFAULT)
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define(_LT_ENABLE_SHARED,
-m4_define(_LT_ENABLE_SHARED_DEFAULT, m4_if($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-    AS_HELP_STRING(--enable-shared@<:@=PKGS@:>@,
-	build shared libraries @<:@default=_LT_ENABLE_SHARED_DEFAULT@:>@),
-    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,
-    enable_shared=_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL(build_libtool_libs, enable_shared, 0,
-	Whether or not to build shared libraries)
-)# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE(LT_INIT, shared, _LT_ENABLE_SHARED(yes))
-LT_OPTION_DEFINE(LT_INIT, disable-shared, _LT_ENABLE_SHARED(no))
-
-# Old names:
-AC_DEFUN(AC_ENABLE_SHARED,
-_LT_SET_OPTION(LT_INIT, m4_if($1, no, disable-)shared)
-)
-
-AC_DEFUN(AC_DISABLE_SHARED,
-_LT_SET_OPTION(LT_INIT, disable-shared)
-)
-
-AU_DEFUN(AM_ENABLE_SHARED, AC_ENABLE_SHARED($@))
-AU_DEFUN(AM_DISABLE_SHARED, AC_DISABLE_SHARED($@))
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AM_ENABLE_SHARED, )
-dnl AC_DEFUN(AM_DISABLE_SHARED, )
-
-
-
-# _LT_ENABLE_STATIC(DEFAULT)
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define(_LT_ENABLE_STATIC,
-m4_define(_LT_ENABLE_STATIC_DEFAULT, m4_if($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-    AS_HELP_STRING(--enable-static@<:@=PKGS@:>@,
-	build static libraries @<:@default=_LT_ENABLE_STATIC_DEFAULT@:>@),
-    p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=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_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac,
-    enable_static=_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL(build_old_libs, enable_static, 0,
-	Whether or not to build static libraries)
-)# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE(LT_INIT, static, _LT_ENABLE_STATIC(yes))
-LT_OPTION_DEFINE(LT_INIT, disable-static, _LT_ENABLE_STATIC(no))
-
-# Old names:
-AC_DEFUN(AC_ENABLE_STATIC,
-_LT_SET_OPTION(LT_INIT, m4_if($1, no, disable-)static)
-)
-
-AC_DEFUN(AC_DISABLE_STATIC,
-_LT_SET_OPTION(LT_INIT, disable-static)
-)
-
-AU_DEFUN(AM_ENABLE_STATIC, AC_ENABLE_STATIC($@))
-AU_DEFUN(AM_DISABLE_STATIC, AC_DISABLE_STATIC($@))
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AM_ENABLE_STATIC, )
-dnl AC_DEFUN(AM_DISABLE_STATIC, )
-
-
-
-# _LT_ENABLE_FAST_INSTALL(DEFAULT)
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define(_LT_ENABLE_FAST_INSTALL,
-m4_define(_LT_ENABLE_FAST_INSTALL_DEFAULT, m4_if($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-    AS_HELP_STRING(--enable-fast-install@<:@=PKGS@:>@,
-    optimize for fast installation @<:@default=_LT_ENABLE_FAST_INSTALL_DEFAULT@:>@),
-    p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac,
-    enable_fast_install=_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL(fast_install, enable_fast_install, 0,
-	 Whether or not to optimize for fast installation)dnl
-)# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE(LT_INIT, fast-install, _LT_ENABLE_FAST_INSTALL(yes))
-LT_OPTION_DEFINE(LT_INIT, disable-fast-install, _LT_ENABLE_FAST_INSTALL(no))
-
-# Old names:
-AU_DEFUN(AC_ENABLE_FAST_INSTALL,
-_LT_SET_OPTION(LT_INIT, m4_if($1, no, disable-)fast-install)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.)
-)
-
-AU_DEFUN(AC_DISABLE_FAST_INSTALL,
-_LT_SET_OPTION(LT_INIT, disable-fast-install)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.)
-)
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_ENABLE_FAST_INSTALL, )
-dnl AC_DEFUN(AM_DISABLE_FAST_INSTALL, )
-
-
-# _LT_WITH_PIC(MODE)
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define(_LT_WITH_PIC,
-AC_ARG_WITH(pic,
-    AS_HELP_STRING(--with-pic,
-	try to use only PIC/non-PIC objects @<:@default=use both@:>@),
-    pic_mode="$withval",
-    pic_mode=default)
-
-test -z "$pic_mode" && pic_mode=m4_default($1, default)
-
-_LT_DECL(, pic_mode, 0, What type of objects to build)dnl
-)# _LT_WITH_PIC
-
-LT_OPTION_DEFINE(LT_INIT, pic-only, _LT_WITH_PIC(yes))
-LT_OPTION_DEFINE(LT_INIT, no-pic, _LT_WITH_PIC(no))
-
-# Old name:
-AU_DEFUN(AC_LIBTOOL_PICMODE,
-_LT_SET_OPTION(LT_INIT, pic-only)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.)
-)
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_PICMODE, )
-
-
-m4_define(_LTDL_MODE, )
-LT_OPTION_DEFINE(LTDL_INIT, nonrecursive,
-		 m4_define(_LTDL_MODE, nonrecursive))
-LT_OPTION_DEFINE(LTDL_INIT, recursive,
-		 m4_define(_LTDL_MODE, recursive))
-LT_OPTION_DEFINE(LTDL_INIT, subproject,
-		 m4_define(_LTDL_MODE, subproject))
-
-m4_define(_LTDL_TYPE, )
-LT_OPTION_DEFINE(LTDL_INIT, installable,
-		 m4_define(_LTDL_TYPE, installable))
-LT_OPTION_DEFINE(LTDL_INIT, convenience,
-		 m4_define(_LTDL_TYPE, convenience))
-
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN(LTSUGAR_VERSION, m4_if(0.1))
-
-
-# lt_join(SEP, ARG1, ARG2...)
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting  arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define(lt_join,
-m4_if($#, 1, ,
-       $#, 2, $2,
-       m4_if($2, , , $2_)$0($1, m4_shift(m4_shift($@)))))
-m4_define(_lt_join,
-m4_if($#$2, 2, ,
-       m4_if($2, , , $1$2)$0($1, m4_shift(m4_shift($@)))))
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define(lt_car, $1)
-m4_define(lt_cdr,
-m4_if($#, 0, m4_fatal($0: cannot be called without arguments),
-       $#, 1, ,
-       m4_dquote(m4_shift($@))))
-m4_define(lt_unquote, $1)
-
-
-# lt_append(MACRO-NAME, STRING, SEPARATOR)
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define(lt_append,
-m4_define($1,
-	   m4_ifdef($1, m4_defn($1)$3)$2))
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, SUFFIX2...)
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define(lt_combine,
-m4_if(m4_eval($# > 3), 1,
-       m4_pushdef(_Lt_sep, m4_define(_Lt_sep, m4_defn(lt_car)))dnl
-m4_foreach(_Lt_prefix, $2,
-	     m4_foreach(_Lt_suffix,
-		m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@))))),
-	_Lt_sep($1)m4_defn(_Lt_prefix)$3m4_defn(_Lt_suffix)))))
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, SEPARATOR, UNIQ, NOT-UNIQ)
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define(lt_if_append_uniq,
-m4_ifdef($1,
-	  m4_if(m4_index($3m4_defn($1)$3, $3$2$3), -1,
-		 lt_append($1, $2, $3)$4,
-		 $5),
-	  lt_append($1, $2, $3)$4))
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define(lt_dict_add,
-m4_define($1($2), $3))
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define(lt_dict_add_subkey,
-m4_define($1($2:$3), $4))
-
-
-# lt_dict_fetch(DICT, KEY, SUBKEY)
-# ----------------------------------
-m4_define(lt_dict_fetch,
-m4_ifval($3,
-	m4_ifdef($1($2:$3), m4_defn($1($2:$3))),
-    m4_ifdef($1($2), m4_defn($1($2)))))
-
-
-# lt_if_dict_fetch(DICT, KEY, SUBKEY, VALUE, IF-TRUE, IF-FALSE)
-# -----------------------------------------------------------------
-m4_define(lt_if_dict_fetch,
-m4_if(lt_dict_fetch($1, $2, $3), $4,
-	$5,
-    $6))
-
-
-# lt_dict_filter(DICT, SUBKEY, VALUE, SEPARATOR, KEY, ...)
-# --------------------------------------------------------------
-m4_define(lt_dict_filter,
-m4_if($5, , ,
-  lt_join(m4_quote(m4_default($4, , )),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car(m4_shiftn(4, $@)),
-		      lt_if_dict_fetch($1, _Lt_key, $2, $3, _Lt_key )))))))dnl
-)
-
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# @configure_input@
-
-# serial 3293 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define(LT_PACKAGE_VERSION, 2.4)
-m4_define(LT_PACKAGE_REVISION, 1.3293)
-
-AC_DEFUN(LTVERSION_VERSION,
-macro_version='2.4'
-macro_revision='1.3293'
-_LT_DECL(, macro_version, 0, Which release of libtool.m4 was used?)
-_LT_DECL(, macro_revision, 0)
-)
-
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN(LTOBSOLETE_VERSION, m4_if(1))
-
-m4_ifndef(AC_LIBTOOL_LINKER_OPTION,	AC_DEFUN(AC_LIBTOOL_LINKER_OPTION))
-m4_ifndef(AC_PROG_EGREP,		AC_DEFUN(AC_PROG_EGREP))
-m4_ifndef(_LT_AC_PROG_ECHO_BACKSLASH,	AC_DEFUN(_LT_AC_PROG_ECHO_BACKSLASH))
-m4_ifndef(_LT_AC_SHELL_INIT,		AC_DEFUN(_LT_AC_SHELL_INIT))
-m4_ifndef(_LT_AC_SYS_LIBPATH_AIX,	AC_DEFUN(_LT_AC_SYS_LIBPATH_AIX))
-m4_ifndef(_LT_PROG_LTMAIN,		AC_DEFUN(_LT_PROG_LTMAIN))
-m4_ifndef(_LT_AC_TAGVAR,		AC_DEFUN(_LT_AC_TAGVAR))
-m4_ifndef(AC_LTDL_ENABLE_INSTALL,	AC_DEFUN(AC_LTDL_ENABLE_INSTALL))
-m4_ifndef(AC_LTDL_PREOPEN,		AC_DEFUN(AC_LTDL_PREOPEN))
-m4_ifndef(_LT_AC_SYS_COMPILER,	AC_DEFUN(_LT_AC_SYS_COMPILER))
-m4_ifndef(_LT_AC_LOCK,		AC_DEFUN(_LT_AC_LOCK))
-m4_ifndef(AC_LIBTOOL_SYS_OLD_ARCHIVE,	AC_DEFUN(AC_LIBTOOL_SYS_OLD_ARCHIVE))
-m4_ifndef(_LT_AC_TRY_DLOPEN_SELF,	AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF))
-m4_ifndef(AC_LIBTOOL_PROG_CC_C_O,	AC_DEFUN(AC_LIBTOOL_PROG_CC_C_O))
-m4_ifndef(AC_LIBTOOL_SYS_HARD_LINK_LOCKS, AC_DEFUN(AC_LIBTOOL_SYS_HARD_LINK_LOCKS))
-m4_ifndef(AC_LIBTOOL_OBJDIR,		AC_DEFUN(AC_LIBTOOL_OBJDIR))
-m4_ifndef(AC_LTDL_OBJDIR,		AC_DEFUN(AC_LTDL_OBJDIR))
-m4_ifndef(AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH, AC_DEFUN(AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH))
-m4_ifndef(AC_LIBTOOL_SYS_LIB_STRIP,	AC_DEFUN(AC_LIBTOOL_SYS_LIB_STRIP))
-m4_ifndef(AC_PATH_MAGIC,		AC_DEFUN(AC_PATH_MAGIC))
-m4_ifndef(AC_PROG_LD_GNU,		AC_DEFUN(AC_PROG_LD_GNU))
-m4_ifndef(AC_PROG_LD_RELOAD_FLAG,	AC_DEFUN(AC_PROG_LD_RELOAD_FLAG))
-m4_ifndef(AC_DEPLIBS_CHECK_METHOD,	AC_DEFUN(AC_DEPLIBS_CHECK_METHOD))
-m4_ifndef(AC_LIBTOOL_PROG_COMPILER_NO_RTTI, AC_DEFUN(AC_LIBTOOL_PROG_COMPILER_NO_RTTI))
-m4_ifndef(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE, AC_DEFUN(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE))
-m4_ifndef(AC_LIBTOOL_PROG_COMPILER_PIC, AC_DEFUN(AC_LIBTOOL_PROG_COMPILER_PIC))
-m4_ifndef(AC_LIBTOOL_PROG_LD_SHLIBS,	AC_DEFUN(AC_LIBTOOL_PROG_LD_SHLIBS))
-m4_ifndef(AC_LIBTOOL_POSTDEP_PREDEP,	AC_DEFUN(AC_LIBTOOL_POSTDEP_PREDEP))
-m4_ifndef(LT_AC_PROG_EGREP,		AC_DEFUN(LT_AC_PROG_EGREP))
-m4_ifndef(LT_AC_PROG_SED,		AC_DEFUN(LT_AC_PROG_SED))
-m4_ifndef(_LT_CC_BASENAME,		AC_DEFUN(_LT_CC_BASENAME))
-m4_ifndef(_LT_COMPILER_BOILERPLATE,	AC_DEFUN(_LT_COMPILER_BOILERPLATE))
-m4_ifndef(_LT_LINKER_BOILERPLATE,	AC_DEFUN(_LT_LINKER_BOILERPLATE))
-m4_ifndef(_AC_PROG_LIBTOOL,		AC_DEFUN(_AC_PROG_LIBTOOL))
-m4_ifndef(AC_LIBTOOL_SETUP,		AC_DEFUN(AC_LIBTOOL_SETUP))
-m4_ifndef(_LT_AC_CHECK_DLFCN,		AC_DEFUN(_LT_AC_CHECK_DLFCN))
-m4_ifndef(AC_LIBTOOL_SYS_DYNAMIC_LINKER,	AC_DEFUN(AC_LIBTOOL_SYS_DYNAMIC_LINKER))
-m4_ifndef(_LT_AC_TAGCONFIG,		AC_DEFUN(_LT_AC_TAGCONFIG))
-m4_ifndef(AC_DISABLE_FAST_INSTALL,	AC_DEFUN(AC_DISABLE_FAST_INSTALL))
-m4_ifndef(_LT_AC_LANG_CXX,		AC_DEFUN(_LT_AC_LANG_CXX))
-m4_ifndef(_LT_AC_LANG_F77,		AC_DEFUN(_LT_AC_LANG_F77))
-m4_ifndef(_LT_AC_LANG_GCJ,		AC_DEFUN(_LT_AC_LANG_GCJ))
-m4_ifndef(AC_LIBTOOL_LANG_C_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_C_CONFIG))
-m4_ifndef(_LT_AC_LANG_C_CONFIG,	AC_DEFUN(_LT_AC_LANG_C_CONFIG))
-m4_ifndef(AC_LIBTOOL_LANG_CXX_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_CXX_CONFIG))
-m4_ifndef(_LT_AC_LANG_CXX_CONFIG,	AC_DEFUN(_LT_AC_LANG_CXX_CONFIG))
-m4_ifndef(AC_LIBTOOL_LANG_F77_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_F77_CONFIG))
-m4_ifndef(_LT_AC_LANG_F77_CONFIG,	AC_DEFUN(_LT_AC_LANG_F77_CONFIG))
-m4_ifndef(AC_LIBTOOL_LANG_GCJ_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_GCJ_CONFIG))
-m4_ifndef(_LT_AC_LANG_GCJ_CONFIG,	AC_DEFUN(_LT_AC_LANG_GCJ_CONFIG))
-m4_ifndef(AC_LIBTOOL_LANG_RC_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_RC_CONFIG))
-m4_ifndef(_LT_AC_LANG_RC_CONFIG,	AC_DEFUN(_LT_AC_LANG_RC_CONFIG))
-m4_ifndef(AC_LIBTOOL_CONFIG,		AC_DEFUN(AC_LIBTOOL_CONFIG))
-m4_ifndef(_LT_AC_FILE_LTDLL_C,	AC_DEFUN(_LT_AC_FILE_LTDLL_C))
-m4_ifndef(_LT_REQUIRED_DARWIN_CHECKS,	AC_DEFUN(_LT_REQUIRED_DARWIN_CHECKS))
-m4_ifndef(_LT_AC_PROG_CXXCPP,		AC_DEFUN(_LT_AC_PROG_CXXCPP))
-m4_ifndef(_LT_PREPARE_SED_QUOTE_VARS,	AC_DEFUN(_LT_PREPARE_SED_QUOTE_VARS))
-m4_ifndef(_LT_PROG_ECHO_BACKSLASH,	AC_DEFUN(_LT_PROG_ECHO_BACKSLASH))
-m4_ifndef(_LT_PROG_F77,		AC_DEFUN(_LT_PROG_F77))
-m4_ifndef(_LT_PROG_FC,		AC_DEFUN(_LT_PROG_FC))
-m4_ifndef(_LT_PROG_CXX,		AC_DEFUN(_LT_PROG_CXX))
-
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ(2.50)
-
-AC_DEFUN(AM_NLS,
-
-  AC_MSG_CHECKING(whether NLS is requested)
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE(nls,
-      --disable-nls           do not use Native Language Support,
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT($USE_NLS)
-  AC_SUBST(USE_NLS)
-)
-
-# po.m4 serial 17 (gettext-0.18)
-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ(2.50)
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN(AM_PO_SUBDIRS,
-
-  AC_REQUIRE(AC_PROG_MAKE_SET)dnl
-  AC_REQUIRE(AC_PROG_INSTALL)dnl
-  AC_REQUIRE(AM_PROG_MKDIR_P)dnl defined by automake
-  AC_REQUIRE(AM_NLS)dnl
-
-  dnl Release version of the gettext macros. This is used to ensure that
-  dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST(GETTEXT_MACRO_VERSION, 0.18)
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    $ac_dir/$ac_word --statistics /dev/null >&AS_MESSAGE_LOG_FD 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi),
-    :)
-  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-  dnl Test whether it is GNU msgfmt >= 0.15.
-changequote(,)dnl
-  case `$MSGFMT --version | sed 1q | sed -e 's,^^0-9*,,'` in
-    '' | 0.0-9 | 0.0-9.* | 0.10-4 | 0.10-4.*) MSGFMT_015=: ;;
-    *) MSGFMT_015=$MSGFMT ;;
-  esac
-changequote(,)dnl
-  AC_SUBST(MSGFMT_015)
-changequote(,)dnl
-  case `$GMSGFMT --version | sed 1q | sed -e 's,^^0-9*,,'` in
-    '' | 0.0-9 | 0.0-9.* | 0.10-4 | 0.10-4.*) GMSGFMT_015=: ;;
-    *) GMSGFMT_015=$GMSGFMT ;;
-  esac
-changequote(,)dnl
-  AC_SUBST(GMSGFMT_015)
-
-  dnl Search for GNU xgettext 0.12 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&AS_MESSAGE_LOG_FD 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi),
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Test whether it is GNU xgettext >= 0.15.
-changequote(,)dnl
-  case `$XGETTEXT --version | sed 1q | sed -e 's,^^0-9*,,'` in
-    '' | 0.0-9 | 0.0-9.* | 0.10-4 | 0.10-4.*) XGETTEXT_015=: ;;
-    *) XGETTEXT_015=$XGETTEXT ;;
-  esac
-changequote(,)dnl
-  AC_SUBST(XGETTEXT_015)
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    $ac_dir/$ac_word --update -q /dev/null /dev/null >&AS_MESSAGE_LOG_FD 2>&1, :)
-
-  dnl Installation directories.
-  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
-  dnl have to define it here, so that it can be used in po/Makefile.
-  test -n "$localedir" || localedir='${datadir}/locale'
-  AC_SUBST(localedir)
-
-  dnl Support for AM_XGETTEXT_OPTION.
-  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-  AC_SUBST(XGETTEXT_EXTRA_OPTIONS)
-
-  AC_CONFIG_COMMANDS(po-directories, 
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile:infile:infile..."
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/^/^/*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/^/*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        # Treat a directory as a PO directory if and only if it has a
-        # POTFILES.in file. This allows packages to have multiple PO
-        # directories under different names or in different locations.
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^ 	*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done,
-   # Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake < 1.5.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   )
-)
-
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN(AM_POSTPROCESS_PO_MAKEFILE,
-
-  # When this code is run, in config.status, two variables have already been
-  # set:
-  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
-  # - LINGUAS is the value of the environment variable LINGUAS at configure
-  #   time.
-
-changequote(,)dnl
-  # Adjust a relative srcdir.
-  ac_dir=`echo "$ac_file"|sed 's%/^/^/*$%%'`
-  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-  ac_dots=`echo "$ac_dir_suffix"|sed 's%/^/*%../%g'`
-  # In autoconf-2.13 it is called $ac_given_srcdir.
-  # In autoconf-2.50 it is called $srcdir.
-  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-  case "$ac_given_srcdir" in
-    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-    /*) top_srcdir="$ac_given_srcdir" ;;
-    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  # Find a way to echo strings without interpreting backslash.
-  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
-    gt_echo='echo'
-  else
-    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
-      gt_echo='printf %s\n'
-    else
-      echo_func () {
-        cat <<EOT
-$*
-EOT
-      }
-      gt_echo='echo_func'
-    fi
-  fi
-
-  # A sed script that extracts the value of VARIABLE from a Makefile.
-  sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^	 *VARIABLE	 *=/{
-  # Seen the first line of the variable definition.
-  s/^	 *VARIABLE	 *=//
-  ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote(,)dnl
-
-  # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
-  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
-  # Compute POTFILES_DEPS as
-  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-  POTFILES_DEPS=
-  for file in $POTFILES; do
-    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
-  done
-  POMAKEFILEDEPS=""
-
-  if test -n "$OBSOLETE_ALL_LINGUAS"; then
-    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-  fi
-  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-    # The LINGUAS file contains the set of available languages.
-    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-  else
-    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
-    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
-  fi
-  # Hide the ALL_LINGUAS assigment from automake < 1.5.
-  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-  # Compute POFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-  # Compute UPDATEPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-  # Compute DUMMYPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-  # Compute GMOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-  # Compute PROPERTIESFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
-  # Compute CLASSFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
-  # Compute QMFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
-  # Compute MSGFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
-  # Compute RESOURCESDLLFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
-  case "$ac_given_srcdir" in
-    .) srcdirpre= ;;
-    *) srcdirpre='$(srcdir)/' ;;
-  esac
-  POFILES=
-  UPDATEPOFILES=
-  DUMMYPOFILES=
-  GMOFILES=
-  PROPERTIESFILES=
-  CLASSFILES=
-  QMFILES=
-  MSGFILES=
-  RESOURCESDLLFILES=
-  for lang in $ALL_LINGUAS; do
-    POFILES="$POFILES $srcdirpre$lang.po"
-    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
-    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
-    QMFILES="$QMFILES $srcdirpre$lang.qm"
-    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
-  done
-  # CATALOGS depends on both $ac_dir and the user's LINGUAS
-  # environment variable.
-  INST_LINGUAS=
-  if test -n "$ALL_LINGUAS"; then
-    for presentlang in $ALL_LINGUAS; do
-      useit=no
-      if test "%UNSET%" != "$LINGUAS"; then
-        desiredlanguages="$LINGUAS"
-      else
-        desiredlanguages="$ALL_LINGUAS"
-      fi
-      for desiredlang in $desiredlanguages; do
-        # Use the presentlang catalog if desiredlang is
-        #   a. equal to presentlang, or
-        #   b. a variant of presentlang (because in this case,
-        #      presentlang can be used as a fallback for messages
-        #      which are not translated in the desiredlang catalog).
-        case "$desiredlang" in
-          "$presentlang"*) useit=yes;;
-        esac
-      done
-      if test $useit = yes; then
-        INST_LINGUAS="$INST_LINGUAS $presentlang"
-      fi
-    done
-  fi
-  CATALOGS=
-  JAVACATALOGS=
-  QTCATALOGS=
-  TCLCATALOGS=
-  CSHARPCATALOGS=
-  if test -n "$INST_LINGUAS"; then
-    for lang in $INST_LINGUAS; do
-      CATALOGS="$CATALOGS $lang.gmo"
-      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
-      QTCATALOGS="$QTCATALOGS $lang.qm"
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
-    done
-  fi
-
-  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
-  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
-	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if test -n "$POMAKEFILEDEPS"; then
-    cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
-  fi
-  mv "$ac_file.tmp" "$ac_file"
-)
-
-dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
-AC_DEFUN(AM_XGETTEXT_OPTION_INIT,
-
-  XGETTEXT_EXTRA_OPTIONS=
-)
-
-dnl Registers an option to be passed to xgettext in the po subdirectory.
-AC_DEFUN(AM_XGETTEXT_OPTION,
-
-  AC_REQUIRE(AM_XGETTEXT_OPTION_INIT)
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
-)
-
-# printf-posix.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 2003, 2007, 2009-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether the printf() function supports POSIX/XSI format strings with
-dnl positions.
-
-AC_DEFUN(gt_PRINTF_POSIX,
-
-  AC_REQUIRE(AC_PROG_CC)
-  AC_CACHE_CHECK(whether printf() supports POSIX/XSI format strings,
-    gt_cv_func_printf_posix,
-    
-      AC_TRY_RUN(
-#include <stdio.h>
-#include <string.h>
-/* The string "%2$d %1$d", with dollar characters protected from the shell's
-   dollar expansion (possibly an autoconf bug).  */
-static char format = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
-static char buf100;
-int main ()
-{
-  sprintf (buf, format, 33, 55);
-  return (strcmp (buf, "55 33") != 0);
-}, gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
-      
-        AC_EGREP_CPP(notposix, 
-#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
-  notposix
-#endif
-          ,
-          gt_cv_func_printf_posix="guessing no",
-          gt_cv_func_printf_posix="guessing yes")
-      )
-    )
-  case $gt_cv_func_printf_posix in
-    *yes)
-      AC_DEFINE(HAVE_POSIX_PRINTF, 1,
-        Define if your printf() function supports format strings with positions.)
-      ;;
-  esac
-)
-
-# progtest.m4 serial 6 (gettext-0.18)
-dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-AC_PREREQ(2.50)
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM , VALUE-IF-NOT-FOUND , PATH)
-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=$2
-AC_MSG_CHECKING(for $ac_word)
-AC_CACHE_VAL(ac_cv_path_$1,
-case "$$1" in
-  \\/* | ?:\\/*)
-    ac_cv_path_$1="$$1" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in ifelse($5, , $PATH, $5); do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
-          if $3; then
-            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse($4, , ,   test -z "$ac_cv_path_$1" && ac_cv_path_$1="$4"
-)dnl
-    ;;
-esac)dnl
-$1="$ac_cv_path_$1"
-if test ifelse($4, , -n "$$1", "$$1" != "$4"); then
-  AC_MSG_RESULT($$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-)
-
-# size_max.m4 serial 9
-dnl Copyright (C) 2003, 2005-2006, 2008-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN(gl_SIZE_MAX,
-
-  AC_CHECK_HEADERS(stdint.h)
-  dnl First test whether the system already has SIZE_MAX.
-  AC_CACHE_CHECK(for SIZE_MAX, gl_cv_size_max, 
-    gl_cv_size_max=
-    AC_EGREP_CPP(Found it, 
-#include <limits.h>
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef SIZE_MAX
-Found it
-#endif
-, gl_cv_size_max=yes)
-    if test -z "$gl_cv_size_max"; then
-      dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
-      dnl than the type 'unsigned long'. Try hard to find a definition that can
-      dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
-      AC_COMPUTE_INT(size_t_bits_minus_1, sizeof (size_t) * CHAR_BIT - 1,
-        #include <stddef.h>
-#include <limits.h>, size_t_bits_minus_1=)
-      AC_COMPUTE_INT(fits_in_uint, sizeof (size_t) <= sizeof (unsigned int),
-        #include <stddef.h>, fits_in_uint=)
-      if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
-        if test $fits_in_uint = 1; then
-          dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
-          dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
-          AC_TRY_COMPILE(#include <stddef.h>
-            extern size_t foo;
-            extern unsigned long foo;
-            , , fits_in_uint=0)
-        fi
-        dnl We cannot use 'expr' to simplify this expression, because 'expr'
-        dnl works only with 'long' integers in the host environment, while we
-        dnl might be cross-compiling from a 32-bit platform to a 64-bit platform.
-        if test $fits_in_uint = 1; then
-          gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
-        else
-          gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
-        fi
-      else
-        dnl Shouldn't happen, but who knows...
-        gl_cv_size_max='((size_t)~(size_t)0)'
-      fi
-    fi
-  )
-  if test "$gl_cv_size_max" != yes; then
-    AC_DEFINE_UNQUOTED(SIZE_MAX, $gl_cv_size_max,
-      Define as the maximum value of type 'size_t', if the system doesn't define it.)
-  fi
-  dnl Don't redefine SIZE_MAX in config.h if config.h is re-included after
-  dnl <stdint.h>. Remember that the #undef in AH_VERBATIM gets replaced with
-  dnl #define by AC_DEFINE_UNQUOTED.
-  AH_VERBATIM(SIZE_MAX,
-/* Define as the maximum value of type 'size_t', if the system doesn't define
-   it. */
-#ifndef SIZE_MAX
-# undef SIZE_MAX
-#endif)
-)
-
-dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
-dnl Remove this when we can assume autoconf >= 2.61.
-m4_ifdef(AC_COMPUTE_INT, , 
-  AC_DEFUN(AC_COMPUTE_INT, _AC_COMPUTE_INT($2,$1,$3,$4))
-)
-
-# stdint_h.m4 serial 8
-dnl Copyright (C) 1997-2004, 2006, 2008-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN(gl_AC_HEADER_STDINT_H,
-
-  AC_CACHE_CHECK(for stdint.h, gl_cv_header_stdint_h,
-  AC_TRY_COMPILE(
-    #include <sys/types.h>
-#include <stdint.h>,
-    uintmax_t i = (uintmax_t) -1; return !i;,
-    gl_cv_header_stdint_h=yes,
-    gl_cv_header_stdint_h=no))
-  if test $gl_cv_header_stdint_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-      Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-       and declares uintmax_t. )
-  fi
-)
-
-# threadlib.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 2005-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl gl_THREADLIB
-dnl ------------
-dnl Tests for a multithreading library to be used.
-dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
-dnl USE_PTH_THREADS, USE_WIN32_THREADS
-dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
-dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
-dnl libtool).
-dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
-dnl programs that really need multithread functionality. The difference
-dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
-dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread".
-dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
-dnl multithread-safe programs.
-
-AC_DEFUN(gl_THREADLIB_EARLY,
-
-  AC_REQUIRE(gl_THREADLIB_EARLY_BODY)
-)
-
-dnl The guts of gl_THREADLIB_EARLY. Needs to be expanded only once.
-
-AC_DEFUN(gl_THREADLIB_EARLY_BODY,
-
-  dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
-  dnl influences the result of the autoconf tests that test for *_unlocked
-  dnl declarations, on AIX 5 at least. Therefore it must come early.
-  AC_BEFORE($0, gl_FUNC_GLIBC_UNLOCKED_IO)dnl
-  AC_BEFORE($0, gl_ARGP)dnl
-
-  AC_REQUIRE(AC_CANONICAL_HOST)
-  dnl _GNU_SOURCE is needed for pthread_rwlock_t on glibc systems.
-  dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
-  dnl AC_GNU_SOURCE.
-  m4_ifdef(AC_USE_SYSTEM_EXTENSIONS,
-    AC_REQUIRE(AC_USE_SYSTEM_EXTENSIONS),
-    AC_REQUIRE(AC_GNU_SOURCE))
-  dnl Check for multithreading.
-  m4_divert_text(DEFAULTS, gl_use_threads_default=)
-  AC_ARG_ENABLE(threads,
-AC_HELP_STRING(--enable-threads={posix|solaris|pth|win32}, specify multithreading API)
-AC_HELP_STRING(--disable-threads, build without multithread safety),
-    gl_use_threads=$enableval,
-    if test -n "$gl_use_threads_default"; then
-       gl_use_threads="$gl_use_threads_default"
-     else
-changequote(,)dnl
-       case "$host_os" in
-         dnl Disable multithreading by default on OSF/1, because it interferes
-         dnl with fork()/exec(): When msgexec is linked with -lpthread, its
-         dnl child process gets an endless segmentation fault inside execvp().
-         dnl Disable multithreading by default on Cygwin 1.5.x, because it has
-         dnl bugs that lead to endless loops or crashes. See
-         dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
-         osf*) gl_use_threads=no ;;
-         cygwin*)
-               case `uname -r` in
-                 1.0-5.*) gl_use_threads=no ;;
-                 *)         gl_use_threads=yes ;;
-               esac
-               ;;
-         *)    gl_use_threads=yes ;;
-       esac
-changequote(,)dnl
-     fi
-    )
-  if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
-    # For using <pthread.h>:
-    case "$host_os" in
-      osf*)
-        # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
-        # groks <pthread.h>. cc also understands the flag -pthread, but
-        # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
-        # 2. putting a flag into CPPFLAGS that has an effect on the linker
-        # causes the AC_TRY_LINK test below to succeed unexpectedly,
-        # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
-        CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-        ;;
-    esac
-    # Some systems optimize for single-threaded programs by default, and
-    # need special flags to disable these optimizations. For example, the
-    # definition of 'errno' in <errno.h>.
-    case "$host_os" in
-      aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
-      solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
-    esac
-  fi
-)
-
-dnl The guts of gl_THREADLIB. Needs to be expanded only once.
-
-AC_DEFUN(gl_THREADLIB_BODY,
-
-  AC_REQUIRE(gl_THREADLIB_EARLY_BODY)
-  gl_threads_api=none
-  LIBTHREAD=
-  LTLIBTHREAD=
-  LIBMULTITHREAD=
-  LTLIBMULTITHREAD=
-  if test "$gl_use_threads" != no; then
-    dnl Check whether the compiler and linker support weak declarations.
-    AC_CACHE_CHECK(whether imported symbols can be declared weak,
-      gl_cv_have_weak,
-      gl_cv_have_weak=no
-       dnl First, test whether the compiler accepts it syntactically.
-       AC_TRY_LINK(extern void xyzzy ();
-#pragma weak xyzzy, xyzzy();, gl_cv_have_weak=maybe)
-       if test $gl_cv_have_weak = maybe; then
-         dnl Second, test whether it actually works. On Cygwin 1.7.2, with
-         dnl gcc 4.3, symbols declared weak always evaluate to the address 0.
-         AC_TRY_RUN(
-#include <stdio.h>
-#pragma weak fputs
-int main ()
-{
-  return (fputs == NULL);
-}, gl_cv_have_weak=yes, gl_cv_have_weak=no,
-           dnl When cross-compiling, assume that only ELF platforms support
-            dnl weak symbols.
-            AC_EGREP_CPP(Extensible Linking Format,
-              #ifdef __ELF__
-               Extensible Linking Format
-               #endif
-              ,
-              gl_cv_have_weak="guessing yes",
-              gl_cv_have_weak="guessing no")
-           )
-       fi
-      )
-    if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
-      # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
-      # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
-      AC_CHECK_HEADER(pthread.h,
-        gl_have_pthread_h=yes, gl_have_pthread_h=no)
-      if test "$gl_have_pthread_h" = yes; then
-        # Other possible tests:
-        #   -lpthreads (FSU threads, PCthreads)
-        #   -lgthreads
-        gl_have_pthread=
-        # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
-        # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
-        # the second one only in libpthread, and lock.c needs it.
-        AC_TRY_LINK(#include <pthread.h>,
-          pthread_mutex_lock((pthread_mutex_t*)0);
-           pthread_mutexattr_init((pthread_mutexattr_t*)0);,
-          gl_have_pthread=yes)
-        # Test for libpthread by looking for pthread_kill. (Not pthread_self,
-        # since it is defined as a macro on OSF/1.)
-        if test -n "$gl_have_pthread"; then
-          # The program links fine without libpthread. But it may actually
-          # need to link with libpthread in order to create multiple threads.
-          AC_CHECK_LIB(pthread, pthread_kill,
-            LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
-             # On Solaris and HP-UX, most pthread functions exist also in libc.
-             # Therefore pthread_in_use() needs to actually try to create a
-             # thread: pthread_create from libc will fail, whereas
-             # pthread_create will actually create a thread.
-             case "$host_os" in
-               solaris* | hpux*)
-                 AC_DEFINE(PTHREAD_IN_USE_DETECTION_HARD, 1,
-                   Define if the pthread_in_use() detection is hard.)
-             esac
-            )
-        else
-          # Some library is needed. Try libpthread and libc_r.
-          AC_CHECK_LIB(pthread, pthread_kill,
-            gl_have_pthread=yes
-             LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
-             LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread)
-          if test -z "$gl_have_pthread"; then
-            # For FreeBSD 4.
-            AC_CHECK_LIB(c_r, pthread_kill,
-              gl_have_pthread=yes
-               LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
-               LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r)
-          fi
-        fi
-        if test -n "$gl_have_pthread"; then
-          gl_threads_api=posix
-          AC_DEFINE(USE_POSIX_THREADS, 1,
-            Define if the POSIX multithreading library can be used.)
-          if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
-            if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-              AC_DEFINE(USE_POSIX_THREADS_WEAK, 1,
-                Define if references to the POSIX multithreading library should be made weak.)
-              LIBTHREAD=
-              LTLIBTHREAD=
-            fi
-          fi
-        fi
-      fi
-    fi
-    if test -z "$gl_have_pthread"; then
-      if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
-        gl_have_solaristhread=
-        gl_save_LIBS="$LIBS"
-        LIBS="$LIBS -lthread"
-        AC_TRY_LINK(#include <thread.h>
-#include <synch.h>,
-          thr_self();,
-          gl_have_solaristhread=yes)
-        LIBS="$gl_save_LIBS"
-        if test -n "$gl_have_solaristhread"; then
-          gl_threads_api=solaris
-          LIBTHREAD=-lthread
-          LTLIBTHREAD=-lthread
-          LIBMULTITHREAD="$LIBTHREAD"
-          LTLIBMULTITHREAD="$LTLIBTHREAD"
-          AC_DEFINE(USE_SOLARIS_THREADS, 1,
-            Define if the old Solaris multithreading library can be used.)
-          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-            AC_DEFINE(USE_SOLARIS_THREADS_WEAK, 1,
-              Define if references to the old Solaris multithreading library should be made weak.)
-            LIBTHREAD=
-            LTLIBTHREAD=
-          fi
-        fi
-      fi
-    fi
-    if test "$gl_use_threads" = pth; then
-      gl_save_CPPFLAGS="$CPPFLAGS"
-      AC_LIB_LINKFLAGS(pth)
-      gl_have_pth=
-      gl_save_LIBS="$LIBS"
-      LIBS="$LIBS -lpth"
-      AC_TRY_LINK(#include <pth.h>, pth_self();, gl_have_pth=yes)
-      LIBS="$gl_save_LIBS"
-      if test -n "$gl_have_pth"; then
-        gl_threads_api=pth
-        LIBTHREAD="$LIBPTH"
-        LTLIBTHREAD="$LTLIBPTH"
-        LIBMULTITHREAD="$LIBTHREAD"
-        LTLIBMULTITHREAD="$LTLIBTHREAD"
-        AC_DEFINE(USE_PTH_THREADS, 1,
-          Define if the GNU Pth multithreading library can be used.)
-        if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
-          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-            AC_DEFINE(USE_PTH_THREADS_WEAK, 1,
-              Define if references to the GNU Pth multithreading library should be made weak.)
-            LIBTHREAD=
-            LTLIBTHREAD=
-          fi
-        fi
-      else
-        CPPFLAGS="$gl_save_CPPFLAGS"
-      fi
-    fi
-    if test -z "$gl_have_pthread"; then
-      if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then
-        if { case "$host_os" in
-               mingw*) true;;
-               *) false;;
-             esac
-           }; then
-          gl_threads_api=win32
-          AC_DEFINE(USE_WIN32_THREADS, 1,
-            Define if the Win32 multithreading API can be used.)
-        fi
-      fi
-    fi
-  fi
-  AC_MSG_CHECKING(for multithread API to use)
-  AC_MSG_RESULT($gl_threads_api)
-  AC_SUBST(LIBTHREAD)
-  AC_SUBST(LTLIBTHREAD)
-  AC_SUBST(LIBMULTITHREAD)
-  AC_SUBST(LTLIBMULTITHREAD)
-)
-
-AC_DEFUN(gl_THREADLIB,
-
-  AC_REQUIRE(gl_THREADLIB_EARLY)
-  AC_REQUIRE(gl_THREADLIB_BODY)
-)
-
-
-dnl gl_DISABLE_THREADS
-dnl ------------------
-dnl Sets the gl_THREADLIB default so that threads are not used by default.
-dnl The user can still override it at installation time, by using the
-dnl configure option '--enable-threads'.
-
-AC_DEFUN(gl_DISABLE_THREADS, 
-  m4_divert_text(INIT_PREPARE, gl_use_threads_default=no)
-)
-
-
-dnl Survey of platforms:
-dnl
-dnl Platform          Available   Compiler    Supports   test-lock
-dnl                   flavours    option      weak       result
-dnl ---------------   ---------   ---------   --------   ---------
-dnl Linux 2.4/glibc   posix       -lpthread       Y      OK
-dnl
-dnl GNU Hurd/glibc    posix
-dnl
-dnl FreeBSD 5.3       posix       -lc_r           Y
-dnl                   posix       -lkse ?         Y
-dnl                   posix       -lpthread ?     Y
-dnl                   posix       -lthr           Y
-dnl
-dnl FreeBSD 5.2       posix       -lc_r           Y
-dnl                   posix       -lkse           Y
-dnl                   posix       -lthr           Y
-dnl
-dnl FreeBSD 4.0,4.10  posix       -lc_r           Y      OK
-dnl
-dnl NetBSD 1.6        --
-dnl
-dnl OpenBSD 3.4       posix       -lpthread       Y      OK
-dnl
-dnl MacOS X 10.123  posix       -lpthread       Y      OK
-dnl
-dnl Solaris 7,8,9     posix       -lpthread       Y      Sol 7,8: 0.0; Sol 9: OK
-dnl                   solaris     -lthread        Y      Sol 7,8: 0.0; Sol 9: OK
-dnl
-dnl HP-UX 11          posix       -lpthread       N (cc) OK
-dnl                                               Y (gcc)
-dnl
-dnl IRIX 6.5          posix       -lpthread       Y      0.5
-dnl
-dnl AIX 4.3,5.1       posix       -lpthread       N      AIX 4: 0.5; AIX 5: OK
-dnl
-dnl OSF/1 4.0,5.1     posix       -pthread (cc)   N      OK
-dnl                               -lpthread (gcc) Y
-dnl
-dnl Cygwin            posix       -lpthread       Y      OK
-dnl
-dnl Any of the above  pth         -lpth                  0.0
-dnl
-dnl Mingw             win32                       N      OK
-dnl
-dnl BeOS 5            --
-dnl
-dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
-dnl turned off:
-dnl   OK if all three tests terminate OK,
-dnl   0.5 if the first test terminates OK but the second one loops endlessly,
-dnl   0.0 if the first test already loops endlessly.
-
-# uintmax_t.m4 serial 12
-dnl Copyright (C) 1997-2004, 2007-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-AC_PREREQ(2.13)
-
-# Define uintmax_t to 'unsigned long' or 'unsigned long long'
-# if it is not already defined in <stdint.h> or <inttypes.h>.
-
-AC_DEFUN(gl_AC_TYPE_UINTMAX_T,
-
-  AC_REQUIRE(gl_AC_HEADER_INTTYPES_H)
-  AC_REQUIRE(gl_AC_HEADER_STDINT_H)
-  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
-    AC_REQUIRE(AC_TYPE_UNSIGNED_LONG_LONG_INT)
-    test $ac_cv_type_unsigned_long_long_int = yes \
-      && ac_type='unsigned long long' \
-      || ac_type='unsigned long'
-    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-      Define to unsigned long or unsigned long long
-       if <stdint.h> and <inttypes.h> don't define.)
-  else
-    AC_DEFINE(HAVE_UINTMAX_T, 1,
-      Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.)
-  fi
-)
-
-# visibility.m4 serial 3 (gettext-0.18)
-dnl Copyright (C) 2005, 2008-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl Tests whether the compiler supports the command-line option
-dnl -fvisibility=hidden and the function and variable attributes
-dnl __attribute__((__visibility__("hidden"))) and
-dnl __attribute__((__visibility__("default"))).
-dnl Does *not* test for __visibility__("protected") - which has tricky
-dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
-dnl MacOS X.
-dnl Does *not* test for __visibility__("internal") - which has processor
-dnl dependent semantics.
-dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
-dnl "really only recommended for legacy code".
-dnl Set the variable CFLAG_VISIBILITY.
-dnl Defines and sets the variable HAVE_VISIBILITY.
-
-AC_DEFUN(gl_VISIBILITY,
-
-  AC_REQUIRE(AC_PROG_CC)
-  CFLAG_VISIBILITY=
-  HAVE_VISIBILITY=0
-  if test -n "$GCC"; then
-    dnl First, check whether -Werror can be added to the command line, or
-    dnl whether it leads to an error because of some other option that the
-    dnl user has put into $CC $CFLAGS $CPPFLAGS.
-    AC_MSG_CHECKING(whether the -Werror option is usable)
-    AC_CACHE_VAL(gl_cv_cc_vis_werror, 
-      gl_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -Werror"
-      AC_TRY_COMPILE(, ,
-        gl_cv_cc_vis_werror=yes,
-        gl_cv_cc_vis_werror=no)
-      CFLAGS="$gl_save_CFLAGS")
-    AC_MSG_RESULT($gl_cv_cc_vis_werror)
-    dnl Now check whether visibility declarations are supported.
-    AC_MSG_CHECKING(for simple visibility declarations)
-    AC_CACHE_VAL(gl_cv_cc_visibility, 
-      gl_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -fvisibility=hidden"
-      dnl We use the option -Werror and a function dummyfunc, because on some
-      dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
-      dnl "visibility attribute not supported in this configuration; ignored"
-      dnl at the first function definition in every compilation unit, and we
-      dnl don't want to use the option in this case.
-      if test $gl_cv_cc_vis_werror = yes; then
-        CFLAGS="$CFLAGS -Werror"
-      fi
-      AC_TRY_COMPILE(
-        extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-         extern __attribute__((__visibility__("default"))) int exportedvar;
-         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-         extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-         void dummyfunc (void) {},
-        ,
-        gl_cv_cc_visibility=yes,
-        gl_cv_cc_visibility=no)
-      CFLAGS="$gl_save_CFLAGS")
-    AC_MSG_RESULT($gl_cv_cc_visibility)
-    if test $gl_cv_cc_visibility = yes; then
-      CFLAG_VISIBILITY="-fvisibility=hidden"
-      HAVE_VISIBILITY=1
-    fi
-  fi
-  AC_SUBST(CFLAG_VISIBILITY)
-  AC_SUBST(HAVE_VISIBILITY)
-  AC_DEFINE_UNQUOTED(HAVE_VISIBILITY, $HAVE_VISIBILITY,
-    Define to 1 or 0, depending whether the compiler supports simple visibility declarations.)
-)
-
-# wchar_t.m4 serial 3 (gettext-0.18)
-dnl Copyright (C) 2002-2003, 2008-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether <stddef.h> has the 'wchar_t' type.
-dnl Prerequisite: AC_PROG_CC
-
-AC_DEFUN(gt_TYPE_WCHAR_T,
-
-  AC_CACHE_CHECK(for wchar_t, gt_cv_c_wchar_t,
-    AC_TRY_COMPILE(#include <stddef.h>
-       wchar_t foo = (wchar_t)'\0';, ,
-       gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no))
-  if test $gt_cv_c_wchar_t = yes; then
-    AC_DEFINE(HAVE_WCHAR_T, 1, Define if you have the 'wchar_t' type.)
-  fi
-)
-
-# wint_t.m4 serial 4 (gettext-0.18)
-dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether <wchar.h> has the 'wint_t' type.
-dnl Prerequisite: AC_PROG_CC
-
-AC_DEFUN(gt_TYPE_WINT_T,
-
-  AC_CACHE_CHECK(for wint_t, gt_cv_c_wint_t,
-    AC_TRY_COMPILE(
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
-   before <wchar.h>.  */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-       wint_t foo = (wchar_t)'\0';, ,
-       gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no))
-  if test $gt_cv_c_wint_t = yes; then
-    AC_DEFINE(HAVE_WINT_T, 1, Define if you have the 'wint_t' type.)
-  fi
-)
-
-# xsize.m4 serial 4
-dnl Copyright (C) 2003-2004, 2008-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN(gl_XSIZE,
-
-  dnl Prerequisites of lib/xsize.h.
-  AC_REQUIRE(gl_SIZE_MAX)
-  AC_REQUIRE(AC_C_INLINE)
-  AC_CHECK_HEADERS(stdint.h)
-)
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -12297,10 +32,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN(AM_AUTOMAKE_VERSION,
-am__api_version='1.11'
+am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if($1, 1.11.1, ,
+m4_if($1, 1.14.1, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -12316,22 +51,22 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
-AM_AUTOMAKE_VERSION(1.11.1)dnl
+AM_AUTOMAKE_VERSION(1.14.1)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 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.
 
 # For projects using AC_CONFIG_AUX_DIR(foo), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -12350,7 +85,7 @@
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -12376,22 +111,19 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 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 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN(AM_CONDITIONAL,
-AC_PREREQ(2.52)dnl
- ifelse($1, TRUE,  AC_FATAL($0: invalid condition: $1),
-	$1, FALSE, AC_FATAL($0: invalid condition: $1))dnl
+AC_PREREQ(2.52)dnl
+ m4_if($1, TRUE,  AC_FATAL($0: invalid condition: $1),
+       $1, FALSE, AC_FATAL($0: invalid condition: $1))dnl
 AC_SUBST($1_TRUE)dnl
 AC_SUBST($1_FALSE)dnl
 _AM_SUBST_NOTMAKE($1_TRUE)dnl
@@ -12410,16 +142,14 @@
 Usually this means the macro was only invoked conditionally.)
 fi))
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 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 10
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -12429,7 +159,7 @@
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -12442,12 +172,13 @@
 AC_REQUIRE(AM_MAKE_INCLUDE)dnl
 AC_REQUIRE(AM_DEP_TRACK)dnl
 
-ifelse($1, CC,   depcc="$CC"   am_compiler_list=,
-       $1, CXX,  depcc="$CXX"  am_compiler_list=,
-       $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
-       $1, UPC,  depcc="$UPC"  am_compiler_list=,
-       $1, GCJ,  depcc="$GCJ"  am_compiler_list='gcc3 gcc',
-                   depcc="$$1"   am_compiler_list=)
+m4_if($1, CC,   depcc="$CC"   am_compiler_list=,
+      $1, CXX,  depcc="$CXX"  am_compiler_list=,
+      $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
+      $1, OBJCXX, depcc="$OBJCXX" am_compiler_list='gcc3 gcc',
+      $1, UPC,  depcc="$UPC"  am_compiler_list=,
+      $1, GCJ,  depcc="$GCJ"  am_compiler_list='gcc3 gcc',
+                    depcc="$$1"   am_compiler_list=)
 
 AC_CACHE_CHECK(dependency style of $depcc,
                am_cv_$1_dependencies_compiler_type,
@@ -12455,8 +186,9 @@
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -12495,16 +227,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -12513,16 +245,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -12570,7 +302,7 @@
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN(AM_SET_DEPDIR,
 AC_REQUIRE(AM_SET_LEADING_DOT)dnl
 AC_SUBST(DEPDIR, "${am__leading_dot}deps")dnl
@@ -12580,34 +312,39 @@
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN(AM_DEP_TRACK,
-AC_ARG_ENABLE(dependency-tracking,
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors)
+AC_ARG_ENABLE(dependency-tracking, dnl
+AS_HELP_STRING(
+  --enable-dependency-tracking,
+  do not reject slow dependency extractors)
+AS_HELP_STRING(
+  --disable-dependency-tracking,
+  speeds up one-time build))
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno)
 AC_SUBST(AMDEPBACKSLASH)dnl
 _AM_SUBST_NOTMAKE(AMDEPBACKSLASH)dnl
+AC_SUBST(am__nodep)dnl
+_AM_SUBST_NOTMAKE(am__nodep)dnl
 )
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 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 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN(_AM_OUTPUT_DEPENDENCY_COMMANDS,
 {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -12620,7 +357,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.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -12632,21 +369,19 @@
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME("$file")`
@@ -12664,7 +399,7 @@
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN(AM_OUTPUT_DEPENDENCY_COMMANDS,
 AC_CONFIG_COMMANDS(depfiles,
@@ -12672,32 +407,23 @@
      AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir")
 )
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 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 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN(AM_CONFIG_HEADER, AC_CONFIG_HEADERS($@))
-
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 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 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define(AC_PROG_CC,
+m4_defn(AC_PROG_CC)
+_AM_PROG_CC_C_O
+)
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, NO-DEFINE)
 # AM_INIT_AUTOMAKE(OPTIONS)
 # -----------------------------------------------
@@ -12710,7 +436,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN(AM_INIT_AUTOMAKE,
-AC_PREREQ(2.62)dnl
+AC_PREREQ(2.65)dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow(^AM_A-Z+FLAGS$)dnl
@@ -12739,31 +465,40 @@
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval($2,
-m4_ifval($3, _AM_SET_OPTION(no-define))dnl
+AC_DIAGNOSE(obsolete,
+             $0: two- and three-arguments forms are deprecated.)
+m4_ifval($3, _AM_SET_OPTION(no-define))dnl
  AC_SUBST(PACKAGE, $1)dnl
  AC_SUBST(VERSION, $2),
 _AM_SET_OPTIONS($1)dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef(AC_PACKAGE_NAME, 1)m4_ifdef(AC_PACKAGE_VERSION, 1), 11,,
+m4_if(
+  m4_ifdef(AC_PACKAGE_NAME, ok):m4_ifdef(AC_PACKAGE_VERSION, ok),
+  ok:ok,,
   m4_fatal(AC_INIT should be called with package and version arguments))dnl
  AC_SUBST(PACKAGE, 'AC_PACKAGE_TARNAME')dnl
  AC_SUBST(VERSION, 'AC_PACKAGE_VERSION'))dnl
 
 _AM_IF_OPTION(no-define,,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", Name of package)
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", Version number of package))dnl
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", Name of package)
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", Version number of package))dnl
 
 # Some tools Automake needs.
 AC_REQUIRE(AM_SANITY_CHECK)dnl
 AC_REQUIRE(AC_ARG_PROGRAM)dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
 AC_REQUIRE(AM_PROG_INSTALL_SH)dnl
 AC_REQUIRE(AM_PROG_INSTALL_STRIP)dnl
-AC_REQUIRE(AM_PROG_MKDIR_P)dnl
+AC_REQUIRE(AC_PROG_MKDIR_P)dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST(mkdir_p, '$(MKDIR_P)')
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE(AC_PROG_AWK)dnl
@@ -12774,34 +509,78 @@
 			     _AM_PROG_TAR(v7)))
 _AM_IF_OPTION(no-dependencies,,
 AC_PROVIDE_IFELSE(AC_PROG_CC,
-		  _AM_DEPENDENCIES(CC),
-		  define(AC_PROG_CC,
-			  defn(AC_PROG_CC)_AM_DEPENDENCIES(CC)))dnl
+		  _AM_DEPENDENCIES(CC),
+		  m4_define(AC_PROG_CC,
+			     m4_defn(AC_PROG_CC)_AM_DEPENDENCIES(CC)))dnl
 AC_PROVIDE_IFELSE(AC_PROG_CXX,
-		  _AM_DEPENDENCIES(CXX),
-		  define(AC_PROG_CXX,
-			  defn(AC_PROG_CXX)_AM_DEPENDENCIES(CXX)))dnl
+		  _AM_DEPENDENCIES(CXX),
+		  m4_define(AC_PROG_CXX,
+			     m4_defn(AC_PROG_CXX)_AM_DEPENDENCIES(CXX)))dnl
 AC_PROVIDE_IFELSE(AC_PROG_OBJC,
-		  _AM_DEPENDENCIES(OBJC),
-		  define(AC_PROG_OBJC,
-			  defn(AC_PROG_OBJC)_AM_DEPENDENCIES(OBJC)))dnl
-)
-_AM_IF_OPTION(silent-rules, AC_REQUIRE(AM_SILENT_RULES))dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+		  _AM_DEPENDENCIES(OBJC),
+		  m4_define(AC_PROG_OBJC,
+			     m4_defn(AC_PROG_OBJC)_AM_DEPENDENCIES(OBJC)))dnl
+AC_PROVIDE_IFELSE(AC_PROG_OBJCXX,
+		  _AM_DEPENDENCIES(OBJCXX),
+		  m4_define(AC_PROG_OBJCXX,
+			     m4_defn(AC_PROG_OBJCXX)_AM_DEPENDENCIES(OBJCXX)))dnl
+)
+AC_REQUIRE(AM_SILENT_RULES)dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 m4_provide_if(_AM_COMPILER_EXEEXT,
   AM_CONDITIONAL(am__EXEEXT, test -n "$EXEEXT")))dnl
-)
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR(Your 'rm' program is bad, sorry.)
+  fi
+fi)
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define(_AC_COMPILER_EXEEXT,
 m4_defn(_AC_COMPILER_EXEEXT)m4_provide(_AM_COMPILER_EXEEXT))
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -12823,7 +602,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -12842,16 +621,14 @@
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh))
+AC_SUBST(install_sh))
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 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 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN(AM_SET_LEADING_DOT,
@@ -12865,16 +642,32 @@
 rmdir .tst 2>/dev/null
 AC_SUBST(am__leading_dot))
 
+# Copyright (C) 1998-2013 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.
+
+# AM_PROG_LEX
+# -----------
+# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
+# "missing" invocation, for better error output.
+AC_DEFUN(AM_PROG_LEX,
+AC_PREREQ(2.50)dnl
+AC_REQUIRE(AM_MISSING_HAS_RUN)dnl
+AC_REQUIRE(AC_PROG_LEX)dnl
+if test "$LEX" = :; then
+  LEX=${am_missing_run}flex
+fi)
+
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 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
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -12892,7 +685,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -12919,15 +712,12 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 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 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN(AM_MISSING_PROG,
@@ -12935,11 +725,10 @@
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1))
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN(AM_MISSING_HAS_RUN,
 AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
 AC_REQUIRE_AUX_FILE(missing)dnl
@@ -12952,15 +741,15 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN(`missing' script is too old or missing)
+  AC_MSG_WARN('missing' script is too old or missing)
 fi
 )
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -12968,10 +757,16 @@
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check for `mkdir -p'.
+# Check for 'mkdir -p'.
 AC_DEFUN(AM_PROG_MKDIR_P,
 AC_PREREQ(2.60)dnl
 AC_REQUIRE(AC_PROG_MKDIR_P)dnl
+dnl FIXME we are no longer going to remove this! adjust warning
+dnl FIXME message accordingly.
+AC_DIAGNOSE(obsolete,
+$0: this macro is deprecated, and will soon be removed.
+You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead,
+and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.)
 dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
 dnl while keeping a definition of mkdir_p for backward compatibility.
 dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
@@ -12988,27 +783,25 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 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
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN(_AM_MANGLE_OPTION,
 _AM_OPTION_m4_bpatsubst($1, ^a-zA-Z0-9_, _))
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN(_AM_SET_OPTION,
-m4_define(_AM_MANGLE_OPTION($1), 1))
+m4_define(_AM_MANGLE_OPTION($1), 1))
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN(_AM_SET_OPTIONS,
 m4_foreach_w(_AM_Option, $1, _AM_SET_OPTION(_AM_Option)))
@@ -13019,24 +812,82 @@
 AC_DEFUN(_AM_IF_OPTION,
 m4_ifset(_AM_MANGLE_OPTION($1), $2, $3))
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+# Copyright (C) 1999-2013 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.
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN(_AM_PROG_CC_C_O,
+AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
+AC_REQUIRE_AUX_FILE(compile)dnl
+AC_LANG_PUSH(C)dnl
+AC_CACHE_CHECK(
+  whether $CC understands -c and -o together,
+  am_cv_prog_cc_c_o,
+  AC_LANG_CONFTEST(AC_LANG_PROGRAM())
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG($CC -c conftest.$ac_ext -o conftest2.$ac_objext) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i)
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP(C))
+
+# For backward compatibility.
+AC_DEFUN_ONCE(AM_PROG_CC_C_O, AC_REQUIRE(AC_PROG_CC))
+
+# Copyright (C) 2001-2013 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 5
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN(AM_RUN_LOG,
+{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); })
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 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.
 
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN(AM_SANITY_CHECK,
 AC_MSG_CHECKING(whether build environment is sane)
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -13047,32 +898,40 @@
 esac
 case $srcdir in
   *\\\"\#\$\&\'\`$am_lf\ \	*)
-    AC_MSG_ERROR(unsafe srcdir value: `$srcdir');;
+    AC_MSG_ERROR(unsafe srcdir value: '$srcdir');;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR(ls -t appears to fail.  Make sure there is not a broken
-alias in your environment)
-   fi
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR(ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment)
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -13082,9 +941,85 @@
    AC_MSG_ERROR(newly created file is older than distributed files!
 Check your system clock)
 fi
-AC_MSG_RESULT(yes))
+AC_MSG_RESULT(yes)
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  AC_MSG_CHECKING(that generated files are newer than configure)
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT(done))
+rm -f conftest.file
+)
+
+# Copyright (C) 2009-2013 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.
+
+# AM_SILENT_RULES(DEFAULT)
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN(AM_SILENT_RULES,
+AC_ARG_ENABLE(silent-rules, dnl
+AS_HELP_STRING(
+  --enable-silent-rules,
+  less verbose build output (undo: "make V=1"))
+AS_HELP_STRING(
+  --disable-silent-rules,
+  verbose build output (undo: "make V=0"))dnl
+)
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if($1, yes, 0, 1);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK(whether $am_make supports nested variables,
+   am_cv_make_support_nested_variables,
+   if AS_ECHO('TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit') | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi)
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST(AM_V)dnl
+AM_SUBST_NOTMAKE(AM_V)dnl
+AC_SUBST(AM_DEFAULT_V)dnl
+AM_SUBST_NOTMAKE(AM_DEFAULT_V)dnl
+AC_SUBST(AM_DEFAULT_VERBOSITY)dnl
+AM_BACKSLASH='\'
+AC_SUBST(AM_BACKSLASH)dnl
+_AM_SUBST_NOTMAKE(AM_BACKSLASH)dnl
+)
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -13092,34 +1027,32 @@
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN(AM_PROG_INSTALL_STRIP,
 AC_REQUIRE(AM_PROG_INSTALL_SH)dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL(STRIP, strip, :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST(INSTALL_STRIP_PROGRAM))
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 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 2
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -13127,24 +1060,22 @@
 AC_DEFUN(_AM_SUBST_NOTMAKE)
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN(AM_SUBST_NOTMAKE, _AM_SUBST_NOTMAKE($@))
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 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 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -13154,76 +1085,149 @@
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN(_AM_PROG_TAR,
-# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG(AMTAR, tar)
-m4_if($1, v7,
-     am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -',
-     m4_case($1, ustar,, pax,,
-              m4_fatal(Unknown tar format))
-AC_MSG_CHECKING(how to create a $1 tar archive)
-# Loop over all known methods to create a tar archive until one works.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST(AMTAR, '$${TAR-tar}')
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if($1, ustar, plaintar) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG($_am_tar --version) && break
-    done
-    am__tar="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if($1, v7,
+  am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -',
+
+  m4_case($1,
+    ustar,
+     # The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING(whether UID '$am_uid' is supported by ustar format)
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT(yes)
+      else
+         AC_MSG_RESULT(no)
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING(whether GID '$am_gid' is supported by ustar format)
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT(yes)
+      else
+        AC_MSG_RESULT(no)
+        _am_tools=none
+      fi,
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG(tardir=conftest.dir && eval $am__tar_ >conftest.tar)
+  pax,
+    ,
+
+  m4_fatal(Unknown tar format))
+
+  AC_MSG_CHECKING(how to create a $1 tar archive)
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG($_am_tar --version) && break
+      done
+      am__tar="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG(tardir=conftest.dir && eval $am__tar_ >conftest.tar)
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG($am__untar <conftest.tar)
+      AM_RUN_LOG(cat conftest.dir/file)
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG($am__untar <conftest.tar)
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL(am_cv_prog_tar_$1, am_cv_prog_tar_$1=$_am_tool)
-AC_MSG_RESULT($am_cv_prog_tar_$1))
+  AC_CACHE_VAL(am_cv_prog_tar_$1, am_cv_prog_tar_$1=$_am_tool)
+  AC_MSG_RESULT($am_cv_prog_tar_$1))
+
 AC_SUBST(am__tar)
 AC_SUBST(am__untar)
 ) # _AM_PROG_TAR
 
+m4_include(m4/codeset.m4)
+m4_include(m4/gettext.m4)
+m4_include(m4/glibc2.m4)
+m4_include(m4/glibc21.m4)
+m4_include(m4/iconv.m4)
+m4_include(m4/intdiv0.m4)
+m4_include(m4/intl.m4)
+m4_include(m4/intmax.m4)
+m4_include(m4/inttypes-pri.m4)
+m4_include(m4/inttypes_h.m4)
+m4_include(m4/lcmessage.m4)
+m4_include(m4/lib-ld.m4)
+m4_include(m4/lib-link.m4)
+m4_include(m4/lib-prefix.m4)
+m4_include(m4/libtool.m4)
+m4_include(m4/lock.m4)
+m4_include(m4/longdouble.m4)
+m4_include(m4/longlong.m4)
+m4_include(m4/ltoptions.m4)
+m4_include(m4/ltsugar.m4)
+m4_include(m4/ltversion.m4)
+m4_include(m4/lt~obsolete.m4)
+m4_include(m4/nls.m4)
+m4_include(m4/po.m4)
+m4_include(m4/printf-posix.m4)
+m4_include(m4/progtest.m4)
+m4_include(m4/size_max.m4)
+m4_include(m4/stdint_h.m4)
+m4_include(m4/uintmax_t.m4)
+m4_include(m4/ulonglong.m4)
+m4_include(m4/visibility.m4)
+m4_include(m4/wchar_t.m4)
+m4_include(m4/wint_t.m4)
+m4_include(m4/xsize.m4)

mpfc-2.0.tar.bz2/compile Added

@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /!/*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.oObBjJ)
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.cC++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.oO)
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile --help --version PROGRAM ARGS
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | */\\cl | cl.exe | */\\cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*\\/||; s|^a-zA-Z:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '/\\:.-' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|/\\:.-|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:

mpfc-1.3.8.1.tar.bz2/config.guess -> mpfc-2.0.tar.bz2/config.guess Changed

@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2011-02-02'
+timestamp='2013-11-29'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,9 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -141,22 +133,20 @@
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
 case "${UNAME_SYSTEM}" in
-Linux|GNU/*)
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
 	eval $set_cc_for_build
 	cat <<-EOF > $dummy.c
 	#include <features.h>
-	#ifdef __UCLIBC__
-	# ifdef __UCLIBC_CONFIG_VERSION__
-	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-	# else
+	#if defined(__UCLIBC__)
 	LIBC=uclibc
-	# endif
-	#else
-	# ifdef __dietlibc__
+	#elif defined(__dietlibc__)
 	LIBC=dietlibc
-	# else
+	#else
 	LIBC=gnu
-	# endif
 	#endif
 	EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
@@ -168,7 +158,7 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -225,6 +215,10 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -327,7 +321,7 @@
     arm:RISC*:1.012*:*|arm:riscix:1.012*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -815,21 +809,26 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
 	# uname -m includes "-pc" on this system.
 	echo ${UNAME_MACHINE}-mingw32
@@ -884,6 +883,13 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -898,6 +904,9 @@
 	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -905,20 +914,29 @@
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-${LIBC}
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-${LIBC}
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
 	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
@@ -951,8 +969,11 @@
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-${LIBC}
@@ -974,8 +995,14 @@
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-${LIBC}
 	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -987,13 +1014,13 @@
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1200,6 +1227,9 @@
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1226,19 +1256,31 @@
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if  "$CC_FOR_BUILD" != 'no_compiler_found' ; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if  "$CC_FOR_BUILD" != 'no_compiler_found' ; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:0123456789*:*)
@@ -1255,7 +1297,7 @@
     NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1324,11 +1366,11 @@
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_

mpfc-1.3.8.1.tar.bz2/config.sub -> mpfc-2.0.tar.bz2/config.sub Changed

mpfc-1.3.8.1.tar.bz2/configure -> mpfc-2.0.tar.bz2/configure Changed

@@ -1,11 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68.
+# Generated by GNU Autoconf 2.69 for mpfc 2.0.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -167,7 +190,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -220,21 +244,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -336,6 +364,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -457,6 +493,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $0, causing all sort of problems
   # (the dirname of $0 is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -491,16 +531,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -512,28 +552,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???sx*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # 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'"
@@ -565,12 +585,12 @@
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
+PACKAGE_NAME='mpfc'
+PACKAGE_TARNAME='mpfc'
+PACKAGE_VERSION='2.0'
+PACKAGE_STRING='mpfc 2.0'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
 
 ac_unique_file="src/main.c"
 # Factoring default headers for most tests.
@@ -611,27 +631,27 @@
 
 gt_needs=
 ac_header_list=
-gl_use_threads_default=
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-OUTPUT_PLUGINS
-INPUT_PLUGINS
-EFFECT_PLUGINS
-CHARSET_PLUGINS
+TAGLIB_LIBS
+TAGLIB_CFLAGS
+GSTREAMER_AUDIO_LIBS
+GSTREAMER_AUDIO_CFLAGS
+GSTREAMER_LIBS
+GSTREAMER_CFLAGS
+PLIST_PLUGINS
 GENERAL_PLUGINS
-ASOUND_LIBS
-OGG_LIBS
-FLAC_LIBS
-MAD_LIBS
 MATH_LIBS
-ICU_LIBS
+JSON_LIBS
+JSON_CFLAGS
 RESOLV_LIBS
 GPM_LIBS
 DL_LIBS
 PTHREAD_LIBS
 CURSES_LIBS
+CURSES_CFLAGS
 COMMON_LIBS
 POSUB
 LTLIBINTL
@@ -645,16 +665,11 @@
 CATOBJEXT
 USE_INCLUDED_LIBINTL
 BUILD_INCLUDED_LIBINTL
-LTLIBC
-WINDRES
-WOE32
 WOE32DLL
 HAVE_WPRINTF
-HAVE_NEWLOCALE
 HAVE_SNPRINTF
 HAVE_ASPRINTF
 HAVE_POSIX_PRINTF
-INTL_DEFAULT_VERBOSITY
 INTL_MACOSX_LIBS
 GLIBC21
 INTLBISON
@@ -664,7 +679,6 @@
 LIBMULTITHREAD
 LTLIBTHREAD
 LIBTHREAD
-LIBPTH_PREFIX
 LTLIBPTH
 LIBPTH
 PRI_MACROS_BROKEN
@@ -672,7 +686,6 @@
 HAVE_VISIBILITY
 CFLAG_VISIBILITY
 GLIBC2
-XGETTEXT_EXTRA_OPTIONS
 MSGMERGE
 XGETTEXT_015
 XGETTEXT
@@ -680,8 +693,15 @@
 MSGFMT_015
 GMSGFMT
 MSGFMT
-GETTEXT_MACRO_VERSION
 USE_NLS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
+YFLAGS
+YACC
+LEXLIB
+LEX_OUTPUT_ROOT
+LEX
 OTOOL64
 OTOOL
 LIPO
@@ -709,25 +729,20 @@
 build_cpu
 build
 LIBTOOL
-EGREP
-GREP
-CPP
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
 am__quote
 am__include
 DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
 am__untar
 am__tar
 AMTAR
@@ -751,6 +766,16 @@
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+EGREP
+GREP
+CPP
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
 target_alias
 host_alias
 build_alias
@@ -793,6 +818,7 @@
 ac_user_opts='
 enable_option_checking
 enable_dependency_tracking
+enable_silent_rules
 enable_shared
 enable_static
 with_pic
@@ -808,15 +834,10 @@
 with_included_gettext
 with_libintl_prefix
 enable_gpm
-enable_mp3
-enable_flac
 enable_cue
+enable_m3u
+enable_pls
 enable_audiocd
-enable_ogg
-enable_alsa
-enable_wav
-enable_disk_writer
-enable_oss
 '
       ac_precious_vars='build_alias
 host_alias
@@ -826,7 +847,22 @@
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP'
+CPP
+YACC
+YFLAGS
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+CURSES_CFLAGS
+CURSES_LIBS
+JSON_CFLAGS
+JSON_LIBS
+GSTREAMER_CFLAGS
+GSTREAMER_LIBS
+GSTREAMER_AUDIO_CFLAGS
+GSTREAMER_AUDIO_LIBS
+TAGLIB_CFLAGS
+TAGLIB_LIBS'
 
 
 # Initialize some variables set by options.
@@ -867,7 +903,7 @@
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1282,8 +1318,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1369,7 +1403,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures mpfc 2.0 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1417,7 +1451,7 @@
   --infodir=DIR           info documentation DATAROOTDIR/info
   --localedir=DIR         locale-dependent data DATAROOTDIR/locale
   --mandir=DIR            man documentation DATAROOTDIR/man
-  --docdir=DIR            documentation root DATAROOTDIR/doc/PACKAGE
+  --docdir=DIR            documentation root DATAROOTDIR/doc/mpfc
   --htmldir=DIR           html documentation DOCDIR
   --dvidir=DIR            dvi documentation DOCDIR
   --pdfdir=DIR            pdf documentation DOCDIR
@@ -1438,15 +1472,21 @@
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of mpfc 2.0:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE=ARG  include FEATURE ARG=yes
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
   --enable-shared=PKGS  build shared libraries default=yes
   --enable-static=PKGS  build static libraries default=yes
   --enable-fast-install=PKGS
@@ -1458,21 +1498,15 @@
   --disable-threads       build without multithread safety
   --disable-rpath         do not hardcode runtime library paths
 	--disable-gpm		Disable gpm support default=enabled
-	--disable-mp3		Disable mp3 input plugin default=enabled
-	--disable-flac		Disable flac input plugin default=enabled
-	--disable-cue		Disable cue input plugin default=enabled
-	--disable-audiocd	Disable audiocd input plugin default=enabled
-	--disable-ogg		Disable ogg input plugin default=enabled
-	--disable-alsa		Disable alsa input plugin default=enabled
-	--disable-wav		Disable wav input plugin default=enabled
-	--disable-disk_writer	Disable disk_writer output plugin
- 	default=enabled
-	--disable-oss		Disable oss output plugin default=enabled
+	--disable-cue		Disable cue playlist plugin default=enabled
+	--disable-m3u		Disable m3u playlist plugin default=enabled
+	--disable-pls		Disable pls playlist plugin default=enabled
+	--disable-audiocd		Disable audiocd playlist plugin default=enabled
 
 Optional Packages:
   --with-PACKAGE=ARG    use PACKAGE ARG=yes
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects default=use
+  --with-pic=PKGS       try to use only PIC/non-PIC objects default=use
                           both
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1495,6 +1529,33 @@
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
+  YACC        The `Yet Another Compiler Compiler' implementation to use.
+              Defaults to the first program found out of: `bison -y', `byacc',
+              `yacc'.
+  YFLAGS      The list of arguments that will be passed by default to $YACC.
+              This script will default YFLAGS to the empty string to avoid a
+              default value of `-d' given by some make applications.
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  CURSES_CFLAGS
+              C compiler flags for CURSES, overriding pkg-config
+  CURSES_LIBS linker flags for CURSES, overriding pkg-config
+  JSON_CFLAGS C compiler flags for JSON, overriding pkg-config
+  JSON_LIBS   linker flags for JSON, overriding pkg-config
+  GSTREAMER_CFLAGS
+              C compiler flags for GSTREAMER, overriding pkg-config
+  GSTREAMER_LIBS
+              linker flags for GSTREAMER, overriding pkg-config
+  GSTREAMER_AUDIO_CFLAGS
+              C compiler flags for GSTREAMER_AUDIO, overriding pkg-config
+  GSTREAMER_AUDIO_LIBS
+              linker flags for GSTREAMER_AUDIO, overriding pkg-config
+  TAGLIB_CFLAGS
+              C compiler flags for TAGLIB, overriding pkg-config
+  TAGLIB_LIBS linker flags for TAGLIB, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1562,10 +1623,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.68
+mpfc configure 2.0
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1614,6 +1675,130 @@
 
 } # ac_fn_c_try_compile
 
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
 # ac_fn_c_try_run LINENO
 # ----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
@@ -1656,43 +1841,6 @@
 
 } # ac_fn_c_try_run
 
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -1751,7 +1899,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1891,93 +2039,6 @@
 
 } # ac_fn_c_check_type
 
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
 # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
 # --------------------------------------------
 # Tries to find the compile-time value of EXPR in a program that includes
@@ -1995,7 +2056,8 @@
 main ()
 {
 static int test_array 1 - 2 * !(($2) >= 0);
-test_array 0 = 0
+test_array 0 = 0;
+return test_array 0;
 
   ;
   return 0;
@@ -2011,7 +2073,8 @@
 main ()
 {
 static int test_array 1 - 2 * !(($2) <= $ac_mid);
-test_array 0 = 0
+test_array 0 = 0;
+return test_array 0;
 
   ;
   return 0;
@@ -2037,7 +2100,8 @@
 main ()
 {
 static int test_array 1 - 2 * !(($2) < 0);
-test_array 0 = 0
+test_array 0 = 0;
+return test_array 0;
 
   ;
   return 0;
@@ -2053,7 +2117,8 @@
 main ()
 {
 static int test_array 1 - 2 * !(($2) >= $ac_mid);
-test_array 0 = 0
+test_array 0 = 0;
+return test_array 0;
 
   ;
   return 0;
@@ -2087,7 +2152,8 @@
 main ()
 {
 static int test_array 1 - 2 * !(($2) <= $ac_mid);
-test_array 0 = 0
+test_array 0 = 0;
+return test_array 0;
 
   ;
   return 0;
@@ -2159,8 +2225,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by mpfc $as_me 2.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2511,513 +2577,10 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-am__api_version='1.11'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# 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.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  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.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *\\\"\#\$\&\'\`$am_lf*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *\\\"\#\$\&\'\`$am_lf\ \	*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/\\$/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
 
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  \\/$* | ?:\\/*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make1: Entering ...", which would confuse us.
-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 \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE=mpfc
- VERSION=1.3.8.1
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3040,7 +2603,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3080,7 +2643,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3133,7 +2696,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3174,7 +2737,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3232,7 +2795,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3276,7 +2839,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3722,8 +3285,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3807,194 +3369,64 @@
 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
-DEPDIR="${am__leading_dot}deps"
 
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*$a-zA-Z0-9*$)$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+int
+main ()
+{
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
     fi
   done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
+  rm -f core conftest*
+  unset am_i
 fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
 fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
@@ -4152,7 +3584,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4218,7 +3650,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -4395,6 +3827,1040 @@
 done
 
 
+
+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+
+
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+
+$as_echo "#define _MINIX 1" >>confdefs.h
+
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_safe_to_define___extensions__=yes
+else
+  ac_cv_safe_to_define___extensions__=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+
+
+am__api_version='1.14'
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# 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.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	  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.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *\\\"\#\$\&\'\`$am_lf*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *\\\"\#\$\&\'\`$am_lf\ \	*)
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/\\$/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make1: Entering ...", which would confuse us.
+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 \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='mpfc'
+ VERSION='2.0'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*$a-zA-Z0-9*$)$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if ${ac_cv_prog_cc_c99+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+  your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data;
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+}
+
+int
+main ()
+{
+
+  // Check bool.
+  _Bool success = false;
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs ("s, d' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->datai = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_arrayni.number;
+  dynamic_arrayni.number - 1 = 543;
+
+  // work around unused variable warnings
+  return (!success || bignum == 0LL || ubignum == 0uLL || newvar0 == 'x'
+	  || dynamic_arrayni.number - 1 != 543);
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c99" != xno; then :
+
+fi
+
+
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if ${ac_cv_c_bigendian+:} false; then :
@@ -4627,8 +5093,8 @@
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -4806,7 +5272,7 @@
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -4885,7 +5351,7 @@
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+      as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -5141,7 +5607,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5185,7 +5651,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5343,6 +5809,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -5382,7 +5853,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -5604,7 +6075,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5644,7 +6115,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5811,7 +6282,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -5950,7 +6421,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5990,7 +6461,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6093,7 +6564,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6137,7 +6608,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6262,7 +6733,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6302,7 +6773,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6361,7 +6832,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6401,7 +6872,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6451,13 +6922,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -6604,6 +7075,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
 "     /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF $^|$*()/{next};"\
@@ -6992,7 +7464,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -7003,7 +7475,20 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -7036,7 +7521,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7076,7 +7561,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7156,7 +7641,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7196,7 +7681,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7248,7 +7733,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7288,7 +7773,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7340,7 +7825,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7380,7 +7865,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7432,7 +7917,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7472,7 +7957,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7524,7 +8009,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7564,7 +8049,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7643,7 +8128,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -7654,6 +8145,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -7686,6 +8178,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -7707,7 +8200,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -7845,7 +8340,22 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -7923,6 +8433,10 @@
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -8212,6 +8726,10 @@
 $RM -r conftest*
 
 
+## 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
+## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
@@ -8378,7 +8896,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -8469,18 +8989,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ CF*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -8842,7 +9377,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -9092,8 +9626,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -9472,6 +10005,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1,DATA/'\'' | $SED -e '\''/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -9517,6 +10051,7 @@
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -9545,10 +10080,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.012 allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -9561,7 +10092,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -9600,7 +10131,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -10224,11 +10754,6 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -10318,7 +10843,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -10327,7 +10852,7 @@
   ;;
 
 aix4-9*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -10392,7 +10917,7 @@
   ;;
 
 bsdi45*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -10531,7 +11056,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -10539,10 +11064,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -10550,18 +11071,11 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd123*) objformat=aout ;;
+    freebsd23.*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
-  # Handle Gentoo/FreeBSD as it was Linux
-  case $host_vendor in
-    gentoo)
-      version_type=linux ;;
-    *)
-      version_type=freebsd-$objformat ;;
-  esac
-
+  version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -10572,16 +11086,10 @@
       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
       need_version=yes
       ;;
-    linux)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-      soname_spec='${libname}${release}${shared_ext}$major'
-      need_lib_prefix=no
-      need_version=no
-      ;;
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.01* | freebsdelf3.01*)
@@ -10601,17 +11109,18 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -10672,7 +11181,7 @@
   ;;
 
 interix3-9*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -10688,7 +11197,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -10725,9 +11234,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10809,7 +11318,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -10878,7 +11387,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10903,7 +11412,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -10927,7 +11436,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -10958,7 +11467,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10968,7 +11477,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11750,6 +12259,8 @@
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -11759,9 +12270,430 @@
 
 
 
+# For libcue
+for ac_prog in flex lex
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LEX"; then
+  ac_cv_prog_LEX="$LEX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LEX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LEX=$ac_cv_prog_LEX
+if test -n "$LEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
+$as_echo "$LEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$LEX" && break
+done
+test -n "$LEX" || LEX=":"
+
+if test "x$LEX" != "x:"; then
+  cat >conftest.l <<_ACEOF
+%%
+a { ECHO; }
+b { REJECT; }
+c { yymore (); }
+d { yyless (1); }
+e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument.  */
+    yyless ((input () != 0)); }
+f { unput (yytext0); }
+. { BEGIN INITIAL; }
+%%
+#ifdef YYTEXT_POINTER
+extern char *yytext;
+#endif
+int
+main (void)
+{
+  return ! yylex () + ! yywrap ();
+}
+_ACEOF
+{ { ac_try="$LEX conftest.l"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$LEX conftest.l") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
+$as_echo_n "checking lex output file root... " >&6; }
+if ${ac_cv_prog_lex_root+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+if test -f lex.yy.c; then
+  ac_cv_prog_lex_root=lex.yy
+elif test -f lexyy.c; then
+  ac_cv_prog_lex_root=lexyy
+else
+  as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
+$as_echo "$ac_cv_prog_lex_root" >&6; }
+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+
+if test -z "${LEXLIB+set}"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
+$as_echo_n "checking lex library... " >&6; }
+if ${ac_cv_lib_lex+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    ac_save_LIBS=$LIBS
+    ac_cv_lib_lex='none needed'
+    for ac_lib in '' -lfl -ll; do
+      LIBS="$ac_lib $ac_save_LIBS"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_lex=$ac_lib
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+      test "$ac_cv_lib_lex" != 'none needed' && break
+    done
+    LIBS=$ac_save_LIBS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
+$as_echo "$ac_cv_lib_lex" >&6; }
+  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
+$as_echo_n "checking whether yytext is a pointer... " >&6; }
+if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # POSIX says lex can declare yytext either as a pointer or an array; the
+# default is implementation-dependent.  Figure out which it is, since
+# not all implementations provide the %pointer and %array declarations.
+ac_cv_prog_lex_yytext_pointer=no
+ac_save_LIBS=$LIBS
+LIBS="$LEXLIB $ac_save_LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  #define YYTEXT_POINTER 1
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_prog_lex_yytext_pointer=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_save_LIBS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
+$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
+if test $ac_cv_prog_lex_yytext_pointer = yes; then
+
+$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
+
+fi
+rm -f conftest.l $LEX_OUTPUT_ROOT.c
+
+fi
+if test "$LEX" = :; then
+  LEX=${am_missing_run}flex
+fi
+for ac_prog in 'bison -y' byacc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_YACC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$YACC"; then
+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_YACC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+YACC=$ac_cv_prog_YACC
+if test -n "$YACC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$YACC" && break
+done
+test -n "$YACC" || YACC="yacc"
+
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+#
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG(MIN-VERSION)
+# ----------------------------------
+# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE(PKG_PROG_PKG_CONFIG)
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+
+
+# _PKG_CONFIG(VARIABLE, COMMAND, MODULES)
+# ---------------------------------------------
+# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, ACTION-IF-FOUND,
+# ACTION-IF-NOT-FOUND)
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+# PKG_CHECK_VAR
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  \\/* | ?:\\/*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  \\/* | ?:\\/*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
 ac_config_headers="$ac_config_headers mpfc-config.h"
 
 
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  \\/$* | ?:\\/*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
@@ -11777,9 +12709,6 @@
 
 
 
-      GETTEXT_MACRO_VERSION=0.18
-
-
 
 
 # Prepare PATH_SEPARATOR.
@@ -11869,7 +12798,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12055,9 +12984,6 @@
         test -n "$localedir" || localedir='${datadir}/locale'
 
 
-    test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-
-
   ac_config_commands="$ac_config_commands po-directories"
 
 
@@ -12112,7 +13038,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12152,7 +13078,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12192,37 +13118,7 @@
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
-$as_echo_n "checking whether the -Werror option is usable... " >&6; }
-    if ${gl_cv_cc_vis_werror+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-      gl_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -Werror"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_cc_vis_werror=yes
-else
-  gl_cv_cc_vis_werror=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-      CFLAGS="$gl_save_CFLAGS"
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-$as_echo "$gl_cv_cc_vis_werror" >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 $as_echo_n "checking for simple visibility declarations... " >&6; }
     if ${gl_cv_cc_visibility+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -12230,16 +13126,12 @@
 
       gl_save_CFLAGS="$CFLAGS"
       CFLAGS="$CFLAGS -fvisibility=hidden"
-                                    if test $gl_cv_cc_vis_werror = yes; then
-        CFLAGS="$CFLAGS -Werror"
-      fi
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 extern __attribute__((__visibility__("hidden"))) int hiddenvar;
          extern __attribute__((__visibility__("default"))) int exportedvar;
          extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
          extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-         void dummyfunc (void) {}
 int
 main ()
 {
@@ -12511,23 +13403,20 @@
 /* end confdefs.h.  */
 $ac_includes_default
 int
-find_stack_direction ()
+find_stack_direction (int *addr, int depth)
 {
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
+  int dir, dummy = 0;
+  if (! addr)
+    addr = &dummy;
+  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
+  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
+  return dir + dummy;
 }
 
 int
-main ()
+main (int argc, char **argv)
 {
-  return find_stack_direction () < 0;
+  return find_stack_direction (0, argc + !argv + 20) < 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -12758,28 +13647,15 @@
   $as_echo_n "(cached) " >&6
 else
 
-      gt_cv_int_divbyzero_sigfpe=
-      case "$host_os" in
-        macos* | darwin6-9* | darwin1-90-9*)
-          # On MacOS X 10.2 or newer, just assume the same as when cross-
-          # compiling. If we were to perform the real test, 1 Crash Report
-          # dialog window would pop up.
+      if test "$cross_compiling" = yes; then :
+
+          # Guess based on the CPU.
           case "$host_cpu" in
-            i3456786 | x86_64)
-              gt_cv_int_divbyzero_sigfpe="guessing yes" ;;
+            alpha* | i3456786 | m68k | s390*)
+              gt_cv_int_divbyzero_sigfpe="guessing yes";;
+            *)
+              gt_cv_int_divbyzero_sigfpe="guessing no";;
           esac
-          ;;
-      esac
-      if test -z "$gt_cv_int_divbyzero_sigfpe"; then
-        if test "$cross_compiling" = yes; then :
-
-            # Guess based on the CPU.
-            case "$host_cpu" in
-              alpha* | i3456786 | x86_64 | m68k | s390*)
-                gt_cv_int_divbyzero_sigfpe="guessing yes";;
-              *)
-                gt_cv_int_divbyzero_sigfpe="guessing no";;
-            esac
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12789,7 +13665,11 @@
 #include <signal.h>
 
 static void
+#ifdef __cplusplus
 sigfpe_handler (int sig)
+#else
+sigfpe_handler (sig) int sig;
+#endif
 {
   /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
   exit (sig != SIGFPE);
@@ -12827,7 +13707,6 @@
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-      fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_int_divbyzero_sigfpe" >&5
@@ -12885,35 +13764,19 @@
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-  /* For now, do not test the preprocessor; as of 2007 there are too many
-         implementations with broken preprocessors.  Perhaps this can
-         be revisited in 2012.  In the meantime, code should not expect
-         #if to work with literals wider than 32 bits.  */
-      /* Test literals.  */
-      long long int ll = 9223372036854775807ll;
-      long long int nll = -9223372036854775807LL;
-      unsigned long long int ull = 18446744073709551615ULL;
-      /* Test constant expressions.   */
-      typedef int a((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
-                     ? 1 : -1);
-      typedef int b(18446744073709551615ULL <= (unsigned long long int) -1
-                     ? 1 : -1);
-      int i = 63;
+unsigned long long int ull = 18446744073709551615ULL;
+	    typedef int a(18446744073709551615ULL <= (unsigned long long int) -1
+			   ? 1 : -1);
+	   int i = 63;
 int
 main ()
 {
-/* Test availability of runtime routines for shift and division.  */
-      long long int llmax = 9223372036854775807ll;
-      unsigned long long int ullmax = 18446744073709551615ull;
-      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
-              | (llmax / ll) | (llmax % ll)
-              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
-              | (ullmax / ull) | (ullmax % ull));
+unsigned long long int ullmax = 18446744073709551615ull;
+	    return (ull << 63 | ull >> 63 | ull << i | ull >> i
+		    | ullmax / ull | ullmax % ull);
   ;
   return 0;
 }
-
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_type_unsigned_long_long_int=yes
@@ -12933,10 +13796,19 @@
 
 
 
+  ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int
+  if test $ac_cv_type_unsigned_long_long = yes; then
+
+$as_echo "#define HAVE_UNSIGNED_LONG_LONG 1" >>confdefs.h
+
+  fi
+
+
+
 
   if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
 
-    test $ac_cv_type_unsigned_long_long_int = yes \
+    test $ac_cv_type_unsigned_long_long = yes \
       && ac_type='unsigned long long' \
       || ac_type='unsigned long'
 
@@ -13009,89 +13881,16 @@
 
 
 
-  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
-  MINIX=yes
-else
-  MINIX=
-fi
-
-
-  if test "$MINIX" = yes; then
-
-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
-
-
-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
-
-
-$as_echo "#define _MINIX 1" >>confdefs.h
-
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#	  define __EXTENSIONS__ 1
-	  $ac_includes_default
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_safe_to_define___extensions__=yes
-else
-  ac_cv_safe_to_define___extensions__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-  test $ac_cv_safe_to_define___extensions__ = yes &&
-    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-
-  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
-
-  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-
-  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-
-  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
-
-
-
 
 
-
-
-  # Check whether --enable-threads was given.
+       # Check whether --enable-threads was given.
 if test "${enable_threads+set}" = set; then :
   enableval=$enable_threads; gl_use_threads=$enableval
 else
-  if test -n "$gl_use_threads_default"; then
-       gl_use_threads="$gl_use_threads_default"
-     else
-       case "$host_os" in
-                                                               osf*) gl_use_threads=no ;;
-         cygwin*)
-               case `uname -r` in
-                 1.0-5.*) gl_use_threads=no ;;
-                 *)         gl_use_threads=yes ;;
-               esac
-               ;;
-         *)    gl_use_threads=yes ;;
-       esac
-     fi
+  case "$host_os" in
+                            osf*) gl_use_threads=no ;;
+       *)    gl_use_threads=yes ;;
+     esac
 
 fi
 
@@ -13176,7 +13975,7 @@
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -13210,9 +14009,9 @@
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
       *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break ;;
+	test "$with_gnu_ld" != no && break ;;
       *)
-        test "$with_gnu_ld" != yes && break ;;
+	test "$with_gnu_ld" != yes && break ;;
       esac
     fi
   done
@@ -13267,14 +14066,12 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
 $as_echo "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
-  acl_libext="$acl_cv_libext"
-  acl_shlibext="$acl_cv_shlibext"
-  acl_libname_spec="$acl_cv_libname_spec"
-  acl_library_names_spec="$acl_cv_library_names_spec"
-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  acl_hardcode_direct="$acl_cv_hardcode_direct"
-  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  libext="$acl_cv_libext"
+  shlibext="$acl_cv_shlibext"
+  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  hardcode_direct="$acl_cv_hardcode_direct"
+  hardcode_minus_L="$acl_cv_hardcode_minus_L"
     # Check whether --enable-rpath was given.
 if test "${enable_rpath+set}" = set; then :
   enableval=$enable_rpath; :
@@ -13284,67 +14081,23 @@
 
 
 
-
-  acl_libdirstem=lib
-  acl_libdirstem2=
-  case "$host_os" in
-    solaris*)
-                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
-$as_echo_n "checking for 64-bit host... " >&6; }
-if ${gl_cv_solaris_64bit+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef _LP64
-sixtyfour bits
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
-  gl_cv_solaris_64bit=yes
-else
-  gl_cv_solaris_64bit=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
-$as_echo "$gl_cv_solaris_64bit" >&6; }
-      if test $gl_cv_solaris_64bit = yes; then
-        acl_libdirstem=lib/64
-        case "$host_cpu" in
-          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
-          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+                  acl_libdirstem=lib
+  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+  if test -n "$searchpath"; then
+    acl_save_IFS="${IFS= 	}"; IFS=":"
+    for searchdir in $searchpath; do
+      if test -d "$searchdir"; then
+        case "$searchdir" in
+          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+          *) searchdir=`cd "$searchdir" && pwd`
+             case "$searchdir" in
+               */lib64 ) acl_libdirstem=lib64 ;;
+             esac ;;
         esac
       fi
-      ;;
-    *)
-      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-      if test -n "$searchpath"; then
-        acl_save_IFS="${IFS= 	}"; IFS=":"
-        for searchdir in $searchpath; do
-          if test -d "$searchdir"; then
-            case "$searchdir" in
-              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-              */../ | */.. )
-                # Better ignore directories of this form. They are misleading.
-                ;;
-              *) searchdir=`cd "$searchdir" && pwd`
-                 case "$searchdir" in
-                   */lib64 ) acl_libdirstem=lib64 ;;
-                 esac ;;
-            esac
-          fi
-        done
-        IFS="$acl_save_IFS"
-      fi
-      ;;
-  esac
-  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+    done
+    IFS="$acl_save_IFS"
+  fi
 
 
 
@@ -13356,11 +14109,8 @@
   if test "$gl_use_threads" != no; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
 $as_echo_n "checking whether imported symbols can be declared weak... " >&6; }
-if ${gl_cv_have_weak+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  gl_cv_have_weak=no
-              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    gl_have_weak=no
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 extern void xyzzy ();
 #pragma weak xyzzy
@@ -13373,56 +14123,15 @@
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  gl_cv_have_weak=maybe
+  gl_have_weak=yes
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-       if test $gl_cv_have_weak = maybe; then
-                           if test "$cross_compiling" = yes; then :
-                          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __ELF__
-               Extensible Linking Format
-               #endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Extensible Linking Format" >/dev/null 2>&1; then :
-  gl_cv_have_weak="guessing yes"
-else
-  gl_cv_have_weak="guessing no"
-fi
-rm -f conftest*
-
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#pragma weak fputs
-int main ()
-{
-  return (fputs == NULL);
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_have_weak=yes
-else
-  gl_cv_have_weak=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-       fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5
-$as_echo "$gl_cv_have_weak" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_have_weak" >&5
+$as_echo "$gl_have_weak" >&6; }
     if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
       # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
-      # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
+      # it groks <pthread.h>. It's added above, in gl_LOCK_EARLY_BODY.
       ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
 if test "x$ac_cv_header_pthread_h" = xyes; then :
   gl_have_pthread_h=yes
@@ -13608,7 +14317,7 @@
 $as_echo "#define USE_POSIX_THREADS 1" >>confdefs.h
 
           if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
-            if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+            if test $gl_have_weak = yes; then
 
 $as_echo "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h
 
@@ -13616,6 +14325,39 @@
               LTLIBTHREAD=
             fi
           fi
+          # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
+          # pthread_rwlock_* functions.
+          ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h>
+"
+if test "x$ac_cv_type_pthread_rwlock_t" = xyes; then :
+
+$as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
+
+fi
+
+          # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main ()
+{
+#if __FreeBSD__ == 4
+error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
+#else
+int x = (int)PTHREAD_MUTEX_RECURSIVE;
+return !x;
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         fi
       fi
     fi
@@ -13651,7 +14393,7 @@
 
 $as_echo "#define USE_SOLARIS_THREADS 1" >>confdefs.h
 
-          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+          if test $gl_have_weak = yes; then
 
 $as_echo "#define USE_SOLARIS_THREADS_WEAK 1" >>confdefs.h
 
@@ -13677,10 +14419,6 @@
 
 
 
-
-
-
-
     use_additional=yes
 
   acl_save_prefix="$prefix"
@@ -13717,10 +14455,6 @@
       else
         additional_includedir="$withval/include"
         additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && ! test -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
       fi
     fi
 
@@ -13729,8 +14463,6 @@
       LIBPTH=
   LTLIBPTH=
   INCPTH=
-  LIBPTH_PREFIX=
-      HAVE_LIBPTH=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -13764,50 +14496,27 @@
           found_la=
           found_so=
           found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
           if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
+              found_dir="$additional_libdir"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
               else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
+                found_so="$additional_libdir/lib$name.dll.a"
               fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
               fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
               fi
             fi
           fi
@@ -13825,42 +14534,26 @@
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                                    if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
+                    found_dir="$dir"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
                     else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
+                      found_so="$dir/lib$name.dll.a"
                     fi
-                  fi
-                                    if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
                     fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
                     fi
                   fi
                   ;;
@@ -13873,9 +14566,7 @@
           if test "X$found_dir" != "X"; then
                         LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                                 LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
               else
                                                                                 haveit=
@@ -13888,10 +14579,10 @@
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$acl_hardcode_direct" = yes; then
+                                if test "$hardcode_direct" = yes; then
                                                       LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
                 else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
                                                             LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -13923,7 +14614,7 @@
                     if test -z "$haveit"; then
                       LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir"
                     fi
-                    if test "$acl_hardcode_minus_L" != no; then
+                    if test "$hardcode_minus_L" != no; then
                                                                                         LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
                     else
                                                                                                                                                                                 LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name"
@@ -13942,16 +14633,6 @@
             case "$found_dir" in
               */$acl_libdirstem | */$acl_libdirstem/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = 'pth'; then
-                  LIBPTH_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = 'pth'; then
-                  LIBPTH_PREFIX="$basedir"
-                fi
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -14000,11 +14681,9 @@
                 case "$dep" in
                   -L*)
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
                         if test -n "$GCC"; then
                           case $host_os in
                             linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -14104,21 +14783,21 @@
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
+    if test -n "$hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      eval flag=\"$hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBPTH="${LIBPTH}${LIBPTH:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        eval flag=\"$hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBPTH="${LIBPTH}${LIBPTH:+ }$flag"
       done
@@ -14130,15 +14809,9 @@
     done
   fi
 
-
-
-
-
-
     ac_cv_libpth_libs="$LIBPTH"
     ac_cv_libpth_ltlibs="$LTLIBPTH"
     ac_cv_libpth_cppflags="$INCPTH"
-    ac_cv_libpth_prefix="$LIBPTH_PREFIX"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libpth_libs" >&5
@@ -14146,7 +14819,6 @@
   LIBPTH="$ac_cv_libpth_libs"
   LTLIBPTH="$ac_cv_libpth_ltlibs"
   INCPTH="$ac_cv_libpth_cppflags"
-  LIBPTH_PREFIX="$ac_cv_libpth_prefix"
 
   for element in $INCPTH; do
     haveit=
@@ -14172,7 +14844,6 @@
 
 
 
-
       HAVE_LIBPTH=yes
 
 
@@ -14207,7 +14878,7 @@
 $as_echo "#define USE_PTH_THREADS 1" >>confdefs.h
 
         if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
-          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+          if test $gl_have_weak = yes; then
 
 $as_echo "#define USE_PTH_THREADS_WEAK 1" >>confdefs.h
 
@@ -14249,48 +14920,6 @@
 
 
 
-  if test "$gl_threads_api" = posix; then
-    # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
-    # pthread_rwlock_* functions.
-    ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h>
-"
-if test "x$ac_cv_type_pthread_rwlock_t" = xyes; then :
-
-$as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
-
-fi
-
-    # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <pthread.h>
-int
-main ()
-{
-#if __FreeBSD__ == 4
-error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
-#else
-int x = (int)PTHREAD_MUTEX_RECURSIVE;
-return !x;
-#endif
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  fi
-
-
-
-
-
-
-
 
 
 
@@ -14335,10 +14964,6 @@
       else
         additional_includedir="$withval/include"
         additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && ! test -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
       fi
     fi
 
@@ -14347,8 +14972,6 @@
       LIBICONV=
   LTLIBICONV=
   INCICONV=
-  LIBICONV_PREFIX=
-      HAVE_LIBICONV=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -14382,50 +15005,27 @@
           found_la=
           found_so=
           found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
           if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
+              found_dir="$additional_libdir"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
               else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
+                found_so="$additional_libdir/lib$name.dll.a"
               fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
               fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
               fi
             fi
           fi
@@ -14443,42 +15043,26 @@
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                                    if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
+                    found_dir="$dir"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
                     else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
+                      found_so="$dir/lib$name.dll.a"
                     fi
-                  fi
-                                    if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
                     fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
                     fi
                   fi
                   ;;
@@ -14491,9 +15075,7 @@
           if test "X$found_dir" != "X"; then
                         LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                                 LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
               else
                                                                                 haveit=
@@ -14506,10 +15088,10 @@
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$acl_hardcode_direct" = yes; then
+                                if test "$hardcode_direct" = yes; then
                                                       LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                 else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
                                                             LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -14541,7 +15123,7 @@
                     if test -z "$haveit"; then
                       LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
                     fi
-                    if test "$acl_hardcode_minus_L" != no; then
+                    if test "$hardcode_minus_L" != no; then
                                                                                         LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                     else
                                                                                                                                                                                 LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
@@ -14560,16 +15142,6 @@
             case "$found_dir" in
               */$acl_libdirstem | */$acl_libdirstem/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = 'iconv'; then
-                  LIBICONV_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = 'iconv'; then
-                  LIBICONV_PREFIX="$basedir"
-                fi
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -14618,11 +15190,9 @@
                 case "$dep" in
                   -L*)
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
                         if test -n "$GCC"; then
                           case $host_os in
                             linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -14722,21 +15292,21 @@
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
+    if test -n "$hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      eval flag=\"$hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        eval flag=\"$hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
       done
@@ -14752,6 +15322,134 @@
 
 
 
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+$as_echo "#define HAVE_BUILTIN_EXPECT 1" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+  for ac_header in argz.h inttypes.h limits.h unistd.h sys/param.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+  for ac_func in getcwd getegid geteuid getgid getuid mempcpy munmap \
+    stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \
+    argz_next __fsetlocking
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether feof_unlocked is declared" >&5
+$as_echo_n "checking whether feof_unlocked is declared... " >&6; }
+if ${ac_cv_have_decl_feof_unlocked+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef feof_unlocked
+  char *p = (char *) feof_unlocked;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_decl_feof_unlocked=yes
+else
+  ac_cv_have_decl_feof_unlocked=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_feof_unlocked" >&5
+$as_echo "$ac_cv_have_decl_feof_unlocked" >&6; }
+  if test $ac_cv_have_decl_feof_unlocked = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FEOF_UNLOCKED $gt_value
+_ACEOF
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fgets_unlocked is declared" >&5
+$as_echo_n "checking whether fgets_unlocked is declared... " >&6; }
+if ${ac_cv_have_decl_fgets_unlocked+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef fgets_unlocked
+  char *p = (char *) fgets_unlocked;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_have_decl_fgets_unlocked=yes
+else
+  ac_cv_have_decl_fgets_unlocked=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_fgets_unlocked" >&5
+$as_echo "$ac_cv_have_decl_fgets_unlocked" >&6; }
+  if test $ac_cv_have_decl_fgets_unlocked = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FGETS_UNLOCKED $gt_value
+_ACEOF
+
 
 
 
@@ -14841,123 +15539,6 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
 $as_echo "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
-$as_echo_n "checking for working iconv... " >&6; }
-if ${am_cv_func_iconv_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-            am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-           *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <iconv.h>
-#include <string.h>
-int main ()
-{
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static const char input = "\342\202\254"; /* EURO SIGN */
-        char buf10;
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          return 1;
-      }
-  }
-  /* Test against Solaris 10 bug: Failures are not distinguishable from
-     successful returns.  */
-  {
-    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-    if (cd_ascii_to_88591 != (iconv_t)(-1))
-      {
-        static const char input = "\263";
-        char buf10;
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_ascii_to_88591,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          return 1;
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static const char input = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf50;
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          return 1;
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  am_cv_func_iconv_works=yes
-else
-  am_cv_func_iconv_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-      LIBS="$am_save_LIBS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-$as_echo "$am_cv_func_iconv_works" >&6; }
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
-  fi
-  if test "$am_func_iconv" = yes; then
 
 $as_echo "#define HAVE_ICONV 1" >>confdefs.h
 
@@ -15015,10 +15596,10 @@
 fi
 
     am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result:
-         $am_cv_proto_iconv" >&5
-$as_echo "
-         $am_cv_proto_iconv" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
+         }$am_cv_proto_iconv" >&5
+$as_echo "${ac_t:-
+         }$am_cv_proto_iconv" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define ICONV_CONST $am_cv_proto_iconv_arg1
@@ -15027,140 +15608,40 @@
   fi
 
 
-
-
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NL_LOCALE_NAME macro" >&5
+$as_echo_n "checking for NL_LOCALE_NAME macro... " >&6; }
+if ${gt_cv_nl_locale_name+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }
+#include <langinfo.h>
+#include <locale.h>
 int
 main ()
 {
-
+char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-
-$as_echo "#define HAVE_BUILTIN_EXPECT 1" >>confdefs.h
-
+  gt_cv_nl_locale_name=yes
+else
+  gt_cv_nl_locale_name=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-  for ac_header in argz.h inttypes.h limits.h unistd.h sys/param.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-  for ac_func in getcwd getegid geteuid getgid getuid mempcpy munmap \
-    stpcpy strcasecmp strdup strtoul tsearch uselocale argz_count \
-    argz_stringify argz_next __fsetlocking
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
 fi
-done
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether feof_unlocked is declared" >&5
-$as_echo_n "checking whether feof_unlocked is declared... " >&6; }
-if ${ac_cv_have_decl_feof_unlocked+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_nl_locale_name" >&5
+$as_echo "$gt_cv_nl_locale_name" >&6; }
+  if test $gt_cv_nl_locale_name = yes; then
 
-#ifndef feof_unlocked
-  char *p = (char *) feof_unlocked;
-#endif
+$as_echo "#define HAVE_NL_LOCALE_NAME 1" >>confdefs.h
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_have_decl_feof_unlocked=yes
-else
-  ac_cv_have_decl_feof_unlocked=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_feof_unlocked" >&5
-$as_echo "$ac_cv_have_decl_feof_unlocked" >&6; }
-  if test $ac_cv_have_decl_feof_unlocked = yes; then
-    gt_value=1
-  else
-    gt_value=0
   fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FEOF_UNLOCKED $gt_value
-_ACEOF
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fgets_unlocked is declared" >&5
-$as_echo_n "checking whether fgets_unlocked is declared... " >&6; }
-if ${ac_cv_have_decl_fgets_unlocked+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-
-#ifndef fgets_unlocked
-  char *p = (char *) fgets_unlocked;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_have_decl_fgets_unlocked=yes
-else
-  ac_cv_have_decl_fgets_unlocked=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_fgets_unlocked" >&5
-$as_echo "$ac_cv_have_decl_fgets_unlocked" >&6; }
-  if test $ac_cv_have_decl_fgets_unlocked = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FGETS_UNLOCKED $gt_value
-_ACEOF
-
-
-
-
-
                       for ac_prog in bison
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -15179,7 +15660,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_INTLBISON="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15230,86 +15711,76 @@
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-  /* For now, do not test the preprocessor; as of 2007 there are too many
-         implementations with broken preprocessors.  Perhaps this can
-         be revisited in 2012.  In the meantime, code should not expect
-         #if to work with literals wider than 32 bits.  */
-      /* Test literals.  */
-      long long int ll = 9223372036854775807ll;
-      long long int nll = -9223372036854775807LL;
-      unsigned long long int ull = 18446744073709551615ULL;
-      /* Test constant expressions.   */
-      typedef int a((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
-                     ? 1 : -1);
-      typedef int b(18446744073709551615ULL <= (unsigned long long int) -1
-                     ? 1 : -1);
-      int i = 63;
+long long int ll = 9223372036854775807ll;
+	    long long int nll = -9223372036854775807LL;
+	    typedef int a((-9223372036854775807LL < 0
+			    && 0 < 9223372036854775807ll)
+			   ? 1 : -1);
+	    int i = 63;
 int
 main ()
 {
-/* Test availability of runtime routines for shift and division.  */
-      long long int llmax = 9223372036854775807ll;
-      unsigned long long int ullmax = 18446744073709551615ull;
-      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
-              | (llmax / ll) | (llmax % ll)
-              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
-              | (ullmax / ull) | (ullmax % ull));
+long long int llmax = 9223372036854775807ll;
+	    return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+		    | (llmax / ll) | (llmax % ll));
   ;
   return 0;
 }
-
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-                          if test "$cross_compiling" = yes; then :
   ac_cv_type_long_long_int=yes
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_cv_type_long_long_int=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
+$as_echo "$ac_cv_type_long_long_int" >&6; }
+  if test $ac_cv_type_long_long_int = yes; then
+
+$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
+
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double" >&5
+$as_echo_n "checking for long double... " >&6; }
+if ${gt_cv_c_long_double+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$GCC" = yes; then
+       gt_cv_c_long_double=yes
+     else
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
-               #ifndef LLONG_MAX
-               # define HALF \
-                        (1LL << (sizeof (long long int) * CHAR_BIT - 2))
-               # define LLONG_MAX (HALF - 1 + HALF)
-               #endif
+
+         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
+         long double foo = 0.0;
+         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
+         int array 2*(sizeof(long double) >= sizeof(double)) - 1;
+
 int
 main ()
 {
-long long int n = 1;
-               int i;
-               for (i = 0; ; i++)
-                 {
-                   long long int m = n << i;
-                   if (m >> i != n)
-                     return 1;
-                   if (LLONG_MAX / 2 < m)
-                     break;
-                 }
-               return 0;
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_type_long_long_int=yes
-else
-  ac_cv_type_long_long_int=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
+if ac_fn_c_try_compile "$LINENO"; then :
+  gt_cv_c_long_double=yes
 else
-  ac_cv_type_long_long_int=no
+  gt_cv_c_long_double=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
-$as_echo "$ac_cv_type_long_long_int" >&6; }
-  if test $ac_cv_type_long_long_int = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_long_double" >&5
+$as_echo "$gt_cv_c_long_double" >&6; }
+  if test $gt_cv_c_long_double = yes; then
 
-$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
+$as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h
 
   fi
 
@@ -15354,14 +15825,6 @@
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
-   before <wchar.h>.  */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
 #include <wchar.h>
        wint_t foo = (wchar_t)'\0';
 int
@@ -15444,7 +15907,7 @@
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
   notposix
 #endif
 
@@ -15544,7 +16007,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5
 $as_echo_n "checking for SIZE_MAX... " >&6; }
-if ${gl_cv_size_max+:} false; then :
+  if ${gl_cv_size_max+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -15575,12 +16038,14 @@
   size_t_bits_minus_1=
 fi
 
+
       if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) <= sizeof (unsigned int)" "fits_in_uint"        "#include <stddef.h>"; then :
 
 else
   fits_in_uint=
 fi
 
+
       if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
         if test $fits_in_uint = 1; then
                               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15613,7 +16078,8 @@
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_max" >&5
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_max" >&5
 $as_echo "$gl_cv_size_max" >&6; }
   if test "$gl_cv_size_max" != yes; then
 
@@ -15626,7 +16092,6 @@
 
 
 
-
   for ac_header in stdint.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
@@ -15641,103 +16106,6 @@
 
 
 
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
-$as_echo_n "checking for working fcntl.h... " >&6; }
-if ${gl_cv_header_working_fcntl_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  gl_cv_header_working_fcntl_h=cross-compiling
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-           #include <sys/stat.h>
-           #include <unistd.h>
-           #include <fcntl.h>
-           #ifndef O_NOATIME
-            #define O_NOATIME 0
-           #endif
-           #ifndef O_NOFOLLOW
-            #define O_NOFOLLOW 0
-           #endif
-           static int const constants =
-            {
-              O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
-              O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
-            };
-
-int
-main ()
-{
-
-            int status = !constants;
-            {
-              static char const sym = "conftest.sym";
-              if (symlink (".", sym) != 0
-                  || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0)
-                status |= 32;
-              unlink (sym);
-            }
-            {
-              static char const file = "confdefs.h";
-              int fd = open (file, O_RDONLY | O_NOATIME);
-              char c;
-              struct stat st0, st1;
-              if (fd < 0
-                  || fstat (fd, &st0) != 0
-                  || sleep (1) != 0
-                  || read (fd, &c, 1) != 1
-                  || close (fd) != 0
-                  || stat (file, &st1) != 0
-                  || st0.st_atime != st1.st_atime)
-                status |= 64;
-            }
-            return status;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_header_working_fcntl_h=yes
-else
-  case $? in #(
-        32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
-        64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
-        96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
-         *) gl_cv_header_working_fcntl_h='no';;
-        esac
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
-$as_echo "$gl_cv_header_working_fcntl_h" >&6; }
-
-  case $gl_cv_header_working_fcntl_h in #(
-  *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
-  *) ac_val=1;;
-  esac
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_WORKING_O_NOATIME $ac_val
-_ACEOF
-
-
-  case $gl_cv_header_working_fcntl_h in #(
-  *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
-  *) ac_val=1;;
-  esac
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_WORKING_O_NOFOLLOW $ac_val
-_ACEOF
-
-
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
 if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
@@ -15817,13 +16185,6 @@
 
 
 
-    case "$enable_silent_rules" in
-    yes) INTL_DEFAULT_VERBOSITY=0;;
-    no)  INTL_DEFAULT_VERBOSITY=1;;
-    *)   INTL_DEFAULT_VERBOSITY=1;;
-  esac
-
-
   ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
 if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
 
@@ -15847,8 +16208,7 @@
 
 done
 
-  for ac_func in asprintf fwprintf newlocale putenv setenv setlocale \
-    snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb
+  for ac_func in asprintf fwprintf putenv setenv setlocale snprintf wcslen
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -16003,12 +16363,6 @@
     HAVE_SNPRINTF=0
   fi
 
-  if test "$ac_cv_func_newlocale" = yes; then
-    HAVE_NEWLOCALE=1
-  else
-    HAVE_NEWLOCALE=0
-  fi
-
   if test "$ac_cv_func_wprintf" = yes; then
     HAVE_WPRINTF=1
   else
@@ -16086,7 +16440,7 @@
 
                 if test "$enable_shared" = yes; then
     case "$host_os" in
-      mingw* | cygwin*) is_woe32dll=yes ;;
+      cygwin*) is_woe32dll=yes ;;
       *) is_woe32dll=no ;;
     esac
   else
@@ -16095,114 +16449,6 @@
   WOE32DLL=$is_woe32dll
 
 
-      case "$host_os" in
-    mingw* | cygwin*) is_woe32=yes ;;
-    *) is_woe32=no ;;
-  esac
-  WOE32=$is_woe32
-
-  if test $WOE32 = yes; then
-        if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
-set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_WINDRES+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WINDRES=$ac_cv_prog_WINDRES
-if test -n "$WINDRES"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
-$as_echo "$WINDRES" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WINDRES"; then
-  ac_ct_WINDRES=$WINDRES
-  # Extract the first word of "windres", so it can be a program name with args.
-set dummy windres; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_WINDRES+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_WINDRES"; then
-  ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_WINDRES="windres"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
-if test -n "$ac_ct_WINDRES"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
-$as_echo "$ac_ct_WINDRES" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_WINDRES" = x; then
-    WINDRES=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WINDRES=$ac_ct_WINDRES
-  fi
-else
-  WINDRES="$ac_cv_prog_WINDRES"
-fi
-
-  fi
-
-              case "$host_os" in
-    hpux*) LTLIBC="" ;;
-    *)     LTLIBC="-lc" ;;
-  esac
-
-
-
 
 
 
@@ -16393,10 +16639,6 @@
 
 
 
-
-
-
-
     use_additional=yes
 
   acl_save_prefix="$prefix"
@@ -16433,10 +16675,6 @@
       else
         additional_includedir="$withval/include"
         additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && ! test -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
       fi
     fi
 
@@ -16445,8 +16683,6 @@
       LIBINTL=
   LTLIBINTL=
   INCINTL=
-  LIBINTL_PREFIX=
-      HAVE_LIBINTL=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -16480,50 +16716,27 @@
           found_la=
           found_so=
           found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
           if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
+              found_dir="$additional_libdir"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
               else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
+                found_so="$additional_libdir/lib$name.dll.a"
               fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
               fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
               fi
             fi
           fi
@@ -16541,42 +16754,26 @@
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                                    if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
+                    found_dir="$dir"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
                     else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
+                      found_so="$dir/lib$name.dll.a"
                     fi
-                  fi
-                                    if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
                     fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
                     fi
                   fi
                   ;;
@@ -16589,9 +16786,7 @@
           if test "X$found_dir" != "X"; then
                         LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                                 LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
               else
                                                                                 haveit=
@@ -16604,10 +16799,10 @@
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$acl_hardcode_direct" = yes; then
+                                if test "$hardcode_direct" = yes; then
                                                       LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                 else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
                                                             LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -16639,7 +16834,7 @@
                     if test -z "$haveit"; then
                       LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
                     fi
-                    if test "$acl_hardcode_minus_L" != no; then
+                    if test "$hardcode_minus_L" != no; then
                                                                                         LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                     else
                                                                                                                                                                                 LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
@@ -16658,16 +16853,6 @@
             case "$found_dir" in
               */$acl_libdirstem | */$acl_libdirstem/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = 'intl'; then
-                  LIBINTL_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = 'intl'; then
-                  LIBINTL_PREFIX="$basedir"
-                fi
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -16716,11 +16901,9 @@
                 case "$dep" in
                   -L*)
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
                         if test -n "$GCC"; then
                           case $host_os in
                             linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -16820,21 +17003,21 @@
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
+    if test -n "$hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      eval flag=\"$hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        eval flag=\"$hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
       done
@@ -16846,11 +17029,6 @@
     done
   fi
 
-
-
-
-
-
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 $as_echo_n "checking for GNU gettext in libintl... " >&6; }
 if eval \${$gt_func_gnugettext_libintl+:} false; then :
@@ -17078,77 +17256,88 @@
 
 
 
+CFLAGS="$CFLAGS -D_GNU_SOURCE"
+
+
 # Set up common libraries
 #COMMON_LIBS="-ldmalloc"
 COMMON_LIBS=""
 
 
 # Check for ncurses
-LIBS_save=$LIBS
-for ac_header in curses.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
-if test "x$ac_cv_header_curses_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CURSES_H 1
-_ACEOF
 
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURSES" >&5
+$as_echo_n "checking for CURSES... " >&6; }
+
+if test -n "$CURSES_CFLAGS"; then
+    pkg_cv_CURSES_CFLAGS="$CURSES_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CURSES_CFLAGS=`$PKG_CONFIG --cflags "ncursesw" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  as_fn_error $? "*** Can't find curses.h ***" "$LINENO" 5
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$CURSES_LIBS"; then
+    pkg_cv_CURSES_LIBS="$CURSES_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CURSES_LIBS=`$PKG_CONFIG --libs "ncursesw" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
 
-done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for waddch in -lncursesw" >&5
-$as_echo_n "checking for waddch in -lncursesw... " >&6; }
-if ${ac_cv_lib_ncursesw_waddch+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncursesw  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char waddch ();
-int
-main ()
-{
-return waddch ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ncursesw_waddch=yes
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
-  ac_cv_lib_ncursesw_waddch=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+        _pkg_short_errors_supported=no
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_waddch" >&5
-$as_echo "$ac_cv_lib_ncursesw_waddch" >&6; }
-if test "x$ac_cv_lib_ncursesw_waddch" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNCURSESW 1
-_ACEOF
-
-  LIBS="-lncursesw $LIBS"
+        if test $_pkg_short_errors_supported = yes; then
+	        CURSES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ncursesw" 2>&1`
+        else
+	        CURSES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ncursesw" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$CURSES_PKG_ERRORS" >&5
 
+	as_fn_error $? "*** ncursesw not found ***" "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	as_fn_error $? "*** ncursesw not found ***" "$LINENO" 5
 else
-  as_fn_error $? "*** Can't find ncurses library ***" "$LINENO" 5
+	CURSES_CFLAGS=$pkg_cv_CURSES_CFLAGS
+	CURSES_LIBS=$pkg_cv_CURSES_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
 fi
 
-CURSES_LIBS="-lncursesw"
 
-LIBS=$LIBS_save
 
 # Check for pthread
 LIBS_save=$LIBS
@@ -17446,120 +17635,98 @@
 
 LIBS=$LIBS_save
 
-# Check for ICU library
-LIBS_save=$LIBS
-for ac_header in unicode/ucnv.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "unicode/ucnv.h" "ac_cv_header_unicode_ucnv_h" "$ac_includes_default"
-if test "x$ac_cv_header_unicode_ucnv_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_UNICODE_UCNV_H 1
-_ACEOF
+# Check for json
 
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JSON" >&5
+$as_echo_n "checking for JSON... " >&6; }
+
+if test -n "$JSON_CFLAGS"; then
+    pkg_cv_JSON_CFLAGS="$JSON_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "json-glib-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_JSON_CFLAGS=`$PKG_CONFIG --cflags "json-glib-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  as_fn_error $? "*** Can't find libicu header ***" "$LINENO" 5
+  pkg_failed=yes
 fi
-
-done
-
-#AC_CHECK_LIB(icuuc, ucnv_open,,AC_MSG_ERROR(*** Can't find libicu ***))
-ICU_LIBS="-licuuc"
-
-LIBS=$LIBS_save
-
-# Stuff for mp3 plugin
-# Check whether --enable-mp3 was given.
-if test "${enable_mp3+set}" = set; then :
-  enableval=$enable_mp3;
-else
-  enable_mp3="yes"
+ else
+    pkg_failed=untried
 fi
-
-if test "x$enable_mp3" = xyes; then
-	# Check for math lib
-	LIBS_save=$LIBS
-	for ac_header in math.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "math.h" "ac_cv_header_math_h" "$ac_includes_default"
-if test "x$ac_cv_header_math_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MATH_H 1
-_ACEOF
-
+if test -n "$JSON_LIBS"; then
+    pkg_cv_JSON_LIBS="$JSON_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "json-glib-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_JSON_LIBS=`$PKG_CONFIG --libs "json-glib-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  as_fn_error $? "*** Can't find math header ***" "$LINENO" 5
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
 
-done
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
-$as_echo_n "checking for pow in -lm... " >&6; }
-if ${ac_cv_lib_m_pow+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pow ();
-int
-main ()
-{
-return pow ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_pow=yes
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
-  ac_cv_lib_m_pow=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+        _pkg_short_errors_supported=no
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
-$as_echo "$ac_cv_lib_m_pow" >&6; }
-if test "x$ac_cv_lib_m_pow" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
-
-  LIBS="-lm $LIBS"
+        if test $_pkg_short_errors_supported = yes; then
+	        JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json-glib-1.0" 2>&1`
+        else
+	        JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json-glib-1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$JSON_PKG_ERRORS" >&5
 
+	as_fn_error $? "*** json-glib 1.0 not found ***" "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	as_fn_error $? "*** json-glib 1.0 not found ***" "$LINENO" 5
 else
-  as_fn_error $? "*** Can't find libm ***" "$LINENO" 5
+	JSON_CFLAGS=$pkg_cv_JSON_CFLAGS
+	JSON_LIBS=$pkg_cv_JSON_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
 fi
 
-	MATH_LIBS="-lm"
 
-	LIBS=$LIBS_save
 
-	# Check for libmad
-	LIBS_save=$LIBS
-	for ac_header in mad.h
+# Check for math lib
+LIBS_save=$LIBS
+for ac_header in math.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "mad.h" "ac_cv_header_mad_h" "$ac_includes_default"
-if test "x$ac_cv_header_mad_h" = xyes; then :
+  ac_fn_c_check_header_mongrel "$LINENO" "math.h" "ac_cv_header_math_h" "$ac_includes_default"
+if test "x$ac_cv_header_math_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_MAD_H 1
+#define HAVE_MATH_H 1
 _ACEOF
 
 else
-  as_fn_error $? "*** Can't find libmad header ***" "$LINENO" 5
+  as_fn_error $? "*** Can't find math header ***" "$LINENO" 5
 fi
 
 done
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
 $as_echo_n "checking for pow in -lm... " >&6; }
 if ${ac_cv_lib_m_pow+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -17603,111 +17770,59 @@
   LIBS="-lm $LIBS"
 
 else
-  as_fn_error $? "*** Can't find libmad ***" "$LINENO" 5
+  as_fn_error $? "*** Can't find libm ***" "$LINENO" 5
 fi
 
-	MAD_LIBS="-lmad"
+MATH_LIBS="-lm"
 
-	LIBS=$LIBS_save
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** mp3 plugin disabled per user request ***" >&5
-$as_echo "*** mp3 plugin disabled per user request ***" >&6; }
-fi
+LIBS=$LIBS_save
 
-# Stuff for flac plugin
-# Check whether --enable-flac was given.
-if test "${enable_flac+set}" = set; then :
-  enableval=$enable_flac;
+# Stuff for cue plugin
+# Check whether --enable-cue was given.
+if test "${enable_cue+set}" = set; then :
+  enableval=$enable_cue;
 else
-  enable_flac="yes"
+  enable_cue="yes"
 fi
 
-if test "x$enable_flac" = xyes; then
-	# Check for flac library
+if test "x$enable_cue" = xyes; then
 	LIBS_save=$LIBS
-	for ac_header in FLAC/all.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "FLAC/all.h" "ac_cv_header_FLAC_all_h" "$ac_includes_default"
-if test "x$ac_cv_header_FLAC_all_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FLAC_ALL_H 1
-_ACEOF
-
-else
-  as_fn_error $? "*** Can't find FLAC/all.h ***" "$LINENO" 5
-fi
-
-done
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC__stream_decoder_process_single in -lFLAC" >&5
-$as_echo_n "checking for FLAC__stream_decoder_process_single in -lFLAC... " >&6; }
-if ${ac_cv_lib_FLAC_FLAC__stream_decoder_process_single+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lFLAC  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char FLAC__stream_decoder_process_single ();
-int
-main ()
-{
-return FLAC__stream_decoder_process_single ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_FLAC_FLAC__stream_decoder_process_single=yes
+	LIBS=$LIBS_save
 else
-  ac_cv_lib_FLAC_FLAC__stream_decoder_process_single=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** cue plugin disabled per user request ***" >&5
+$as_echo "*** cue plugin disabled per user request ***" >&6; }
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_process_single" >&5
-$as_echo "$ac_cv_lib_FLAC_FLAC__stream_decoder_process_single" >&6; }
-if test "x$ac_cv_lib_FLAC_FLAC__stream_decoder_process_single" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBFLAC 1
-_ACEOF
-
-  LIBS="-lFLAC $LIBS"
 
+# Stuff for m3u plugin
+# Check whether --enable-m3u was given.
+if test "${enable_m3u+set}" = set; then :
+  enableval=$enable_m3u;
 else
-  as_fn_error $? "*** Can't find FLAC library ***" "$LINENO" 5
+  enable_m3u="yes"
 fi
 
-	FLAC_LIBS="-lFLAC"
-
+if test "x$enable_m3u" = xyes; then
+	LIBS_save=$LIBS
 	LIBS=$LIBS_save
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** flac plugin disabled per user request ***" >&5
-$as_echo "*** flac plugin disabled per user request ***" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** m3u plugin disabled per user request ***" >&5
+$as_echo "*** m3u plugin disabled per user request ***" >&6; }
 fi
 
-# Stuff for cue plugin
-# Check whether --enable-cue was given.
-if test "${enable_cue+set}" = set; then :
-  enableval=$enable_cue;
+# Stuff for pls plugin
+# Check whether --enable-pls was given.
+if test "${enable_pls+set}" = set; then :
+  enableval=$enable_pls;
 else
-  enable_cue="yes"
+  enable_pls="yes"
 fi
 
-if test "x$enable_cue" = xyes; then
+if test "x$enable_pls" = xyes; then
 	LIBS_save=$LIBS
 	LIBS=$LIBS_save
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** cue plugin disabled per user request ***" >&5
-$as_echo "*** cue plugin disabled per user request ***" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** pls plugin disabled per user request ***" >&5
+$as_echo "*** pls plugin disabled per user request ***" >&6; }
 fi
 
 # Stuff for audiocd plugin
@@ -17719,376 +17834,265 @@
 fi
 
 if test "x$enable_audiocd" = xyes; then
-	# Check for cdrom includes
-	for ac_header in linux/cdrom.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "linux/cdrom.h" "ac_cv_header_linux_cdrom_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_cdrom_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LINUX_CDROM_H 1
-_ACEOF
-
-else
-  as_fn_error $? "*** Can't find linux/cdrom.h ***" "$LINENO" 5
-fi
-
-done
-
+	LIBS_save=$LIBS
+	LIBS=$LIBS_save
 else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** audiocd plugin disabled per user request ***" >&5
 $as_echo "*** audiocd plugin disabled per user request ***" >&6; }
 fi
 
-# Stuff for ogg plugin
-# Check whether --enable-ogg was given.
-if test "${enable_ogg+set}" = set; then :
-  enableval=$enable_ogg;
-else
-  enable_ogg="yes"
-fi
+# Choose general plugins
+ALL_GENERAL_PLUGINS=""
+for plugin in $ALL_GENERAL_PLUGINS; do
+	name="\$enable_general_$plugin"
+	value=`eval echo $name`
+	SUMMARY_MSG="No"
+	if test "x${value}" = xyes; then
+		GENERAL_PLUGINS="$GENERAL_PLUGINS $plugin"
+		SUMMARY_MSG="Yes"
+	fi
+	GENERAL_SUMMARY="$GENERAL_SUMMARY\n$plugin: $SUMMARY_MSG"
+done
 
-if test "x$enable_ogg" = xyes; then
-	# Check for libvorbis
-	LIBS_save=$LIBS
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_dsp_clear in -lvorbis" >&5
-$as_echo_n "checking for vorbis_dsp_clear in -lvorbis... " >&6; }
-if ${ac_cv_lib_vorbis_vorbis_dsp_clear+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lvorbis  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+# Choose playlist plugins
+ALL_PLIST_PLUGINS="m3u pls cue audiocd"
+for plugin in $ALL_PLIST_PLUGINS; do
+	name="\$enable_$plugin"
+	value=`eval echo $name`
+	SUMMARY_MSG="No"
+	if test "x${value}" = xyes; then
+		PLIST_PLUGINS="$PLIST_PLUGINS $plugin"
+		SUMMARY_MSG="Yes"
+	fi
+	PLIST_SUMMARY="$PLIST_SUMMARY\n$plugin: $SUMMARY_MSG"
+done
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char vorbis_dsp_clear ();
-int
-main ()
-{
-return vorbis_dsp_clear ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_vorbis_vorbis_dsp_clear=yes
-else
-  ac_cv_lib_vorbis_vorbis_dsp_clear=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbis_vorbis_dsp_clear" >&5
-$as_echo "$ac_cv_lib_vorbis_vorbis_dsp_clear" >&6; }
-if test "x$ac_cv_lib_vorbis_vorbis_dsp_clear" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBVORBIS 1
-_ACEOF
 
-  LIBS="-lvorbis $LIBS"
 
-else
-  as_fn_error $? "*** Can't find libvorbis ***" "$LINENO" 5
-fi
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ov_open in -lvorbisfile" >&5
-$as_echo_n "checking for ov_open in -lvorbisfile... " >&6; }
-if ${ac_cv_lib_vorbisfile_ov_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lvorbisfile  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ov_open ();
-int
-main ()
-{
-return ov_open ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_vorbisfile_ov_open=yes
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
+$as_echo_n "checking for GSTREAMER... " >&6; }
+
+if test -n "$GSTREAMER_CFLAGS"; then
+    pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  ac_cv_lib_vorbisfile_ov_open=no
+  pkg_failed=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ else
+    pkg_failed=untried
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbisfile_ov_open" >&5
-$as_echo "$ac_cv_lib_vorbisfile_ov_open" >&6; }
-if test "x$ac_cv_lib_vorbisfile_ov_open" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBVORBISFILE 1
-_ACEOF
-
-  LIBS="-lvorbisfile $LIBS"
-
+if test -n "$GSTREAMER_LIBS"; then
+    pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  as_fn_error $? "*** Can't find libvorbisfile ***" "$LINENO" 5
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ogg_stream_init in -logg" >&5
-$as_echo_n "checking for ogg_stream_init in -logg... " >&6; }
-if ${ac_cv_lib_ogg_ogg_stream_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-logg  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ogg_stream_init ();
-int
-main ()
-{
-return ogg_stream_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ogg_ogg_stream_init=yes
-else
-  ac_cv_lib_ogg_ogg_stream_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_ogg_stream_init" >&5
-$as_echo "$ac_cv_lib_ogg_ogg_stream_init" >&6; }
-if test "x$ac_cv_lib_ogg_ogg_stream_init" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBOGG 1
-_ACEOF
 
-  LIBS="-logg $LIBS"
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
-  as_fn_error $? "*** Can't find libogg ***" "$LINENO" 5
+        _pkg_short_errors_supported=no
 fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-1.0" 2>&1`
+        else
+	        GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GSTREAMER_PKG_ERRORS" >&5
 
-	for ac_header in vorbis/codec.h vorbis/vorbisfile.h ogg/ogg.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+	as_fn_error $? "*** GStreamer 1.0 not found ***" "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	as_fn_error $? "*** GStreamer 1.0 not found ***" "$LINENO" 5
 else
-  as_fn_error $? "*** Can't find ogg headers ***" "$LINENO" 5
+	GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
+	GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
 fi
 
-done
 
-	OGG_LIBS="-lvorbis -lvorbisfile -logg"
 
-	LIBS=$LIBS_save
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER_AUDIO" >&5
+$as_echo_n "checking for GSTREAMER_AUDIO... " >&6; }
+
+if test -n "$GSTREAMER_AUDIO_CFLAGS"; then
+    pkg_cv_GSTREAMER_AUDIO_CFLAGS="$GSTREAMER_AUDIO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-audio-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-audio-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GSTREAMER_AUDIO_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-audio-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** ogg plugin disabled per user request ***" >&5
-$as_echo "*** ogg plugin disabled per user request ***" >&6; }
+  pkg_failed=yes
 fi
-
-# Stuff for alsa plugin
-# Check whether --enable-alsa was given.
-if test "${enable_alsa+set}" = set; then :
-  enableval=$enable_alsa;
+ else
+    pkg_failed=untried
+fi
+if test -n "$GSTREAMER_AUDIO_LIBS"; then
+    pkg_cv_GSTREAMER_AUDIO_LIBS="$GSTREAMER_AUDIO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-audio-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-audio-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GSTREAMER_AUDIO_LIBS=`$PKG_CONFIG --libs "gstreamer-audio-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  enable_alsa="yes"
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
 
-if test "x$enable_alsa" = xyes; then
-	# Check for asound lib
-	LIBS_save=$LIBS
-	for ac_header in alsa/asoundlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ALSA_ASOUNDLIB_H 1
-_ACEOF
 
-else
-  as_fn_error $? "*** Can't find alsa/asoundlib.h ***" "$LINENO" 5
-fi
 
-done
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5
-$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
-if ${ac_cv_lib_asound_snd_pcm_open+:} false; then :
-  $as_echo_n "(cached) " >&6
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lasound  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GSTREAMER_AUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-audio-1.0" 2>&1`
+        else
+	        GSTREAMER_AUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-audio-1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GSTREAMER_AUDIO_PKG_ERRORS" >&5
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char snd_pcm_open ();
-int
-main ()
-{
-return snd_pcm_open ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_asound_snd_pcm_open=yes
+	as_fn_error $? "*** GStreamer-audio 1.0 not found ***" "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	as_fn_error $? "*** GStreamer-audio 1.0 not found ***" "$LINENO" 5
 else
-  ac_cv_lib_asound_snd_pcm_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+	GSTREAMER_AUDIO_CFLAGS=$pkg_cv_GSTREAMER_AUDIO_CFLAGS
+	GSTREAMER_AUDIO_LIBS=$pkg_cv_GSTREAMER_AUDIO_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5
-$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
-if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBASOUND 1
-_ACEOF
 
-  LIBS="-lasound $LIBS"
 
-else
-  as_fn_error $? "*** Can't find libasound ***" "$LINENO" 5
-fi
 
-	ASOUND_LIBS="-lasound"
 
-	LIBS=$LIBS_save
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TAGLIB" >&5
+$as_echo_n "checking for TAGLIB... " >&6; }
+
+if test -n "$TAGLIB_CFLAGS"; then
+    pkg_cv_TAGLIB_CFLAGS="$TAGLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"taglib_c\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "taglib_c") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_TAGLIB_CFLAGS=`$PKG_CONFIG --cflags "taglib_c" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** alsa plugin disabled per user request ***" >&5
-$as_echo "*** alsa plugin disabled per user request ***" >&6; }
+  pkg_failed=yes
 fi
-
-# Set enabling stuff for other plugins
-# Check whether --enable-wav was given.
-if test "${enable_wav+set}" = set; then :
-  enableval=$enable_wav;
-else
-  enable_wav="yes"
+ else
+    pkg_failed=untried
 fi
-
-# Check whether --enable-disk_writer was given.
-if test "${enable_disk_writer+set}" = set; then :
-  enableval=$enable_disk_writer;
+if test -n "$TAGLIB_LIBS"; then
+    pkg_cv_TAGLIB_LIBS="$TAGLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"taglib_c\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "taglib_c") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_TAGLIB_LIBS=`$PKG_CONFIG --libs "taglib_c" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  enable_disk_writer="yes"
+  pkg_failed=yes
 fi
-
-# Check whether --enable-oss was given.
-if test "${enable_oss+set}" = set; then :
-  enableval=$enable_oss;
-else
-  enable_oss="yes"
+ else
+    pkg_failed=untried
 fi
 
 
-# Choose input plugins
-ALL_INPUT_PLUGINS="audiocd mp3 ogg wav flac cue"
-for plugin in $ALL_INPUT_PLUGINS; do
-	name="\$enable_$plugin"
-	value=`eval echo $name`
-	SUMMARY_MSG="No"
-	if test "x${value}" = xyes; then
-		INPUT_PLUGINS="$INPUT_PLUGINS $plugin"
-		SUMMARY_MSG="Yes"
-	fi
-	INPUT_SUMMARY="$INPUT_SUMMARY\n$plugin: $SUMMARY_MSG"
-done
-
-# Choose output plugins
-ALL_OUTPUT_PLUGINS="alsa disk_writer oss"
-for plugin in $ALL_OUTPUT_PLUGINS; do
-	name="\$enable_$plugin"
-	value=`eval echo $name`
-	SUMMARY_MSG="No"
-	if test "x${value}" = xyes; then
-		OUTPUT_PLUGINS="$OUTPUT_PLUGINS $plugin"
-		SUMMARY_MSG="Yes"
-	fi
-	OUTPUT_SUMMARY="$OUTPUT_SUMMARY\n$plugin: $SUMMARY_MSG"
-done
-
-# Choose effect plugins
-ALL_EFFECT_PLUGINS=""
-for plugin in $ALL_EFFECT_PLUGINS; do
-	name="\$enable_effect_$plugin"
-	value=`eval echo $name`
-	SUMMARY_MSG="No"
-	if test "x${value}" = xyes; then
-		EFFECT_PLUGINS="$EFFECT_PLUGINS $plugin"
-		SUMMARY_MSG="Yes"
-	fi
-	EFFECT_SUMMARY="$EFFECT_SUMMARY\n$plugin: $SUMMARY_MSG"
-done
-
-# Choose charset plugins
-ALL_CHARSET_PLUGINS=""
-for plugin in $ALL_CHARSET_PLUGINS; do
-	name="\$enable_charset_$plugin"
-	value=`eval echo $name`
-	SUMMARY_MSG="No"
-	if test "x${value}" = xyes; then
-		CHARSET_PLUGINS="$CHARSET_PLUGINS $plugin"
-		SUMMARY_MSG="Yes"
-	fi
-	CHARSET_SUMMARY="$CHARSET_SUMMARY\n$plugin: $SUMMARY_MSG"
-done
-
-# Choose general plugins
-ALL_GENERAL_PLUGINS=""
-for plugin in $ALL_GENERAL_PLUGINS; do
-	name="\$enable_general_$plugin"
-	value=`eval echo $name`
-	SUMMARY_MSG="No"
-	if test "x${value}" = xyes; then
-		GENERAL_PLUGINS="$GENERAL_PLUGINS $plugin"
-		SUMMARY_MSG="Yes"
-	fi
-	GENERAL_SUMMARY="$GENERAL_SUMMARY\n$plugin: $SUMMARY_MSG"
-done
 
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        TAGLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "taglib_c" 2>&1`
+        else
+	        TAGLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "taglib_c" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$TAGLIB_PKG_ERRORS" >&5
 
+	as_fn_error $? "*** Taglib not found ***" "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	as_fn_error $? "*** Taglib not found ***" "$LINENO" 5
+else
+	TAGLIB_CFLAGS=$pkg_cv_TAGLIB_CFLAGS
+	TAGLIB_LIBS=$pkg_cv_TAGLIB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
+fi
 
 
 
-ac_config_files="$ac_config_files Makefile doc/Makefile intl/Makefile libmpfc/Makefile libmpfcwnd/Makefile po/Makefile.in src/Makefile plugins/Makefile plugins/charset/Makefile plugins/effect/Makefile plugins/general/Makefile plugins/input/Makefile plugins/input/audiocd/Makefile plugins/input/mp3/Makefile plugins/input/ogg/Makefile plugins/input/wav/Makefile plugins/input/flac/Makefile plugins/input/cue/Makefile plugins/output/Makefile plugins/output/alsa/Makefile plugins/output/disk_writer/Makefile plugins/output/oss/Makefile po/Makefile mpfc.pc"
+ac_config_files="$ac_config_files Makefile doc/Makefile intl/Makefile libmpfc/Makefile libmpfcwnd/Makefile libcue/Makefile libcue/src/libcue/Makefile po/Makefile.in src/Makefile plugins/Makefile plugins/general/Makefile plugins/plist/Makefile plugins/plist/m3u/Makefile plugins/plist/pls/Makefile plugins/plist/cue/Makefile plugins/plist/audiocd/Makefile po/Makefile mpfc.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -18199,14 +18203,14 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18215,6 +18219,14 @@
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
 
 
 : "${CONFIG_STATUS=./config.status}"
@@ -18514,16 +18526,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -18583,28 +18595,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???sx*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # 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'"
@@ -18625,8 +18625,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by mpfc $as_me 2.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -18691,11 +18691,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
 ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.68,
+mpfc config.status 2.0
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -18786,7 +18786,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -18828,6 +18828,7 @@
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -18910,7 +18911,6 @@
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -18966,6 +18966,7 @@
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -19016,7 +19017,6 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -19113,23 +19113,17 @@
     "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
     "libmpfc/Makefile") CONFIG_FILES="$CONFIG_FILES libmpfc/Makefile" ;;
     "libmpfcwnd/Makefile") CONFIG_FILES="$CONFIG_FILES libmpfcwnd/Makefile" ;;
+    "libcue/Makefile") CONFIG_FILES="$CONFIG_FILES libcue/Makefile" ;;
+    "libcue/src/libcue/Makefile") CONFIG_FILES="$CONFIG_FILES libcue/src/libcue/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
-    "plugins/charset/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/charset/Makefile" ;;
-    "plugins/effect/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/effect/Makefile" ;;
     "plugins/general/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/general/Makefile" ;;
-    "plugins/input/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/input/Makefile" ;;
-    "plugins/input/audiocd/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/input/audiocd/Makefile" ;;
-    "plugins/input/mp3/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/input/mp3/Makefile" ;;
-    "plugins/input/ogg/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/input/ogg/Makefile" ;;
-    "plugins/input/wav/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/input/wav/Makefile" ;;
-    "plugins/input/flac/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/input/flac/Makefile" ;;
-    "plugins/input/cue/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/input/cue/Makefile" ;;
-    "plugins/output/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/output/Makefile" ;;
-    "plugins/output/alsa/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/output/alsa/Makefile" ;;
-    "plugins/output/disk_writer/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/output/disk_writer/Makefile" ;;
-    "plugins/output/oss/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/output/oss/Makefile" ;;
+    "plugins/plist/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/plist/Makefile" ;;
+    "plugins/plist/m3u/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/plist/m3u/Makefile" ;;
+    "plugins/plist/pls/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/plist/pls/Makefile" ;;
+    "plugins/plist/cue/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/plist/cue/Makefile" ;;
+    "plugins/plist/audiocd/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/plist/audiocd/Makefile" ;;
     "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
     "mpfc.pc") CONFIG_FILES="$CONFIG_FILES mpfc.pc" ;;
 
@@ -19728,7 +19722,7 @@
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -19741,7 +19735,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.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -19775,21 +19769,19 @@
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@@ -19843,8 +19835,8 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -19898,6 +19890,9 @@
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -20199,10 +20194,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -20605,14 +20596,7 @@
 fi
 
 
-# Configure rcfiles
-./build_rcfile.pl "$OUTPUT_PLUGINS" "local" > src/.mpfcrc
-./build_rcfile.pl "$OUTPUT_PLUGINS" "global" > mpfcrc
-
 # Print plugins summary
 echo -e "\n****** Plugins summary ******\n"
-echo -e "Input plugins:$INPUT_SUMMARY\n"
-echo -e "Output plugins:$OUTPUT_SUMMARY\n"
-echo -e "Effect plugins:$EFFECT_SUMMARY\n"
-echo -e "Charset plugins:$CHARSET_SUMMARY\n"
 echo -e "General plugins:$GENERAL_SUMMARY\n"
+echo -e "Playlist plugins:$PLIST_SUMMARY\n"

mpfc-1.3.8.1.tar.bz2/configure.ac -> mpfc-2.0.tar.bz2/configure.ac Changed

@@ -1,25 +1,34 @@
-AC_INIT(src/main.c)
-AM_INIT_AUTOMAKE(mpfc, 1.3.8.1)
-AC_PROG_CC
+AC_INIT(mpfc, 2.0)
+AC_CONFIG_SRCDIR(src/main.c)
+AC_GNU_SOURCE
+AM_INIT_AUTOMAKE
+AC_PROG_CC_C99
 AC_C_BIGENDIAN
 AC_PROG_LIBTOOL
 
-AM_CONFIG_HEADER(mpfc-config.h)
+# For libcue
+AM_PROG_LEX
+AC_PROG_YACC
+
+m4_include(m4/pkg.m4)
+PKG_PROG_PKG_CONFIG
+
+AC_CONFIG_HEADERS(mpfc-config.h)
 AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION(0.16.1)
 
+CFLAGS="$CFLAGS -D_GNU_SOURCE"
+AC_SUBST(CFLAGS)
+
 # Set up common libraries
 #COMMON_LIBS="-ldmalloc"
 COMMON_LIBS=""
 AC_SUBST(COMMON_LIBS)
 
 # Check for ncurses
-LIBS_save=$LIBS
-AC_CHECK_HEADERS(curses.h,,AC_MSG_ERROR(*** Can't find curses.h ***))
-AC_CHECK_LIB(ncursesw, waddch,,AC_MSG_ERROR(*** Can't find ncurses library ***))
-CURSES_LIBS="-lncursesw"
+PKG_CHECK_MODULES(CURSES, ncursesw,, AC_MSG_ERROR(*** ncursesw not found ***))
+AC_SUBST(CURSES_CFLAGS)
 AC_SUBST(CURSES_LIBS)
-LIBS=$LIBS_save
 
 # Check for pthread
 LIBS_save=$LIBS
@@ -63,226 +72,124 @@
 AC_SUBST(RESOLV_LIBS)
 LIBS=$LIBS_save
 
-# Check for ICU library
+# Check for json
+PKG_CHECK_MODULES(JSON, json-glib-1.0,, AC_MSG_ERROR(*** json-glib 1.0 not found ***))
+AC_SUBST(JSON_CFLAGS)
+AC_SUBST(JSON_LIBS)
+
+# Check for math lib
 LIBS_save=$LIBS
-AC_CHECK_HEADERS(unicode/ucnv.h,,AC_MSG_ERROR(*** Can't find libicu header ***))
-#AC_CHECK_LIB(icuuc, ucnv_open,,AC_MSG_ERROR(*** Can't find libicu ***))
-ICU_LIBS="-licuuc"
-AC_SUBST(ICU_LIBS)
+AC_CHECK_HEADERS(math.h,,AC_MSG_ERROR(*** Can't find math header ***))
+AC_CHECK_LIB(m, pow,,AC_MSG_ERROR(*** Can't find libm ***))
+MATH_LIBS="-lm"
+AC_SUBST(MATH_LIBS)
 LIBS=$LIBS_save
 
-# Stuff for mp3 plugin
-AC_ARG_ENABLE(mp3, 
-	--disable-mp3		Disable mp3 input plugin default=enabled,,
-		enable_mp3="yes")
-if test "x$enable_mp3" = xyes; then
-	# Check for math lib
-	LIBS_save=$LIBS
-	AC_CHECK_HEADERS(math.h,,AC_MSG_ERROR(*** Can't find math header ***))
-	AC_CHECK_LIB(m, pow,,AC_MSG_ERROR(*** Can't find libm ***))
-	MATH_LIBS="-lm"
-	AC_SUBST(MATH_LIBS)
-	LIBS=$LIBS_save
-
-	# Check for libmad
+# Stuff for cue plugin
+AC_ARG_ENABLE(cue, 
+	--disable-cue		Disable cue playlist plugin default=enabled,,
+		enable_cue="yes")
+if test "x$enable_cue" = xyes; then
 	LIBS_save=$LIBS
-	AC_CHECK_HEADERS(mad.h,,AC_MSG_ERROR(*** Can't find libmad header ***))
-	AC_CHECK_LIB(m, pow,,AC_MSG_ERROR(*** Can't find libmad ***))
-	MAD_LIBS="-lmad"
-	AC_SUBST(MAD_LIBS)
 	LIBS=$LIBS_save
 else
-	AC_MSG_RESULT(*** mp3 plugin disabled per user request ***)
+	AC_MSG_RESULT(*** cue plugin disabled per user request ***)
 fi
 
-# Stuff for flac plugin
-AC_ARG_ENABLE(flac, 
-	--disable-flac		Disable flac input plugin default=enabled,,
-		enable_flac="yes")
-if test "x$enable_flac" = xyes; then
-	# Check for flac library
+# Stuff for m3u plugin
+AC_ARG_ENABLE(m3u, 
+	--disable-m3u		Disable m3u playlist plugin default=enabled,,
+		enable_m3u="yes")
+if test "x$enable_m3u" = xyes; then
 	LIBS_save=$LIBS
-	AC_CHECK_HEADERS(FLAC/all.h,,AC_MSG_ERROR(*** Can't find FLAC/all.h ***))
-	AC_CHECK_LIB(FLAC, FLAC__stream_decoder_process_single,,AC_MSG_ERROR(*** Can't find FLAC library ***))
-	FLAC_LIBS="-lFLAC"
-	AC_SUBST(FLAC_LIBS)
 	LIBS=$LIBS_save
 else
-	AC_MSG_RESULT(*** flac plugin disabled per user request ***)
+	AC_MSG_RESULT(*** m3u plugin disabled per user request ***)
 fi
 
-# Stuff for cue plugin
-AC_ARG_ENABLE(cue, 
-	--disable-cue		Disable cue input plugin default=enabled,,
-		enable_cue="yes")
-if test "x$enable_cue" = xyes; then
+# Stuff for pls plugin
+AC_ARG_ENABLE(pls, 
+	--disable-pls		Disable pls playlist plugin default=enabled,,
+		enable_pls="yes")
+if test "x$enable_pls" = xyes; then
 	LIBS_save=$LIBS
 	LIBS=$LIBS_save
 else
-	AC_MSG_RESULT(*** cue plugin disabled per user request ***)
+	AC_MSG_RESULT(*** pls plugin disabled per user request ***)
 fi
 
 # Stuff for audiocd plugin
 AC_ARG_ENABLE(audiocd, 
-	--disable-audiocd	Disable audiocd input plugin default=enabled,,
+	--disable-audiocd		Disable audiocd playlist plugin default=enabled,,
 		enable_audiocd="yes")
 if test "x$enable_audiocd" = xyes; then
-	# Check for cdrom includes
-	AC_CHECK_HEADERS(linux/cdrom.h,, AC_MSG_ERROR(*** Can't find linux/cdrom.h ***))
-else
-	AC_MSG_RESULT(*** audiocd plugin disabled per user request ***)
-fi
-
-# Stuff for ogg plugin
-AC_ARG_ENABLE(ogg, 
-	--disable-ogg		Disable ogg input plugin default=enabled,,
-		enable_ogg="yes")
-if test "x$enable_ogg" = xyes; then
-	# Check for libvorbis
-	LIBS_save=$LIBS
-	AC_CHECK_LIB(vorbis, vorbis_dsp_clear,,AC_MSG_ERROR(*** Can't find libvorbis ***))
-	AC_CHECK_LIB(vorbisfile, ov_open,,AC_MSG_ERROR(*** Can't find libvorbisfile ***))
-	AC_CHECK_LIB(ogg, ogg_stream_init,,AC_MSG_ERROR(*** Can't find libogg ***))
-	AC_CHECK_HEADERS(vorbis/codec.h vorbis/vorbisfile.h ogg/ogg.h,,
-					 AC_MSG_ERROR(*** Can't find ogg headers ***))
-	OGG_LIBS="-lvorbis -lvorbisfile -logg"
-	AC_SUBST(OGG_LIBS)
-	LIBS=$LIBS_save
-else
-	AC_MSG_RESULT(*** ogg plugin disabled per user request ***)
-fi
-
-# Stuff for alsa plugin
-AC_ARG_ENABLE(alsa, 
-	--disable-alsa		Disable alsa input plugin default=enabled,,
-		enable_alsa="yes")
-if test "x$enable_alsa" = xyes; then
-	# Check for asound lib
 	LIBS_save=$LIBS
-	AC_CHECK_HEADERS(alsa/asoundlib.h,, AC_MSG_ERROR(*** Can't find alsa/asoundlib.h ***))
-	AC_CHECK_LIB(asound, snd_pcm_open,,AC_MSG_ERROR(*** Can't find libasound ***))
-	ASOUND_LIBS="-lasound"
-	AC_SUBST(ASOUND_LIBS)
 	LIBS=$LIBS_save
 else
-	AC_MSG_RESULT(*** alsa plugin disabled per user request ***)
+	AC_MSG_RESULT(*** audiocd plugin disabled per user request ***)
 fi
 
-# Set enabling stuff for other plugins
-AC_ARG_ENABLE(wav, 
-	--disable-wav		Disable wav input plugin default=enabled,,
-		enable_wav="yes")
-AC_ARG_ENABLE(disk_writer, 
-	--disable-disk_writer	Disable disk_writer output plugin 
- 	default=enabled,, enable_disk_writer="yes")
-AC_ARG_ENABLE(oss, 
-	--disable-oss		Disable oss output plugin default=enabled,,
-		enable_oss="yes")
-
-# Choose input plugins
-ALL_INPUT_PLUGINS="audiocd mp3 ogg wav flac cue"
-for plugin in $ALL_INPUT_PLUGINS; do
-	name="\$enable_$plugin"
+# Choose general plugins
+ALL_GENERAL_PLUGINS=""
+for plugin in $ALL_GENERAL_PLUGINS; do
+	name="\$enable_general_$plugin"
 	value=`eval echo $name`
 	SUMMARY_MSG="No"
 	if test "x${value}" = xyes; then
-		INPUT_PLUGINS="$INPUT_PLUGINS $plugin"
+		GENERAL_PLUGINS="$GENERAL_PLUGINS $plugin"
 		SUMMARY_MSG="Yes"
 	fi
-	INPUT_SUMMARY="$INPUT_SUMMARY\n$plugin: $SUMMARY_MSG"
+	GENERAL_SUMMARY="$GENERAL_SUMMARY\n$plugin: $SUMMARY_MSG"
 done
 
-# Choose output plugins
-ALL_OUTPUT_PLUGINS="alsa disk_writer oss"
-for plugin in $ALL_OUTPUT_PLUGINS; do
+# Choose playlist plugins
+ALL_PLIST_PLUGINS="m3u pls cue audiocd"
+for plugin in $ALL_PLIST_PLUGINS; do
 	name="\$enable_$plugin"
 	value=`eval echo $name`
 	SUMMARY_MSG="No"
 	if test "x${value}" = xyes; then
-		OUTPUT_PLUGINS="$OUTPUT_PLUGINS $plugin"
+		PLIST_PLUGINS="$PLIST_PLUGINS $plugin"
 		SUMMARY_MSG="Yes"
 	fi
-	OUTPUT_SUMMARY="$OUTPUT_SUMMARY\n$plugin: $SUMMARY_MSG"
+	PLIST_SUMMARY="$PLIST_SUMMARY\n$plugin: $SUMMARY_MSG"
 done
 
-# Choose effect plugins
-ALL_EFFECT_PLUGINS=""
-for plugin in $ALL_EFFECT_PLUGINS; do
-	name="\$enable_effect_$plugin"
-	value=`eval echo $name`
-	SUMMARY_MSG="No"
-	if test "x${value}" = xyes; then
-		EFFECT_PLUGINS="$EFFECT_PLUGINS $plugin"
-		SUMMARY_MSG="Yes"
-	fi
-	EFFECT_SUMMARY="$EFFECT_SUMMARY\n$plugin: $SUMMARY_MSG"
-done
+AC_SUBST(GENERAL_PLUGINS)
+AC_SUBST(PLIST_PLUGINS)
 
-# Choose charset plugins
-ALL_CHARSET_PLUGINS=""
-for plugin in $ALL_CHARSET_PLUGINS; do
-	name="\$enable_charset_$plugin"
-	value=`eval echo $name`
-	SUMMARY_MSG="No"
-	if test "x${value}" = xyes; then
-		CHARSET_PLUGINS="$CHARSET_PLUGINS $plugin"
-		SUMMARY_MSG="Yes"
-	fi
-	CHARSET_SUMMARY="$CHARSET_SUMMARY\n$plugin: $SUMMARY_MSG"
-done
+PKG_CHECK_MODULES(GSTREAMER, gstreamer-1.0,, AC_MSG_ERROR(*** GStreamer 1.0 not found ***))
+AC_SUBST(GSTREAMER_CFLAGS)
+AC_SUBST(GSTREAMER_LIBS)
 
-# Choose general plugins
-ALL_GENERAL_PLUGINS=""
-for plugin in $ALL_GENERAL_PLUGINS; do
-	name="\$enable_general_$plugin"
-	value=`eval echo $name`
-	SUMMARY_MSG="No"
-	if test "x${value}" = xyes; then
-		GENERAL_PLUGINS="$GENERAL_PLUGINS $plugin"
-		SUMMARY_MSG="Yes"
-	fi
-	GENERAL_SUMMARY="$GENERAL_SUMMARY\n$plugin: $SUMMARY_MSG"
-done
+PKG_CHECK_MODULES(GSTREAMER_AUDIO, gstreamer-audio-1.0,, AC_MSG_ERROR(*** GStreamer-audio 1.0 not found ***))
+AC_SUBST(GSTREAMER_AUDIO_CFLAGS)
+AC_SUBST(GSTREAMER_AUDIO_LIBS)
 
-AC_SUBST(GENERAL_PLUGINS)
-AC_SUBST(CHARSET_PLUGINS)
-AC_SUBST(EFFECT_PLUGINS)
-AC_SUBST(INPUT_PLUGINS)
-AC_SUBST(OUTPUT_PLUGINS)
+PKG_CHECK_MODULES(TAGLIB, taglib_c,, AC_MSG_ERROR(*** Taglib not found ***))
+AC_SUBST(TAGLIB_CFLAGS)
+AC_SUBST(TAGLIB_LIBS)
 
 AC_OUTPUT(Makefile \
 		  doc/Makefile \
 		  intl/Makefile  \
 		  libmpfc/Makefile \
 		  libmpfcwnd/Makefile \
+		  libcue/Makefile \
+		  libcue/src/libcue/Makefile \
 		  po/Makefile.in  \
 		  src/Makefile \
 		  plugins/Makefile \
-		  plugins/charset/Makefile \
-		  plugins/effect/Makefile \
 		  plugins/general/Makefile \
-		  plugins/input/Makefile \
-		  plugins/input/audiocd/Makefile \
-		  plugins/input/mp3/Makefile \
-		  plugins/input/ogg/Makefile \
-		  plugins/input/wav/Makefile \
-		  plugins/input/flac/Makefile \
-		  plugins/input/cue/Makefile \
-		  plugins/output/Makefile \
-		  plugins/output/alsa/Makefile \
-		  plugins/output/disk_writer/Makefile \
-		  plugins/output/oss/Makefile \
+		  plugins/plist/Makefile \
+		  plugins/plist/m3u/Makefile \
+		  plugins/plist/pls/Makefile \
+		  plugins/plist/cue/Makefile \
+		  plugins/plist/audiocd/Makefile \
 		  po/Makefile \
 		  mpfc.pc)
 
-# Configure rcfiles
-./build_rcfile.pl "$OUTPUT_PLUGINS" "local" > src/.mpfcrc
-./build_rcfile.pl "$OUTPUT_PLUGINS" "global" > mpfcrc
-
 # Print plugins summary
 echo -e "\n****** Plugins summary ******\n"
-echo -e "Input plugins:$INPUT_SUMMARY\n"
-echo -e "Output plugins:$OUTPUT_SUMMARY\n"
-echo -e "Effect plugins:$EFFECT_SUMMARY\n"
-echo -e "Charset plugins:$CHARSET_SUMMARY\n"
 echo -e "General plugins:$GENERAL_SUMMARY\n"
+echo -e "Playlist plugins:$PLIST_SUMMARY\n"

mpfc-1.3.8.1.tar.bz2/depcomp -> mpfc-2.0.tar.bz2/depcomp Changed

@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,9 +27,9 @@
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp --help --version PROGRAM ARGS
@@ -40,11 +39,11 @@
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -57,6 +56,66 @@
     ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/^/*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.^.*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.$lower*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.$lower*:$tab *,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -69,6 +128,9 @@
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -80,18 +142,32 @@
 fi
 
 if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
-   depmode=msvisualcpp
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
 fi
 
 case "$depmode" in
@@ -114,8 +190,7 @@
   done
   "$@"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -123,13 +198,17 @@
   ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -137,31 +216,31 @@
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
   sed -e 's/^^:*: / /' \
       -e 's/^'$alpha':\/^:*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -179,8 +258,7 @@
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -188,43 +266,41 @@
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
-
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
-
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
   else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/^/*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
@@ -237,9 +313,7 @@
     "$@" -M
   fi
   stat=$?
-
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
@@ -248,44 +322,100 @@
   do
     test -f "$tmpdepfile" && break
   done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.a-z*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the .
-    sed -e 's,^.*\.a-z*:	 *,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
   fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *$.*$ *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\' :
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
 
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -297,8 +427,8 @@
   sed "s,^^:*:,$object :," < "$tmpdepfile" > "$depfile"
   # Some versions of the HPUX 10.20 sed can't process this invocation
   # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^^:*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  sed 's,^^:*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -309,9 +439,8 @@
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/^/*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from  "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -322,8 +451,7 @@
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -333,77 +461,107 @@
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.a-z*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
+    sed -e "s,^.*\.$lower*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
     sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
   else
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/^/*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.a-z*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the .
-      sed -e 's,^.*\.a-z*:	 *,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *$.*$/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/$.*$/'"$tab"'\1 \\/p
+s/.$.*$ \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
 
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
@@ -422,7 +580,7 @@
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -442,18 +600,18 @@
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^  *^: ^:^:*\:    *:'"$object"'\: :' > "$tmpdepfile"
+    sed "s|^$tab *^:$tab ^:^:*:$tab *|$object: |" > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -503,12 +661,15 @@
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*$$object *:$|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -525,7 +686,7 @@
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -544,10 +705,10 @@
     esac
   done
 
-  "$@" -E |
-    sed -n -e '/^# 0-90-9* "$^"*$".*/ s:: \1 \\:p' \
-       -e '/^#line 0-90-9* "$^"*$".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
+  "$@" -E \
+    | sed -n -e '/^# 0-90-9* "$^"*$".*/ s:: \1 \\:p' \
+             -e '/^#line 0-90-9* "$^"*$".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -579,23 +740,23 @@
       shift
       ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
+        set fnord "$@"
+        shift
+        shift
+        ;;
     *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
     esac
   done
   "$@" -E 2>/dev/null |
   sed -n '/^#line 0-90-9* "$^"*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;

mpfc-1.3.8.1.tar.bz2/doc/Makefile.in -> mpfc-2.0.tar.bz2/doc/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,18 +78,76 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc
-DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in texinfo.tex
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am texinfo.tex \
+	$(dist_man_MANS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/mpfc-config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+AM_V_DVIPS = $(am__v_DVIPS_@AM_V@)
+am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@)
+am__v_DVIPS_0 = @echo "  DVIPS   " $@;
+am__v_DVIPS_1 = 
+AM_V_MAKEINFO = $(am__v_MAKEINFO_@AM_V@)
+am__v_MAKEINFO_ = $(am__v_MAKEINFO_@AM_DEFAULT_V@)
+am__v_MAKEINFO_0 = @echo "  MAKEINFO" $@;
+am__v_MAKEINFO_1 = 
+AM_V_INFOHTML = $(am__v_INFOHTML_@AM_V@)
+am__v_INFOHTML_ = $(am__v_INFOHTML_@AM_DEFAULT_V@)
+am__v_INFOHTML_0 = @echo "  INFOHTML" $@;
+am__v_INFOHTML_1 = 
+AM_V_TEXI2DVI = $(am__v_TEXI2DVI_@AM_V@)
+am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_@AM_DEFAULT_V@)
+am__v_TEXI2DVI_0 = @echo "  TEXI2DVI" $@;
+am__v_TEXI2DVI_1 = 
+AM_V_TEXI2PDF = $(am__v_TEXI2PDF_@AM_V@)
+am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_@AM_DEFAULT_V@)
+am__v_TEXI2PDF_0 = @echo "  TEXI2PDF" $@;
+am__v_TEXI2PDF_1 = 
+AM_V_texinfo = $(am__v_texinfo_@AM_V@)
+am__v_texinfo_ = $(am__v_texinfo_@AM_DEFAULT_V@)
+am__v_texinfo_0 = -q
+am__v_texinfo_1 = 
+AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
+am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
+am__v_texidevnull_0 = > /dev/null
+am__v_texidevnull_1 = 
 INFO_DEPS = $(srcdir)/mpfc.info
 am__TEXINFO_TEX_DIR = $(srcdir)
 DVIS = mpfc.dvi
@@ -58,6 +160,11 @@
 MAKEINFOHTML = $(MAKEINFO) --html
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
 DVIPS = dvips
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -80,15 +187,22 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(dist_man_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -99,10 +213,10 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
 COMMON_LIBS = @COMMON_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURSES_CFLAGS = @CURSES_CFLAGS@
 CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
@@ -115,28 +229,26 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC2 = @GLIBC2@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GPM_LIBS = @GPM_LIBS@
 GREP = @GREP@
+GSTREAMER_AUDIO_CFLAGS = @GSTREAMER_AUDIO_CFLAGS@
+GSTREAMER_AUDIO_LIBS = @GSTREAMER_AUDIO_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -146,30 +258,31 @@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSON_CFLAGS = @JSON_CFLAGS@
+JSON_LIBS = @JSON_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
 LIBOBJS = @LIBOBJS@
 LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTLIBC = @LTLIBC@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIBS = @MATH_LIBS@
@@ -181,10 +294,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -193,6 +304,10 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLIST_PLUGINS = @PLIST_PLUGINS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -202,15 +317,16 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
+TAGLIB_LIBS = @TAGLIB_LIBS@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
 WOE32DLL = @WOE32DLL@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -278,9 +394,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/Makefile
+	  $(AUTOMAKE) --foreign doc/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -307,7 +423,7 @@
 	-rm -rf .libs _libs
 
 .texi.info:
-	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+	$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 	am__cwd=`pwd` && $(am__cd) $(srcdir) && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
 	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
@@ -329,35 +445,33 @@
 	rm -rf $$backupdir; exit $$rc
 
 .texi.dvi:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2DVI) $<
+	$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
+	$<
 
 .texi.pdf:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2PDF) $<
+	$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
+	$<
 
 .texi.html:
-	rm -rf $(@:.html=.htp)
-	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+	$(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
+	$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
 	 -o $(@:.html=.htp) $<; \
 	then \
-	  rm -rf $@; \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
+	  rm -rf $@ && mv $(@:.html=.htp) $@; \
 	else \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
-	  exit 1; \
+	  rm -rf $(@:.html=.htp); exit 1; \
 	fi
 $(srcdir)/mpfc.info: mpfc.texi 
 mpfc.dvi: mpfc.texi 
 mpfc.pdf: mpfc.texi 
 mpfc.html: mpfc.texi 
 .dvi.ps:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	$(DVIPS) -o $@ $<
+	$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(DVIPS) $(AM_V_texinfo) -o $@ $<
 
 uninstall-dvi-am:
 	@$(NORMAL_UNINSTALL)
@@ -379,9 +493,7 @@
 
 uninstall-info-am:
 	@$(PRE_UNINSTALL)
-	@if test -d '$(DESTDIR)$(infodir)' && \
-	    (install-info --version && \
-	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+	@if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -438,9 +550,7 @@
 	done
 
 mostlyclean-aminfo:
-	-rm -rf mpfc.aux mpfc.cp mpfc.cps mpfc.fn mpfc.fns mpfc.ky mpfc.kys \
-	  mpfc.log mpfc.pg mpfc.pgs mpfc.tmp mpfc.toc mpfc.tp mpfc.tps \
-	  mpfc.vr mpfc.vrs
+	-rm -rf mpfc.t2d mpfc.t2p
 
 clean-aminfo:
 	-test -z "mpfc.dvi mpfc.pdf mpfc.ps mpfc.html" \
@@ -454,11 +564,18 @@
 	done
 install-man1: $(dist_man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1a-z*$$/p'; \
+	@list1=''; \
+	list2='$(dist_man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1a-z*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -487,30 +604,15 @@
 	  sed -n '/\.1a-z*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^^10-9a-z*$$,1,;x' \
 	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -560,10 +662,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -601,8 +708,11 @@
 
 install-dvi-am: $(DVIS)
 	@$(NORMAL_INSTALL)
-	test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
 	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -617,18 +727,22 @@
 
 install-html-am: $(HTMLS)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  $(am__strip_dir) \
-	  if test -d "$$d$$p"; then \
+	  d2=$$d$$p; \
+	  if test -d "$$d2"; then \
 	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
 	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-	    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
+	    echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
 	  else \
-	    list2="$$list2 $$d$$p"; \
+	    list2="$$list2 $$d2"; \
 	  fi; \
 	done; \
 	test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
@@ -640,9 +754,12 @@
 
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
-	test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \
+	fi; \
 	for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
@@ -660,8 +777,7 @@
 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
 	@$(POST_INSTALL)
-	@if (install-info --version && \
-	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+	@if $(am__can_run_installinfo); then \
 	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -675,8 +791,11 @@
 
 install-pdf-am: $(PDFS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
 	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -688,8 +807,11 @@
 
 install-ps-am: $(PSS)
 	@$(NORMAL_INSTALL)
-	test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
 	@list='$(PSS)'; test -n "$(psdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -725,19 +847,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-aminfo clean-generic \
-	clean-libtool dist-info distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-aminfo \
-	maintainer-clean-generic mostlyclean mostlyclean-aminfo \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-dvi-am uninstall-html-am \
-	uninstall-info-am uninstall-man uninstall-man1 \
-	uninstall-pdf-am uninstall-ps-am
+	clean-libtool cscopelist-am ctags-am dist-info distclean \
+	distclean-generic distclean-libtool distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-man1 install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
+	mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
+	uninstall-dvi-am uninstall-html-am uninstall-info-am \
+	uninstall-man uninstall-man1 uninstall-pdf-am uninstall-ps-am
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

mpfc-1.3.8.1.tar.bz2/doc/mpfc.1 -> mpfc-2.0.tar.bz2/doc/mpfc.1 Changed

@@ -1,25 +1,39 @@
-.TH MPFC 1 "4 July 2003" "Version 0.1" "MPFC Manual Page"
+.TH MPFC 1 "14 January 2014" "Version 2.0" "MPFC Manual Page"
 .SH NAME
 MPFC \- Music Player For Console
 .SH SYNOPSIS
 .B mpfc 
 \fIoptions\fR \fIfiles\fR
 .SH DESCRIPTION
-\fIMPFC\fR is the Music Player For Console. It is used to play audio files
-in console text mode. 
-.br
-The complete documentation on MPFC is maintained in Texinfo format, so refer
+\fIMPFC\fR is a gstreamer-based audio player with curses interface featuring:
+.IP \bu 2
+Support for all popular formats and output systems (by virtue of gstreamer)
+.IP \bu
+Standard playlist paradigm
+.IP \bu
+Windowed text user interface
+.IP \bu
+Full cuesheet support
+.IP \bu
+Integrated tags editor
+.IP \bu
+Remote control for Android
+.IP \bu
+High configurability
+
+.PP
+The complete documentation on MPFC is maintained in Texinfo format. Please refer
 to it if you want to know more (type \fIinfo mpfc\fR). 
 .SH FILES
 .TP
-~/.mpfcrc
+~/.mpfc/mpfcrc
 MPFC configuration file
 .SH COPYRIGHT
-Copyright \(co 2003 by SG Software.
+Copyright \(co 2003-2014 by Sergey Galanov.
 .br
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH AUTHORS
-MPFC is written by Sergey E. Galanov.
+MPFC is written by Sergey E. Galanov and a number of contributors (see AUTHORS file for details).
 .SH REPORTING BUGS
-Report bugs to <sgsoftware@mail.ru>.
+Report bugs to http://code.google.com/p/mpfc/issues/.

mpfc-1.3.8.1.tar.bz2/doc/mpfc.info -> mpfc-2.0.tar.bz2/doc/mpfc.info Changed

@@ -1,28 +1,29 @@
-This is mpfc.info, produced by makeinfo version 4.13 from mpfc.texi.
+This is mpfc.info, produced by makeinfo version 5.2 from mpfc.texi.
 
-This manual describes the SG Music Player For Linux Console, version
-1.3.6
+This manual describes the SG Music Player For Linux Console, version 2.0
 
-   Copyright (C) 2003-2005 SG Software.
+   Copyright (C) 2003-2014 by Sergey Galanov.
 
 &#x1f;
 File: mpfc.info,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
 
-MPFC 1.3.6
-**********
+MPFC 2.0
+********
 
-This manual documents version 1.3.6 of SG MPFC, media player for Linux
+This manual documents version 2.0 of SG MPFC, media player for Linux
 console.
 
-   Copyright (C) 2003-2005 SG Software
+   Copyright (C) 2003-2014 SG Software
 
 * Menu:
 
-* Introduction::
-* Getting Started::
+* Introduction::		
+* Getting Started::	
 * Using Variables::
+* Audio processing::
 * Plugins::
-* Copying::
+* Remote Control::
+* Copying::	
 
 &#x1f;
 File: mpfc.info,  Node: Introduction,  Next: Getting Started,  Prev: Top,  Up: Top
@@ -30,15 +31,19 @@
 1 Introduction to MPFC
 **********************
 
-MPFC is an abbrevation for Music Player For Console. It is a
-full-featured curses-based playlist-oriented player.
+MPFC is an abbrevation for Music Player For Console.  It is a
+gstreamer-based audio player with curses interface featuring:
 
-   MPFC supports a number of input file formats. This support is
-organised through input plugins model. It means that the formats list
-is expandable--you must simply add a new plugin. Also there are plugins
-for output and effects.
+   * Support for all popular formats and output systems (by virtue of
+     gstreamer);
+   * Standard playlist paradigm;
+   * Windowed text user interface;
+   * Full cuesheet support;
+   * Integrated tags editor;
+   * Remote control for Android;
+   * High configurability.
 
-   To get a brief help on MPFC commands you may press `?' key in MPFC
+   To get a brief help on MPFC commands you may press '?' key in MPFC
 main window.
 
    Turn to the following sections to learn about MPFC features in
@@ -74,28 +79,19 @@
      mpfc options files
 
    Here options is a list of variables you set directly (*note Using
-Variables::) and files is a list of files you want to play. For
-example, to play file song.mp3 type:
+Variables::) and files is a list of files you want to play.  For
+example, to play file song.mp3 and all files found recursively under
+directory artist_dir type:
 
-     mpfc file.mp3
+     mpfc file.mp3 artist_dir
+
+   For more info on how file adding behaves see *note Add/remove::.
 
    File list may be empty, this means you will either continue playing
 the previous play list (if the respective option is set), or start with
 an empty play list.
 
-   You may also specify a plugin that will be used for playing file.
-This notation with special plugins that play virtual files (e.g audiocd
-plugin) and also if file has non-standard extesion. For example:
-
-     mpfc audiocd://track0* mp3://some-file-with-no-mp3-extension audiocd://
-
-   First pattern in this list specifies all the Audio-CD tracks from 1
-to 9, second is simply a hint for MPFC to use mp3 plugin, and the last
-means to add total Audio-CD.
-
-   Note that "objects" system is no longer used.
-
-   If you want to exit MPFC use command `q'.
+   If you want to exit MPFC use command 'q'.
 
 &#x1f;
 File: mpfc.info,  Node: Moving around,  Next: Playing files,  Prev: Launching MPFC,  Up: Getting Started
@@ -104,11 +100,11 @@
 =================
 
 As soon as you have launched MPFC you will notice that the largest part
-of the screen is occupied by the play list. This is a list of all songs
-you can play. Also you will notice a long line from left side of the
-screen to the right side that selects one of the songs. This is cursor.
-It is used to select songs for various manipulations (e.g. playing
-them). Here are methods you can use to move cursor within playlist.
+of the screen is occupied by the play list.  This is a list of all songs
+you can play.  Also you will notice a long line from left side of the
+screen to the right side that selects one of the songs.  This is cursor.
+It is used to select songs for various manipulations (e.g.  playing
+them).  Here are methods you can use to move cursor within playlist.
 
 * Menu:
 
@@ -124,28 +120,28 @@
 
 Basic operations are the following:
 
-   `j' or `<Down>': move cursor one line lower;
+   'j' or '<Down>': move cursor one line lower;
 
-   `k' or `<Up>': move cursor one line higher;
+   'k' or '<Up>': move cursor one line higher;
 
-   `d' or `<PageDown>': move cursor one screen lower;
+   'd' or '<PageDown>': move cursor one screen lower;
 
-   `u' or `<PageUp>': move cursor one screen higher;
+   'u' or '<PageUp>': move cursor one screen higher;
 
-   `G': move cursor to any specified line (see further);
+   'G': move cursor to any specified line (see further);
 
-   `C': move cursor to the currently playing song.
+   'C': move cursor to the currently playing song.
 
-   There is a feature with these commands. You may specify a repeat
+   There is a feature with these commands.  You may specify a repeat
 value before any of them (except for C of course) and it will result in
-repeating the command this number of times. For G command this value
+repeating the command this number of times.  For G command this value
 has a slightly different meaning--it is the number of line you want to
-move to (without repeat value `G' moves to the playlist end).  To
-specify this value simply print it before the command. As soon as you
+move to (without repeat value 'G' moves to the playlist end).  To
+specify this value simply print it before the command.  As soon as you
 start entering digits, a prompt will appear and you will be able to
-correct your input or even cancel entering this value by pressing ESC.
-For example, to move 5 lines down type: `5j', and to move to the 30-th
-line of playlist type: `30G'.
+correct your input or even cancel entering this value by pressing
+'<CTRL>-g'.  For example, to move 5 lines down type: '5j', and to move
+to the 30-th line of playlist type: '30G'.
 
 &#x1f;
 File: mpfc.info,  Node: Search,  Next: Marks,  Prev: Basic cursor movement operations,  Up: Moving around
@@ -154,21 +150,21 @@
 ------------
 
 You can move to a position in playlist also by searching by a string.
-There are two types of search: simple and advanced. Simple search is
-invoked by `/' command. You will be prompted for the string. When you
+There are two types of search: simple and advanced.  Simple search is
+invoked by '/' command.  You will be prompted for the string.  When you
 enter a string MPFC will search for a song with title containing this
 string and move cursor to the first match.
 
-   Advanced search is invoked by `\' command. It allows searching not
+   Advanced search is invoked by '\' command.  It allows searching not
 only by the song title but also by other song information parameters
-(*note Song Info::), so you will be prompted for the search criteria
-and then for the string.
+(*note Song Info::), so you will be prompted for the search criteria and
+then for the string.
 
    After doing search you can move to the next or previous match by
-using commands `n' and `N' respectively.
+using commands 'n' and 'N' respectively.
 
-   To make search case-sensitive unset variable "search-nocase" (it is
-1 by default).
+   To make search case-sensitive unset variable "search-nocase" (it is 1
+by default).
 
 &#x1f;
 File: mpfc.info,  Node: Marks,  Prev: Search,  Up: Moving around
@@ -177,13 +173,13 @@
 -----------
 
 What if you have a large playlist and move periodically between some
-places in its different parts? That's where marks are used.
+places in its different parts?  That's where marks are used.
 
    You can store cursor position in any of 26 marks by using command
-`m<Letter>', where <Letter> is a letter from a to z naming the mark. To
-move to mark <Letter> command ``<Letter>' is used. Also there is a
-special mark--`. You can't set it directly but it always points to your
-last position so if you want to return to it type: ```'.
+'m<Letter>', where <Letter> is a letter from a to z naming the mark.  To
+move to mark <Letter> command '`<Letter>' is used.  Also there is a
+special mark--'.  You can't set it directly but it always points to your
+last position so if you want to return to it type: '``'.
 
 &#x1f;
 File: mpfc.info,  Node: Playing files,  Next: Playlist management,  Prev: Moving around,  Up: Getting Started
@@ -194,114 +190,94 @@
 * Menu:
 
 * Play/pause/stop::
-* Play modes::
+* Playback order::
 * Boundaries::
 * Time back::
-* Volume and balance::
-* Equalizer::
+* Volume::
 
 &#x1f;
-File: mpfc.info,  Node: Play/pause/stop,  Next: Play modes,  Prev: Playing files,  Up: Playing files
+File: mpfc.info,  Node: Play/pause/stop,  Next: Playback order,  Prev: Playing files,  Up: Playing files
 
 2.3.1 Play/pause/stop
 ---------------------
 
 There are four basic playing commands:
 
-   `<RET>': starts playing currently selected song;
+   '<RET>': starts playing currently selected song;
 
-   `x': plays currently playing song from beginning (if it is playing
+   'x': plays currently playing song from beginning (if it is playing
 now) or resumes playing after a pause or a stop;
 
-   `c': pause/unpause;
+   'c': pause/unpause;
 
-   `v': stops playing.
+   'v': stops playing.
 
-   Also you can jump to the next or previous songs. This is done by
-commands `b' (next) and `z' (previous).
+   Also you can jump to the next or previous songs.  This is done by
+commands 'b' (next) and 'z' (previous).
 
-   If you want to move within currently playing song use commands `<'
-and `>' for moving 10 seconds back or forth and command `gt' to move to
-any specified position (these commands support repeat values, for `gt'
-its meaning is the same as for `G', *note Basic cursor movement
+   If you want to move within currently playing song use commands '<'
+and '>' for moving 10 seconds back or forth and command 'gt' to move to
+any specified position (these commands support repeat values, for 'gt'
+its meaning is the same as for 'G', *note Basic cursor movement
 operations::).
 
 &#x1f;
-File: mpfc.info,  Node: Play modes,  Next: Boundaries,  Prev: Play/pause/stop,  Up: Playing files
+File: mpfc.info,  Node: Playback order,  Next: Boundaries,  Prev: Play/pause/stop,  Up: Playing files
 
-2.3.2 Play modes
-----------------
+2.3.2 Playback order
+--------------------
 
 Normally after the song you specified to play finishes MPFC begins to
 play the next song in playlist and so on until it reaches the playlist
-end when it stops.
-
-   This behaviour may be changed by setting any of two play modes:
-shuffle or loop. In shuffle mode (`R' command) the next song to play is
-selected by random. In loop mode (`L' command) the play order is as in
-the normal mode but MPFC begins playing from the beginning when it
-reaches end. Also you may set these modes by variables "shuffle-play"
+end and then it stops.  The next song is normally the one right after
+the current one in the playlist but you may queue songs to be played
+next using the ''' (single quote) command.
+
+   Order may also be altered by setting one of the two play modes:
+shuffle and loop.  In shuffle mode ('R' command) the next song to play
+is selected by random.  In loop mode ('L' command) the play order is as
+in the normal mode but MPFC begins playing from the beginning when it
+reaches end.  Also you may set these modes by variables "shuffle-play"
 and "loop-play" (*note Using Variables::).
 
 &#x1f;
-File: mpfc.info,  Node: Boundaries,  Next: Time back,  Prev: Play modes,  Up: Playing files
+File: mpfc.info,  Node: Boundaries,  Next: Time back,  Prev: Playback order,  Up: Playing files
 
 2.3.3 Boundaries
 ----------------
 
 Normally the beginning of playlist is the first song and the end is the
-last one. But you can change them by setting boundaries. First select a
-playlist area in visual mode (*note Visual mode::). Then you can use
+last one.  But you can change them by setting boundaries.  First select
+a playlist area in visual mode (*note Visual mode::).  Then you can use
 one of two commands:
 
-   `ps': sets the boundaries respectively to your selection;
+   'ps': sets the boundaries respectively to your selection;
 
-   `p<RET>': the same as previous but also begins playing the selection.
+   'p<RET>': the same as previous but also begins playing the selection.
 
-   To clear boundaries use command `pc'.
+   To clear boundaries use command 'pc'.
 
 &#x1f;
-File: mpfc.info,  Node: Time back,  Next: Volume and balance,  Prev: Boundaries,  Up: Playing files
+File: mpfc.info,  Node: Time back,  Next: Volume,  Prev: Boundaries,  Up: Playing files
 
 2.3.4 Time back
 ---------------
 
 Time back is a feature in MPFC that helps you to return to the place in
-song where you have been the last time before jump (not that here
-manual jump is meant, e.g. with a `<RET>' command). To do it use command
-`<BS>'.
-
-&#x1f;
-File: mpfc.info,  Node: Volume and balance,  Next: Equalizer,  Prev: Time back,  Up: Playing files
-
-2.3.5 Volume and balance
-------------------------
-
-You can see current volume and balance in the top right corner of the
-screen as two slidebars (the upper is volume). To increase or decrease
-volume and balance levels use `-' and `+' commands for volume and `'
-and `' commands for balance.
+song where you have been the last time before jump (not that here manual
+jump is meant, e.g.  with a '<RET>' command).  To do it use command
+'<BS>'.
 
 &#x1f;
-File: mpfc.info,  Node: Equalizer,  Prev: Volume and balance,  Up: Playing files
+File: mpfc.info,  Node: Volume,  Prev: Time back,  Up: Playing files
 
-2.3.6 Equalizer
----------------
-
-MPFC supports equalizer. To launch equalizer panel use command `e'. Here
-you are able to adjust equalizer band levels. To exit panel press `q' or
-`<ESC>'. To move between bands press `h' or `<Left>' and `l' or
-`<Right>', to change level press `j' or `<Down>' and `k' or `<Up>'.
-
-   You are able also to load preset from a Winamp EQF file. To do this
-press `<p>' and enter file name.
+2.3.5 Volume
+------------
 
-   Equalizer's parameters are configurable. They are represented by
-variables in configuration list "equalizer".  "enabled" variable
-controls whether equalizer is enabled. "band1", ..., "band10" and
-"preamp" hold band values. Also there is "enable-on-change" (default is
-1). If it is set, equalizer is automatically enabled when you change
-any band value in the equalizer window.
+You can see current volume slidebar in the top right corner of the
+screen.  To increase or decrease volume use '-' and '+'.  Volume
+modification is done in cubic steps, so for example setting volume to
+50% makes sound output 8 times quieter.
 
 &#x1f;
 File: mpfc.info,  Node: Playlist management,  Next: Window system,  Prev: Playing files,  Up: Getting Started
@@ -326,13 +302,13 @@
 2.4.1 Visual mode
 -----------------
 
-Many commands (e.g. sort) may affect a group of songs. MPFC allows you
+Many commands (e.g.  sort) may affect a group of songs.  MPFC allows you
 to make continuous selections (starting from one song and ending with
-another).  To make such a selection place cursor in one of the
-selection boundaries, then switch to the visual mode (by `V' command)
-and move cursor to another bound.  You can use any of the cursor
-movement commands. After the selection is made you can switch back to
-normal mode (by entering this command one more time).
+another).  To make such a selection place cursor in one of the selection
+boundaries, then switch to the visual mode (by 'V' command) and move
+cursor to another bound.  You can use any of the cursor movement
+commands.  After the selection is made you can switch back to normal
+mode (by entering this command one more time).
 
 &#x1f;
 File: mpfc.info,  Node: Add/remove,  Next: File browser,  Prev: Visual mode,  Up: Playlist management
@@ -340,72 +316,140 @@
 2.4.2 Add/remove
 ----------------
 
-There are three commands for add/remove purposes. To add song use `a'.
-After you enter this command the edit box will appear where you are
-able to enter file name.  Name autocompletion is supported (by `<TAB>'
-key).  Note that MPFC allows you to play streaming audio. To do it
-place "http://" in the beginning of file name.
+Besides adding songs from command line you can do it after MPFC has
+launched using the 'Add song' dialog.  To display it press 'a'.  Name
+autocompletion (using '<TAB>' key) is supported.  Name may also feature
+standard shell wildcards (thus multiple files may be added from a single
+dialog).  The subsections below describe various types of objects which
+can be added.
+
+   Remove command ('r') removes the currently selected group of files.
+
+* Menu:
+
+* Regular files and directories::
+* URIs::
+* Playlists::
+* Smart directory adding::
+
+&#x1f;
+File: mpfc.info,  Node: Regular files and directories,  Next: URIs,  Prev: Add/remove,  Up: Add/remove
+
+2.4.3 Regular files and directories
+-----------------------------------
+
+The simplest song to add is a regular file.  MPFC supports files of all
+formats supported by your GStreamer installation provided they have
+appropriate extensions.  The list of extensions recognized by MPFC is
+displayed in the log (*note Log::).  You can add support for additional
+formats by installing plugins to GStreamer.  This is out of MPFC's
+scope.
+
+   If you add a directory, all regular files, playlists and
+subdirectories found within it will be added.  You can skip hidden files
+(with names starting with a dot) by setting "skip-hidden-files"
+variable.
+
+&#x1f;
+File: mpfc.info,  Node: URIs,  Next: Playlists,  Prev: Regular files and directories,  Up: Add/remove
+
+2.4.4 URIs
+----------
+
+You can add songs identified by GStreamer URIs (i.e.  with a prefix),
+for example: "http://somewhere", or "cdda://1".
+
+&#x1f;
+File: mpfc.info,  Node: Playlists,  Next: Smart directory adding,  Prev: URIs,  Up: Add/remove
+
+2.4.5 Playlists
+---------------
 
-   Remove command (`r') removes the currently selected group of files.
+MPFC supports several popular play list formats, namely m3u, pls and
+cue.  There is also a handy virtual play list type for adding all tracks
+of an Audio CD: to do that just add "audiocd://" URI.
+
+&#x1f;
+File: mpfc.info,  Node: Smart directory adding,  Prev: Playlists,  Up: Add/remove
+
+2.4.6 Smart directory adding
+----------------------------
+
+Often a directory would contain duplicate items: regular files (or a
+single CD image) and playlist (or even multiple playlists, e.g.  cue and
+m3u).  To prevent adding duplicates, MPFC has a smart mode, activated by
+setting "smart-dir-add" variable (by default it is disabled).
+
+   In this mode, if a playlist is found inside a directory, nothing else
+would be added.  If there are multiple playlists, the one with the
+biggest rank is added (or the first encountered if ranks are equal).
+Ranks are determined on a per-type basis.  By default all ranks are
+zero, but you can increase the rank of you favorite playlist type, for
+example:
+
+     # In ~/.mpfc/mpfcrc
+     plugins.plist.cueplist.rank = 1
+
+   Here "cueplist" is the name of playlist plugin for cue files.
 
 &#x1f;
 File: mpfc.info,  Node: File browser,  Next: Save,  Prev: Add/remove,  Up: Playlist management
 
-2.4.3 File browser
+2.4.7 File browser
 ------------------
 
 File browser is a special tool created to help you adding files to the
-play list. Launch it using `B' command. To select/deselect file press
-`<INSERT>' key. Also you may select or deselect a group of files
-matching a specified pattern. To do this press `+' (for select) or `-'
-(for deselect) key and enter the pattern. After you have selected the
-files you can add them to play list by pressing `a' or `r' key.  The
-latter one also clears the existing play list. You may press `h' to go
-to your home directory, `<BACKSPACE>' to go to the parent directory or
-`<c>' to manually specify a directory you want to move to.
-
-   File browser always is in one of two modes: normal or song info. In
-normal mode file names are displayed. In song info mode some parts of
-song info are displayed. To control what parts exactly and screen space
+play list.  Launch it using 'B' command.  To select/deselect file press
+'<INSERT>' key.  Also you may select or deselect a group of files
+matching a specified pattern.  To do this press '+' (for select) or '-'
+(for deselect) key and enter the pattern.  After you have selected the
+files you can add them to play list by pressing 'a' or 'r' key.  The
+latter one also clears the existing play list.  You may press 'h' to go
+to your home directory, '<BACKSPACE>' to go to the parent directory or
+'<c>' to manually specify a directory you want to move to.
+
+   File browser always is in one of two modes: normal or song info.  In
+normal mode file names are displayed.  In song info mode some parts of
+song info are displayed.  To control what parts exactly and screen space
 reserved for them you can use special window styles (*note Styles::):
 "fname-len" (for file name), "title-len" (for song name), "artist-name"
 (for artist), "album-len", "year-len", "genre-len", "comments-len",
-"track-len" and "time-len" (for song length). Note that these fields
-appear exactly in this order and you can't change it. To switch between
-normal and song info modes press `i'.
+"track-len" and "time-len" (for song length).  Note that these fields
+appear exactly in this order and you can't change it.  To switch between
+normal and song info modes press 'i'.
 
-   You can navigate in a directory more easily using search mode. To
-set it press `s' key and the enter name of file (or its title if you
-are in info mode) you want to jump to. As you will type the name cursor
-will move to the respective file. If you want to stop this process press
-`<ESCAPE>'.
+   You can navigate in a directory more easily using search mode.  To
+set it press 's' key and enter name of file (or its title if you are in
+info mode) you want to jump to.  As you will type the name cursor will
+move to the respective file.  If you want to stop this process press
+'<CTRL>-G'.
 
-   To exit browser press `q'.
+   To exit browser press 'q'.
 
 &#x1f;
 File: mpfc.info,  Node: Save,  Next: Sort,  Prev: File browser,  Up: Playlist management
 
-2.4.4 Save
+2.4.8 Save
 ----------
 
-To save playlist use `s' command. You will be prompted for file name.
-It must end with ".m3u" or ".pls" extension, so you can save playlist
-in any of these two formats.
+To save playlist use 's' command.  You will be prompted for file name.
+It must end with ".m3u" or ".pls" extension, so you can save playlist in
+any of these two formats.
 
 &#x1f;
 File: mpfc.info,  Node: Sort,  Next: Move,  Prev: Save,  Up: Playlist management
 
-2.4.5 Sort
+2.4.9 Sort
 ----------
 
-To sort playlist use command `S'. First you will be asked whether to
-sort globally or not. If you choose global sorting the entire playlist
-will be sorted, otherwise--only the current selection. Then you specify
+To sort playlist use command 'S'.  First you will be asked whether to
+sort globally or not.  If you choose global sorting the entire playlist
+will be sorted, otherwise--only the current selection.  Then you specify
 the sort criteria (by title, file name, path and file name or path and
 track) and the sorting is done.
 
    Also you can tell MPFC to do sorting automatically on loading songs.
-Set "sort-on-load" variable to do this. By default sorting by title is
+Set "sort-on-load" variable to do this.  By default sorting by title is
 done, but you may change this behaviour with "sort-on-load-type"
 variable ("sort-by-title", "sort-by-file-name", "sort-by-path-and-file"
 and "sort-by-path-and-track" values).
@@ -413,57 +457,57 @@
 &#x1f;
 File: mpfc.info,  Node: Move,  Next: Undo,  Prev: Sort,  Up: Playlist management
 
-2.4.6 Move
-----------
+2.4.10 Move
+-----------
 
-You may move a part of playlist. To do this select this part and use
+You may move a part of playlist.  To do this select this part and use
 one of the three movement commands:
 
-   `J': move selection one line down;
+   'J': move selection one line down;
 
-   `K': move selection one line up;
+   'K': move selection one line up;
 
-   `M': move selection to any specified poisition.
+   'M': move selection to any specified poisition.
 
-   Note that these commands support repeation value specification
-(*note Basic cursor movement operations::). For `M' command this value
-meaning is the same as for `G'.
+   Note that these commands support repeation value specification (*note
+Basic cursor movement operations::).  For 'M' command this value meaning
+is the same as for 'G'.
 
 &#x1f;
 File: mpfc.info,  Node: Undo,  Next: Song Info,  Prev: Move,  Up: Playlist management
 
-2.4.7 Undo
-----------
+2.4.11 Undo
+-----------
 
-MPFC supports undo playlist management actions history. Undoable
-actions are the following: add/remove songs, sort and move playlist. To
-undo action use `U' command and to redo--`D' command.
+MPFC supports undo playlist management actions history.  Undoable
+actions are the following: add/remove songs, sort and move playlist.  To
+undo action use 'U' command and to redo--'D' command.
 
 &#x1f;
 File: mpfc.info,  Node: Song Info,  Prev: Undo,  Up: Playlist management
 
-2.4.8 Song Info
----------------
+2.4.12 Song Info
+----------------
 
-Each song may have some information associated with it. This information
-include: song, artist and album names, year, track number, song genre
-and comments. The song format must support setting these fields in
-order you can make advantage of them (e.g. for MP3 this information is
-written in its ID3 tag).
-
-   You can view and edit this information using song info editor
-dialog. To call it place cursor to the respective song and use `i'
-command.  You can also edit info for multiple songs. To do it select
-these songs in visual mode and answer "No" to the appearing question.
-The dialog will appear (if the format allows you). Then you will be
-able to change its contents by setting focus to the respective edit box
-(press `<TAB>' several times to reach it). If you want to save changes
-press `<RET>', otherwise press `<ESC>'. If some of the selected songs
-have different values for an info field it will remain the same unless
-you change it. If you change any field its value will be saved to each
-of the selected songs.
-
-   You may change songs title accordingly to their info. To do it you
+Each song may have some information associated with it.  This
+information include: song, artist and album names, year, track number,
+song genre and comments.  The song format must support setting these
+fields in order you can make advantage of them (e.g.  for MP3 this
+information is written in its ID3 tag).
+
+   You can view and edit this information using song info editor dialog.
+To call it place cursor to the song and use 'i' command.  You can also
+edit info for multiple songs.  To do it select these songs in visual
+mode and answer "No" to the appearing question.  The dialog will appear
+(if the format allows you).  Then you will be able to change its
+contents by setting focus to the respective edit box (press '<TAB>'
+several times to reach it).  If you want to save changes press '<RET>',
+otherwise press '<CTRL>-G'.  If some of the selected songs have
+different values for an info field it will remain the same unless you
+change it.  If you change any field its value will be saved to each of
+the selected songs.
+
+   You may change songs title accordingly to their info.  To do it you
 must change "title-format" variable value (*note Using Variables::).
 Its value may be any string including some format sequences:
 
@@ -490,13 +534,8 @@
    The default value is "%p - %t" that means that title contains artist
 and song names divided by dash sign.
 
-   Some plugins may have special functions associated with their
-respective songs (e.g. function of removing tags for mp3 plugin). This
-function is called by clicking respective button in the song info
-dialog.
-
-   Also there is a command that reloads all selected playlist songs
-information--`I'.
+   There is a command that reloads all selected playlist songs
+information--'I'.
 
 &#x1f;
 File: mpfc.info,  Node: Window system,  Next: Other features,  Prev: Playlist management,  Up: Getting Started
@@ -518,26 +557,32 @@
 2.5.1 Overview
 --------------
 
-MPFC has an advanced window system. When you start MPFC there always
-appears play list window. As a result of some events there can appear
-other windows (e.g. file browser, help screen or various dialogs).
+MPFC has an advanced window system.  Please note that MPFC does not
+support non-UTF8 locales.  If you have such a locale, non-ASCII
+characaters (including pseudo-graphics) will be displayed incorrectly.
+Also please note that most window system key bindings use <ALT> key
+which may conflict with your window manager.
+
+   When you start MPFC there always appears play list window.  As a
+result of some events there can appear other windows (e.g.  file
+browser, help screen or various dialogs).
 
    All the top-level windows are listed in a special place on the root
-window which is called "window bar" and situated on the last line of
-the screen.  Currently active ("focused") window is marked with green
-color. To move between windows you press `<ALT>-,' or `<ALT>-.' keys.
-You may also select a window by clicking mouse left button its image on
-the window bar.
+window which is called "window bar" and situated on the last line of the
+screen.  Currently active ("focused") window is marked with green color.
+To move between windows you press '<ALT>-,' or '<ALT>-.' keys.  You may
+also select a window by clicking mouse left button its image on the
+window bar.
 
-   Most of the windows have a border with controls on it. These
+   Most of the windows have a border with controls on it.  These
 controls are a close window button (presented by "x" letter) and
-maximize button ("o" letter). Use them by clicking mouse or pressing
-buttons `<ALT>-c' and `<ALT>-m' respectively.
+maximize button ("o" letter).  Use them by clicking mouse or pressing
+buttons '<ALT>-c' and '<ALT>-m' respectively.
 
-   Windows are often resizable and movable. To turn window to the
-resize mode press `<ALT>-s', to the move mode-`<ALT>-p'.  After that
+   Windows are often resizable and movable.  To turn window to the
+resize mode press '<ALT>-s', to the move mode-'<ALT>-p'.  After that
 window border will turn its color to green and you'll be able to change
-size/position of the window using arrow keys. Then press `<ENTER>' to
+size/position of the window using arrow keys.  Then press '<ENTER>' to
 finish operation.
 
 &#x1f;
@@ -548,14 +593,14 @@
 
 Dialogs are widely used in MPFC for operations where user input is
 required.  There is number of special keys for navigating through the
-dialog items.  First of all, you can use `<TAB>' key to move to the
-next item.  But in big dialogs it is better to use special shortcuts to
-items. Many of the items have a letter associated with them. This
-letter is usually marked red on the label. So when you press `<ALT>'
-with this letter you jump to it.
+dialog items.  First of all, you can use '<TAB>' key to move to the next
+item.  But in big dialogs it is better to use special shortcuts to
+items.  Many of the items have a letter associated with them.  This
+letter is usually marked red on the label.  When you press '<ALT>' with
+this letter you jump to it.
 
-   Also there are `<ENTER>' key connected with the "OK" button and
-`<ESCAPE>' or `<CTRL>-G' connected with the "Cancel" button.
+   Also there are '<ENTER>' key connected with the "OK" button and
+'<CTRL>-G' or '<ESCAPE>' connected with the "Cancel" button.
 
 &#x1f;
 File: mpfc.info,  Node: Styles,  Next: Key bindings,  Prev: Using dialogs,  Up: Window system
@@ -563,47 +608,48 @@
 2.5.3 Styles
 ------------
 
-Window system display parameters are highly configurable. This
+Window system display parameters are highly configurable.  This
 configuration is implemented with a concept of a style.
 
-   Style is a parameter of some item of the interface. In fact it is a
+   Style is a parameter of some item of the interface.  In fact it is a
 variable (*note Using Variables::) that you may set as you always do.
-Usually it represents color and symbol attribute of the text. In that
+Usually it represents color and symbol attribute of the text.  In that
 case variable value has the following format:
 <color>:bg-color:attrib.  Color is one of the following values:
 "black", "red", "green", "blue", "yellow", "magenta", "cyan" and
-"white". "attrib" field is a combination (delimited by a comma) of the
+"white".  "attrib" field is a combination (delimited by a comma) of the
 following values: "standout", "underline", "reverse", "blink", "dim",
-"bold", "protect", "invis" and "altcharset". Note that not all of these
-attributes are supported on your terminal. In fact you usually will use
+"bold", "protect", "invis" and "altcharset".  Note that not all of these
+attributes are supported on your terminal.  In fact you usually will use
 only "bold" and, maybe, "blink".
 
    Before listing style names a note on window classes should be made.
-Any window belongs to some class. All these classes make an hierarchy.
-The main purpose of the classes is to let the user configure styles of
-a group of similar windows (e.g edit boxes).
-
-   Root configuration list where all the window system related
-variables are holded is "windows". It has child list "classes". This
-list has many child lists for each of the available classes.
-
-   When MPFC searches for a style for a particular window it first
-seeks for a variable of the name same with the style name in the window
-configuration list. In fact, this list is not (yet) accessible for a
-user, so it does not make much sense. Then it searches for this
+Any window belongs to some class.  All these classes make an hierarchy.
+The main purpose of the classes is to let the user configure styles of a
+group of similar windows (e.g edit boxes).
+
+   Root configuration list where all the window system related variables
+are holded is "windows".  It has child list "classes".  This list has
+many child lists for each of the available classes.
+
+   When MPFC searches for a style for a particular window it first seeks
+for a variable of the name same with the style name in the window
+configuration list.  In fact, this list is not (yet) accessible for a
+user, so it does not make much sense.  Then it searches for this
 variable in the window class configuration list, then in that class
 parent class list, and so on, until it reaches the base window system
-configuration list. If it is not found there, style is undefined (value
+configuration list.  If it is not found there, style is undefined (value
 for an undefined style is "white:black").  So, for example, if you want
 all the edit boxes to display their text bold green with red background
 you should set variable "windows.classes.editbox.text-style" to
 "green:red:bold".
 
-   You may unite a set of styles into a style scheme. To do this create
-a file in `~/.mpfc/colors' directory. The name of this file is the name
-of scheme. This file may contain any of the variable operations you may
+   You may unite a set of styles into a style scheme.  To do this create
+a file in '~/.mpfc/colors' directory.  The name of this file is the name
+of scheme.  This file may contain any of the variable operations you may
 use in configuration file (although, you would probably list there
-styles). To turn on a scheme set "color-scheme" variable to scheme name.
+styles).  To turn on a scheme set "color-scheme" variable to scheme
+name.
 
    Here is a list of some window classes and their styles.
 
@@ -613,7 +659,6 @@
 * player::
 * browser::
 * help::
-* eqwnd::
 * logger_view::
 * dialog::
 * dlgitem::
@@ -625,22 +670,16 @@
 2.5.4 basic
 -----------
 
-"basic" class is the base window class. It defines the following styles:
+"basic" class is the base window class.  It defines the following
+styles:
 
    * caption-style;
-
    * border-style;
-
    * repos-border-style;
-
    * maximize-box-style;
-
    * close-box-style;
-
    * wndbar-focus-style;
-
    * text-style;
-
    * focus-text-style.
 
 &#x1f;
@@ -649,114 +688,73 @@
 2.5.5 player
 ------------
 
-"player" class is class of the player window. Styles:
+"player" class is class of the player window.  Styles:
 
    * plist-style: style of play list item;
-
    * plist-playing-style: style of play list item currently being
      played;
-
    * plist-selected-style: style of a selected play list item;
-
    * plist-sel-and-play-style: combination of the previous two;
-
    * plist-time-style: style of play list item time;
-
    * title-style: current song title style;
-
    * time-style: current time style;
-
    * audio-params-style: audio parameters style;
-
    * about-style: about string style;
-
-   * slider-style: sliders style (for time, volume and balance);
-
+   * slider-style: sliders style (for time and volume);
    * play-modes-style: "Loop" and "Shuffle" strings style;
-
    * status-style: status line style.
 
 &#x1f;
 File: mpfc.info,  Node: browser,  Next: help,  Prev: player,  Up: Styles
 
-   "browser" class is class of file browser window. Styles:
+"browser" class is class of file browser window.  Styles:
 
    * file-style;
-
    * cur-file-style;
-
    * dir-style;
-
    * cur-dir-style;
-
    * selection-style;
-
    * cur-selecton-style;
-
    * search-prompt-style;
-
    * search-string-style;
-
    * title-style;
-
    * header-style.
 
 &#x1f;
-File: mpfc.info,  Node: help,  Next: eqwnd,  Prev: browser,  Up: Styles
+File: mpfc.info,  Node: help,  Next: logger_view,  Prev: browser,  Up: Styles
 
-   "help" class is class of help screen. Styles:
+"help" class is class of help screen.  Styles:
 
    * item-style;
-
    * prompt-style.
 
 &#x1f;
-File: mpfc.info,  Node: eqwnd,  Next: logger_view,  Prev: help,  Up: Styles
+File: mpfc.info,  Node: logger_view,  Next: dialog,  Prev: help,  Up: Styles
 
-   "eqwnd" class is class of equalizer window. Styles:
-
-   * band-style;
-
-   * focus-band-style;
-
-   * label-style;
-
-   * focus-label-style.
-
-&#x1f;
-File: mpfc.info,  Node: logger_view,  Next: dialog,  Prev: eqwnd,  Up: Styles
-
-   "logger_view" is child of "scrollable" class. Styles of "scrollable":
+"logger_view" is child of "scrollable" class.  Styles of "scrollable":
 
    * scroll-arrow-style;
-
    * scroll-bar-style;
-
    * scroll-slider-style.
 
    Styles of "logger_view":
 
    * logger-normal-style;
-
    * logger-status-style;
-
    * logger-warning-style;
-
    * logger-error-style;
-
    * logger-fatal-style;
-
    * logger-debug-style.
 
 &#x1f;
 File: mpfc.info,  Node: dialog,  Next: dlgitem,  Prev: logger_view,  Up: Styles
 
-   "dialog" class is class of dialogs. It has no specific styles.
+"dialog" class is class of dialogs.  It has no specific styles.
 
 &#x1f;
 File: mpfc.info,  Node: dlgitem,  Next: listbox and combo,  Prev: dialog,  Up: Styles
 
-   "dlgitem" class is class of various dialog items. It has many child
+"dlgitem" class is class of various dialog items.  It has many child
 classes: "button", "editbox" (with "filebox" and "combo" children),
 "listbox", "label", "radio", "checkbox", "hbox" and "vbox".
 
@@ -765,7 +763,6 @@
 
    * list-style: style of list item highlighted by cursor in a
      not-focused window;
-
    * focus-list-style: the same but in a focused window.
 
 &#x1f;
@@ -774,69 +771,69 @@
 2.5.6 Key bindings
 ------------------
 
-MPFC features configurable key bindings. This is achieved in a way
-similar to the styles (*note Styles::) mechanism. In fact, key bindings
+MPFC features configurable key bindings.  This is achieved in a way
+similar to the styles (*note Styles::) mechanism.  In fact, key bindings
 may be considered also styles with names starting with "kbind.".
 
    The value of a key binding consists of a list of respective keys.
-Particular keys in this list are delimited with a ";". To specify a
-normal key you use its respective character. To specify a special key
-use its textual representation in angle brackets (e.g. "<F1>",
+Particular keys in this list are delimited with a ";".  To specify a
+normal key you use its respective character.  To specify a special key
+use its textual representation in angle brackets (e.g.  "<F1>",
 "<Return>", "<Left">).
 
    Full list of the special keys may be found in terminfo(5) manpage.
-There is a table of capabilities. You need keypad capabilities (with
-their names in the first column starting with "key_" prefix). Textual
-representation of a special key may be retrieved by throwing this
-prefix away (e.g.  "key_dc" leads to "dc"). Also there are some
-aliases: "delete" or "del" is the same as "dc", "insert" or "ins" is
-the same as "ic", "pageup" is the same as "ppage", "pagedown" is the
-same as "npage").  Also there are some keys not included into that
-list: "tab", "space", "escape", "enter" and "return" (the latter two
-represent the same key).
-
-   Besides that you can use control and alt combinations. They are
+There is a table of capabilities.  You need keypad capabilities (with
+their names in the first column starting with "key_" prefix).  Textual
+representation of a special key may be retrieved by throwing this prefix
+away (e.g.  "key_dc" leads to "dc").  Also there are some aliases:
+"delete" or "del" is the same as "dc", "insert" or "ins" is the same as
+"ic", "pageup" is the same as "ppage", "pagedown" is the same as
+"npage").  Also there are some keys not included into that list: "tab",
+"space", "escape", "enter" and "return" (the latter two represent the
+same key).
+
+   Besides that you can use control and alt combinations.  They are
 represented also in angle brackets with names starting with "ctrl-" and
-"alt-" (e.g. "<ctrl-a>" or "<alt-w>").
+"alt-" (e.g.  "<ctrl-a>" or "<alt-w>").
 
-   To use "<" and ">" directly specify a "\" in front of them. The same
-with using "\" itself. Note that expressions inside angle brackets are
+   To use "<" and ">" directly specify a "\" in front of them.  The same
+with using "\" itself.  Note that expressions inside angle brackets are
 case-insensitive, so that "Left" is the same with "LEFT" (although this
 is not the case with an alt combination, for key after "-" is a key you
 press, thats why "Alt-a" and "Alt-A" are different).
 
    Note also that key binding actually is not one key but key sequence,
-so that you may set it to, for example, "tt". Then to perform
+so that you may set it to, for example, "tt".  Then to perform
 respective action you must press "t" key twice.
 
    When making your own key bindings "add" and "rem" variables
-operations are useful. Consider setting a binding for moving cursor in
-play list down.  Default binding is "j;<Ctrl-n>;<Down>" and it is
-stored in "windows.classes.player.kbind.move_down" variable. You type
-the following line in your configuration file:
+operations are useful.  Consider setting a binding for moving cursor in
+play list down.  Default binding is "j;<Ctrl-n>;<Down>" and it is stored
+in "windows.classes.player.kbind.move_down" variable.  You type the
+following line in your configuration file:
 
      windows.classes.player.kbind.move_down = "."
 
    But then other keys ("j" and others) for this binding will be
-removed.  Usually this is not a desired behaviour. So you should type
+removed.  Usually this is not a desired behaviour.  So you should type
 this:
 
      windows.classes.player.kbind.move_down += "."
 
-   Sometimes you can see that setting a key binding doesn't work. It
+   Sometimes you can see that setting a key binding doesn't work.  It
 may be because of conflicting a key in your binding with this key in
-some other (default) binding. So you should remove the key from the
+some other (default) binding.  So you should remove the key from the
 latter binding:
 
      windows.classes.player.kbind.screen_down -= "d"
      windows.classes.player.kbind.move_down += "d"
 
-   You may unite a set of key bindings into a kbind scheme. To do this
-create a file in `~/.mpfc/kbinds' directory. The name of this file is
-the name of scheme. This file may contain any of the variable operations
-you may use in configuration file (although, you would probably list
-there kbind variables operations). To turn on a scheme set
-"kbind-scheme" variable to scheme name.
+   You may unite a set of key bindings into a kbind scheme.  To do this
+create a file in '~/.mpfc/kbinds' directory.  The name of this file is
+the name of scheme.  This file may contain any of the variable
+operations you may use in configuration file (although, you would
+probably list there kbind variables operations).  To turn on a scheme
+set "kbind-scheme" variable to scheme name.
 
    Here is the list of available key bindings for various window
 classes.
@@ -847,7 +844,6 @@
 * player keybinds::
 * browser keybinds::
 * help keybinds::
-* equalizer keybinds::
 * logger_view keybinds::
 * dlgitem keybinds::
 * button keybinds::
@@ -865,18 +861,12 @@
 --------------------
 
    * refresh_screen: refresh the screen (default is "<Ctrl-l>");
-
    * close_window: close the window (default is "<Alt-c>");
-
    * maximize_window: toggle window maximization state (default is
      "<Alt-m>");
-
    * move_window: start window moving (default is "<Alt-p>");
-
    * resize_window: start window resizing (default is "<Alt-s>");
-
    * next_focus: set focus to the next window (default is "<Alt-.>");
-
    * prev_focus: set focus to the previous window (default is
      "<Alt-,>").
 
@@ -887,126 +877,69 @@
 ---------------------
 
    * quit: quit MPFC (default is "q;Q");
-
    * move_down: move play list cursor down (default is
      "j;<Ctrl-n>;<Down>");
-
    * move_up: move play list cursor up (defaut is "k;<Ctrl-p>;<Up>");
-
    * screen_down: move play list cursor one screen down (default is
      "d;<Ctrl-v>;<PageDown>");
-
    * screen_up: move play list cursor one screen up (default is
      "u;<Alt-v>;<PageUp>");
-
    * move_to_begin: move play list cursor to the beginning (default is
      "gg;<Ctrl-a>;<Home>");
-
    * move_to_end: move play list cursor to the end (default is
      "<End>;<Ctrl-e>");
-
    * move: move play list cursor to any position (default is "G");
-
    * start_play: start playing (default is "Return");
-
    * play: resume playing/play from the beginning (default is "x");
-
    * pause: pause/resume playing (default is "c");
-
    * stop: stop playing (default is "v");
-
    * prev: play previous song (default is "z");
-
    * next: play next song (default is "b");
-
    * time_fw: seek song forward (default is "\>;lt");
-
    * time_bw: seek song backwards (default is "\>;ht");
-
    * time_long_fw: seek song forward 1 minute (default is "<Right>;lT");
-
    * time_long_bw: seek song backwards 1 minute (default is
      "<Left>;hT");
-
    * time_move: seek to any position in the song (default is "gt");
-
    * vol_fw: increase volume (default is "+;lv");
-
    * vol_bw: decrease volume (default is "-;hv");
-
-   * bal_fw: increase balance (default is ";lb");
-
-   * bal_bw: decrease balance (default is ";hb");
-
    * info: launch song info dialog (default is "i");
-
    * add: launch song adding dialog (default is "a");
-
    * rem: remove song (default is "r");
-
    * save: launch play list saving dialog (default is "s");
-
    * sort: launch play list sorting dialog (default is "S");
-
    * plugins_manager: launch plugins manager (default is "P");
-
    * visual: toggle visual mode (default is "V");
-
    * centrize: centrize view (default is "C");
-
    * search: launch search dialog (default is "/");
-
    * advanced_search: launch advanced search dialog (default is "\\");
-
    * next_match: move to the next search match (default is "n");
-
    * prev_match: move to the previous search match (default is "N");
-
    * help: launch help screen (default is "?");
-
-   * equalizer: launch equalizer window (default is "e");
-
    * shuffle: toggle shuffle mode (default is "R");
-
    * var_manager: launch variable manager (default is "o");
-
    * plist_down: shift play list item down (default is "J");
-
    * plist_up: shift play list item up (default is "K");
-
    * plist_move: move play list item (default is "M");
-
    * undo: undo last action (default is "U");
-
    * redo: redo last undone action (default is "D");
-
    * reload_info: reload song info (default is "I");
-
    * set_play_bounds: set playing boundaries (default is "ps");
-
    * clear_play_bounds: clear playing boundaries (default is "pc");
-
    * play_bounds: play inside playing boundaries (default is
      "p<Return>");
-
    * exec: execute an external command (default is "!");
-
    * goback: return to the last play list position (default is "``")
-
    * time_back: return to the last song position (default is
      "<Backspace>");
-
    * queue: queue the song under cursor (default is "'");
-
    * file_browser: launch file browser (default is "B");
-
+   * audio_setup: audio output setup (default is "A");
    * log: open logger window (default is "O");
-
    * marka, ..., markz: remember cursor position (defaults are "ma",
      ..., "mz");
-
-   * goa, ..., goz: go to respective mark (defaults are "`a", ...,
-     "`z").
+   * goa, ..., goz: go to respective mark (defaults are "'a", ...,
+     "'z").
 
 &#x1f;
 File: mpfc.info,  Node: browser keybinds,  Next: help keybinds,  Prev: player keybinds,  Up: Key bindings
@@ -1015,117 +948,69 @@
 ----------------------
 
    * quit: close browser (default is "q;<Escape>");
-
    * move_up: move cursor up (default is "k;<Up>;<Ctrl-p>");
-
    * move_down: move cursor down (default is "j;<Down>;<Ctrl-n>");
-
    * screen_up: move cursor screen up (default is "u;<PageUp>;<Alt-v>");
-
    * screen_down: move cursor screen down (default is
      "d;<PageDown>;<Ctrl-v>");
-
    * move_to_start: move cursor to the beginning (default is
      "<Ctrl-a>;<Home>");
-
    * move_to_end: move cursor to the end (default is "<Ctrl-e>;<End>");
-
    * go_to_dir: go to currently selected directory (default is
      "<Enter>");
-
    * go_to_home: go to home directory (default is "h");
-
    * go_to_parent: go to parent directory (default is "<Backspace>");
-
    * add_to_playlist: add selected files to play list (default is "a");
-
    * replace_playlist: replace play list witht the selected files
      (default is "r");
-
    * toggle_info: toggle info move (default is "i");
-
    * change_dir: launch change directory dialog (default is "c");
-
    * select: select highlighted file (default is "<Insert>");
-
    * select_pattern: select files matching a pattern (default is "+");
-
    * deselect_pattern: deselect files matching a pattern (default is
      "-");
-
    * help: launch help screen (default is "?").
 
 &#x1f;
-File: mpfc.info,  Node: help keybinds,  Next: equalizer keybinds,  Prev: browser keybinds,  Up: Key bindings
+File: mpfc.info,  Node: help keybinds,  Next: logger_view keybinds,  Prev: browser keybinds,  Up: Key bindings
 
 2.5.10 help keybinds
 --------------------
 
    * quit: close window (default is "q;<Escape>");
-
    * next_page: show next page (default is "<Enter>;<Space>").
 
 &#x1f;
-File: mpfc.info,  Node: equalizer keybinds,  Next: logger_view keybinds,  Prev: help keybinds,  Up: Key bindings
-
-2.5.11 equalizer keybinds
--------------------------
-
-   * quit: close window (default is "q;<Escape>");
-
-   * move_left: highlight band to the left (default is
-     "h;<Left>;<Ctrl-b>");
-
-   * move_right: highlight band to the right (default is
-     "l;<Right>;<Ctrl-f>");
-
-   * increase: increase band value (default is "k;<Up>;<Ctrl-p>");
-
-   * decrease: decrease band value (default is "j;<Down>;<Ctrl-n>");
-
-   * load_eqf: launch loading EQF file dialog (default is "p");
-
-   * help: launch help screen (default is "?").
-
-&#x1f;
-File: mpfc.info,  Node: logger_view keybinds,  Next: dlgitem keybinds,  Prev: equalizer keybinds,  Up: Key bindings
+File: mpfc.info,  Node: logger_view keybinds,  Next: dlgitem keybinds,  Prev: help keybinds,  Up: Key bindings
 
-2.5.12 logger_view keybinds
+2.5.11 logger_view keybinds
 ---------------------------
 
    * quit: close window (default is "q;<Escape>");
-
    * scroll_up: scroll up (default is "k;<Up>;<Ctrl-p>");
-
    * scroll_down: scroll down (default is "j;<Down>;<Ctrl-n>");
-
    * screen_up: scroll one screen up (default is "u;<PageUp>;<Alt-v>");
-
    * screen_down: scroll one screen down (default is
      "<Space>;d;<PageDown>;<Ctrl-v>");
-
    * scroll_to_start: scroll to the beginning (default is
      "g;<Ctrl-a>;<Home>");
-
    * scroll_to_end: scroll to the end (default is "G;<Ctrl-e>;<End>").
 
 &#x1f;
 File: mpfc.info,  Node: dlgitem keybinds,  Next: button keybinds,  Prev: logger_view keybinds,  Up: Key bindings
 
-2.5.13 dlgitem keybinds
+2.5.12 dlgitem keybinds
 -----------------------
 
    * next: move to the next item (default is "<Tab>");
-
    * ok: press dialog "OK" button (default is "<Enter>");
-
    * cancel: press dialog "Cancel" button (default is
      "<Escape>;<Ctrl-g>").
 
 &#x1f;
 File: mpfc.info,  Node: button keybinds,  Next: radio keybinds,  Prev: dlgitem keybinds,  Up: Key bindings
 
-2.5.14 button keybinds
+2.5.13 button keybinds
 ----------------------
 
    * click: click button (default is "<Space>").
@@ -1133,21 +1018,19 @@
 &#x1f;
 File: mpfc.info,  Node: radio keybinds,  Next: checkbox keybinds,  Prev: button keybinds,  Up: Key bindings
 
-2.5.15 radio keybinds
+2.5.14 radio keybinds
 ---------------------
 
    * check: check the radio button (default is "<Space>");
-
    * move_to_next: move to next button in the group (default is
      "<Down>;<Ctrl-n>;j");
-
    * move_to_prev: move to previous button in the group (default is
      "<Up>;<Ctrl-p>;k").
 
 &#x1f;
 File: mpfc.info,  Node: checkbox keybinds,  Next: editbox keybinds,  Prev: radio keybinds,  Up: Key bindings
 
-2.5.16 checkbox keybinds
+2.5.15 checkbox keybinds
 ------------------------
 
    * toggle: toggle checkbox state (default is "<Space>").
@@ -1155,45 +1038,34 @@
 &#x1f;
 File: mpfc.info,  Node: editbox keybinds,  Next: filebox keybinds,  Prev: checkbox keybinds,  Up: Key bindings
 
-2.5.17 editbox keybinsd
+2.5.16 editbox keybinsd
 -----------------------
 
    * move_left: move cursor left (default is "<Left>;<Ctrl-b>");
-
    * move_right: move cursor right (default is "<Right>;<Ctrl-f>");
-
    * word_left: move cursor one word left (default is
      "<Alt-b>;<SLeft>");
-
    * word_right: move cursor one word right (default is
      "<Alt-f>;<SRight>");
-
    * del_left: delete character to the left (default is "<Backspace>");
-
    * del_right: delete character under cursor (default is
      "<Del>;<Ctrl-d>");
-
    * kill_to_start: delete text from cursor to the start (default is
      "<Ctrl-u>");
-
    * kill_to_end: delete text from cursor to te end (default is
      "<Ctrl-k>");
-
    * move_to_start: move cursor to the beginning (default is
      "<Home>;<Ctrl-a>");
-
    * move_to_end: move cursor to the end (default is "<End>;<Ctrl-e>");
-
    * history_prev: insert previous history entry (default is
      "<Up>;<Ctrl-p>");
-
    * history_next: insert next history entry (default is
      "<Down>;<Ctrl-n>").
 
 &#x1f;
 File: mpfc.info,  Node: filebox keybinds,  Next: combo keybinds,  Prev: editbox keybinds,  Up: Key bindings
 
-2.5.18 filebox keybinds
+2.5.17 filebox keybinds
 -----------------------
 
    * complete: do name completion (default is "<Tab>").
@@ -1201,71 +1073,44 @@
 &#x1f;
 File: mpfc.info,  Node: combo keybinds,  Next: listbox keybinds,  Prev: filebox keybinds,  Up: Key bindings
 
-2.5.19 combo keybinds
+2.5.18 combo keybinds
 ---------------------
 
    * move_down: move cursor down (default is "<Down>;<Ctrl-n>");
-
    * move_up: move cursor up (default is "<Up>;<Ctrl-p>");
-
    * screen_down: move cursor one screen down (default is
      "<PageDown>;<Ctrl-v>");
-
    * screen_up: move cursor one screen up (default is
      "<PageUp>;<Alt-v>");
-
    * toggle_expansion: expand/reduce list (default is "<Ctrl-e>").
 
 &#x1f;
 File: mpfc.info,  Node: listbox keybinds,  Prev: combo keybinds,  Up: Key bindings
 
-2.5.20 listbox keybinds
+2.5.19 listbox keybinds
 -----------------------
 
    * move_down: move cursor down (default is "<Down>;<Ctrl-n>;j");
-
    * move_up: move cursor up (default is "<Up>;<Ctrl-p>;k");
-
    * screen_down: move cursor one screen down (default is
      "<PageDown>;<Ctrl-v>;d");
-
    * screen_up: move cursor one screen up (default is
      "<PageUp>;<Alt-v>;u");
-
    * move_to_start: move cursor to list beginning (default is
      "<Ctrl-a>;<Home>;g");
-
    * move_to_end: move cursor to list end (default is
      "<Ctrl-e>;<End>;G");
-
    * select_item: select list item (default is "<Space");
 
 &#x1f;
 File: mpfc.info,  Node: Other window system features,  Prev: Key bindings,  Up: Window system
 
-2.5.21 Terminfo hints
----------------------
-
-MPFC uses terminfo(5) for translating escape sequences into real keys.
-Unfortunately, terminfo table does not always contain all of needed
-capabilities. For example, values for <Ctrl-Left> and <Ctrl-Right> are
-often missed.
-
-   To use these keys you may specify a value for this capability in
-variable "windows.ti.<cap_name>". The full list of capabilities may be
-found in manpage for terminfo(5).
-
-   For example, to set values for <Ctrl-Left> and <Ctrl-Right>:
-
-     windows.ti.%i = "\e5C"
-     windows.ti.#4 = "\e5D"
-
-2.5.22 Using terminal background
+2.5.20 Using terminal background
 --------------------------------
 
 Sometimes you want to use background color of your terminal instead of
-default MPFC background (black). To do this set "force-terminal-bg"
-variable to 1. Then all the colors with black background will be
+default MPFC background (black).  To do this set "force-terminal-bg"
+variable to 1.  Then all the colors with black background will be
 treated as colors with default terminal background.
 
 &#x1f;
@@ -1288,8 +1133,8 @@
 -----------------------
 
 You are able to execute an external command when you are in MPFC. To do
-this use `!' command. You will be prompted for the command. After you
-finish press `<RET>' to return to MPFC.
+this use '!' command.  You will be prompted for the command.  After you
+finish press '<RET>' to return to MPFC.
 
 &#x1f;
 File: mpfc.info,  Node: Log,  Next: History,  Prev: Command execution,  Up: Other features
@@ -1297,12 +1142,12 @@
 2.6.2 Log
 ---------
 
-MPFC has a log system. You may view log messages in two places. First is
-`~/.mpfc/log' file (this name may be changed by setting "log-file"
-variable). Second is logger view window. It is activated by pressing
+MPFC has a log system.  You may view log messages in two places.  First
+is '~/.mpfc/log' file (this name may be changed by setting "log-file"
+variable).  Second is logger view window.  It is activated by pressing
 <O> key.
 
-   An important issue concerning the log system is log level. It is set
+   An important issue concerning the log system is log level.  It is set
 with "log-level" variable and it controls the amount of messages you
 get.  Possible values for it are: "none", "low", "default", "high" and
 "debug" (there is a little use from the latter for a common user,
@@ -1315,8 +1160,8 @@
 -------------
 
 Some edit boxes when you do input support history so that you can
-restore any of the strings you have entered there before. To jump
-between these strings press `<Up>' for going back and `<Down>' for going
+restore any of the strings you have entered there before.  To jump
+between these strings press '<Up>' for going back and '<Down>' for going
 forth.
 
 &#x1f;
@@ -1326,27 +1171,27 @@
 ------------------------------
 
 MPFC tries to guess the type of mouse driver by the name of terminal it
-is running on. But it can do it wrong, so you may specify this type
-explicitly.  Use variable "mouse" for this purpose. It may have one of
-the following values: "none" (no mouse is used), "gpm" (use gpm--this
-is normally used when you run MPFC on console) and "xterm" (on
-xterm-like terminal).
+is running on.  But it can do it wrong, so you may specify this type
+explicitly.  Use variable "mouse" for this purpose.  It may have one of
+the following values: "none" (no mouse is used), "gpm" (use gpm--this is
+normally used when you run MPFC on console) and "xterm" (on xterm-like
+terminal).
 
 &#x1f;
-File: mpfc.info,  Node: Using Variables,  Next: Plugins,  Prev: Getting Started,  Up: Top
+File: mpfc.info,  Node: Using Variables,  Next: Audio processing,  Prev: Getting Started,  Up: Top
 
 3 Variables usage
 *****************
 
 MPFC supports variables that allow you to control some of its options.
-These variables are organized into configuration lists. Each list can
-have variables and other lists in it. Variables and lists have their
+These variables are organized into configuration lists.  Each list can
+have variables and other lists in it.  Variables and lists have their
 names.  If a variable/list is not in the top-level list its ancestors
-names are delimited with "." (e.g. "windows.classes.kbind.move_down").
-Each variable has a value associated with it. This value is a string.
-If variable is not set its value is considered to be "0". Also you can
-simply "set" variable so that its value becomes "1". These two values
-are often used when specifying a choice result. "0" means "no" and "1"
+names are delimited with "."  (e.g.  "windows.classes.kbind.move_down").
+Each variable has a value associated with it.  This value is a string.
+If variable is not set its value is considered to be "0".  Also you can
+simply "set" variable so that its value becomes "1".  These two values
+are often used when specifying a choice result.  "0" means "no" and "1"
 means "yes".  So when variable is not set, its value respects to "no"
 and when it is set--to "yes".
 
@@ -1363,45 +1208,46 @@
 
 You may set a variable in three different places.
 
-   The first is any of MPFC configuration files (`/etc/mpfcrc' and
-`~/.mpfc/mpfcrc').  In this file each variable is specified in its own
+   The first is any of MPFC configuration files ('/etc/mpfcrc' and
+'~/.mpfc/mpfcrc').  In this file each variable is specified in its own
 line in the format: <variable><operation><value>, where "variable" is
 variable name, "operation" is one of the following symbol sequences:
-"=", "+=", "-=", and "value" is variable value.  You may skip the
-second part of this expression, then variable will be set to "1". "#"
-in the line beginning starts a comment.
+"=", "+=", "-=", and "value" is variable value.  You may skip the second
+part of this expression, then variable will be set to "1".  "#" in the
+line beginning starts a comment.
 
-   Value may be in one of two forms. First consists of characters that
-will be literally used as the value. This sequence of characters is
+   Value may be in one of two forms.  First consists of characters that
+will be literally used as the value.  This sequence of characters is
 bounded by whitespaces, so you can't use whitespaces in these values.
 In second form you place the value inside double quotes, so that there
 is no such restriction.  Also in that form you may use special
 characters: "\n" (new line), "\t" (tabulation), "\e" (escape), "\""
-(double quote itself), "\\" (backslash).
+(double quote itself), "\\" (backslash) as well as octal ("\NNN") and
+hexadecimal ("\xNN") codes for a character.
 
    Operation type points to what will be done with the value.
-Assignment ("=") simply assigns variable this value. Addition ("+=")
+Assignment ("=") simply assigns variable this value.  Addition ("+=")
 replaces current value with the value "<current value>;<specified
 value>" (it is used primarily for setting key bindings *note Key
-bindings::). Removal ("-=") is opposite for addition.  Besides main
-configuration file you can use a local configuration file in the
-current directory. Its name is also `.mpfcrc' but settings from it
-override the settings from the main file.
+bindings::).  Removal ("-=") is opposite for addition.  Besides main
+configuration file you can use a local configuration file in the current
+directory.  Its name is also '.mpfcrc' but settings from it override the
+settings from the main file.
 
    You may include a separate file with "include(<file_name>)".
 
-   Also there is a special feature called list operator. It is used
-when you have to set many variables stored in deep-leveled lists. You
+   Also there is a special feature called list operator.  It is used
+when you have to set many variables stored in deep-leveled lists.  You
 write name of the list in square brackets and then variable on the next
-line will use this name as its parent. Certainly, you won't often use
-list operator for setting a single variable, so you would unite
-multiple lines in blocks using braces.
+line will use this name as its parent.  Certainly, you won't often use
+list operator for setting a single variable, so you would unite multiple
+lines in blocks using braces.
 
    Here is a short example of MPFC configuration file:
 
 # MPFC configuration file
 lib-dir=/usr/local/lib/mpfc
-output-plugin=oss
+gstreamer.audio-sink = alsasink
 play-from-stop
 
 include(some_file)
@@ -1425,19 +1271,19 @@
 include(my_browser_styles)
 
    The second place where you can set variable is command line when you
-invoke MPFC (*note Launching MPFC::). The format is the same with the
+invoke MPFC (*note Launching MPFC::).  The format is the same with the
 configuration file but you must add prefix "" before each definition.
 
    Also there is a way to specify include-file from the command line.
-Use "-f <name>" or "-ff <name>" for that. First uses file
-`~/.mpfc/<name>', while second uses name as the real file name.  Here
-is an example:
+Use "-f <name>" or "-ff <name>" for that.  First uses file
+'~/.mpfc/<name>', while second uses name as the real file name.  Here is
+an example:
 
-     mpfc --lib-dir=/usr/local/lib/mpfc --output-plugin=oss --play-from-stop
+     mpfc --lib-dir=/usr/local/lib/mpfc --gstreamer.audio-sink=alsasink --play-from-stop
      -f some_file list.m3u
 
    The third place is while running MPFC. It has a variable manager
-invoked by `o' command. There you set variable name, value and
+invoked by 'o' command.  There you set variable name, value and
 operation you want to perform, press "OK" button, and variable will be
 set.
 
@@ -1447,351 +1293,208 @@
 3.2 List of options
 ===================
 
-Here is a list of MPFC configuration options. Note that plugin or
-window system specific options are not present here. Look for them in
+Here is a list of MPFC configuration options.  Note that plugin or
+window system specific options are not present here.  Look for them in
 the respective sections of manual.
 
-`autosave-plugins-params'
-     Automatically save plugins parameters (default is 1)
-
-`charset-input'
-     Charset to use as input when reading songs information (*note
-     Charsets::)
-
-`convert-underscores2spaces'
+'autosave-plugins-params'
+     Automatically save plugins parameters (plugins.* and gstreamer.*)
+     (default is 1)
+'convert-underscores2spaces'
      Convert underscores to spaces in songs titles (default is 0)
-
-`log-file'
+'log-file'
      Log file path
-
-`log-level'
+'log-level'
      Log level (*note Log::)
-
-`loop-play'
+'loop-play'
      Turns on loop play mode (default is 0)
-
-`play-from-stop'
-     At the beginning play from the point you stopped last time
-     (default is 1)
-
-`save-playlist-on-exit'
-     Save play list to `~/.mpfc/list.m3u' on exit (default is 1)
-
-`search-nocase'
+'play-from-stop'
+     At the beginning play from the point you stopped last time (default
+     is 1)
+'remote-dir-root'
+     Root directory for file browsing in the remote control (unset by
+     default)
+'save-playlist-on-exit'
+     Save play list on exit (default is 1)
+'search-nocase'
      Make play list search case-insensitive (default is 1)
-
-`show-time-remaining'
+'server-port'
+     Port number the server listens on (default is 19792)
+'server-port-pool-size'
+     Number of ports which are tried if the primary one fails (default
+     is 10)
+'show-time-remaining'
      Show remaining song time instead of play time (default is 0)
-
-`shuffle-play'
+'shuffle-play'
      Turns on shuffle play mode (default is 0)
-
-`silent-mode'
-     Don't use output plugin (default is 0)
-
-`sort-on-load'
+'skip-hidden-files'
+     Don't add hidden files (default is 0)
+'smart-dir-add'
+     Smart directory adding (default is 0; see *note Smart directory
+     adding::)
+'sort-on-load'
      Sort play list after loading (default is 0)
-
-`sort-on-load-type'
+'sort-on-load-type'
      Type of sort on load ("sort-by-path-and-file", "sort-by-title",
      "sort-by-file-name" or "sort-by-path-and-track")
-
-`title-format'
+'title-format'
      Format of song title (*note Song Info::)
-
-`view-follows-cur-song'
-     If current song escapes view, centrize it automatically (default
-     is 1)
-
-&#x1f;
-File: mpfc.info,  Node: Plugins,  Next: Copying,  Prev: Using Variables,  Up: Top
-
-4 Plugins usage
-***************
-
-Plugins are used to expand MPFC functionality. There are four kinds of
-plugins: input, output, effect and charset. Input plugins are used to
-play files of some kind of format. Output plugins are used to work with
-sound output devices. Effect plugins are used to add effects to
-playing. Charset plugins are used to support various charsets and
-convert between them.
-
-   Plugins are stored commonly in `/usr/lib/mpfc/' or
-`/usr/local/lib/mpfc'.  There are four directories for each of these
-plugins types: `input', `output', `effect' and `charset'. Each plugin
-is a shared library (.so file). To install plugin simply copy it to the
-respective directory.
-
-   Plugins have special configuration lists hierarchy. Root list is
-"plugins".  It has children for each of plugin types ("input",
-"output", "effect", "charset"). Configuration for a speficic plugin is
-stored in list with name same with plugin name and placed in respective
-list (e.g.  "plugins.input.mp3.quick_get_len"). Variable names given
-further in connection with the listed plugins are without
-"plugins.<type>.<name>."  prefix.
-
-   Here these types are described in a greater detail and also some
-standard plugins are considered.
-
-* Menu:
-
-* Input::
-* Output::
-* Effect::
-* Charsets::
-* Plugins manager::
+'view-follows-cur-song'
+     If current song escapes view, centrize it automatically (default is
+     1)
 
 &#x1f;
-File: mpfc.info,  Node: Input,  Next: Output,  Prev: Plugins,  Up: Plugins
+File: mpfc.info,  Node: Audio processing,  Next: Plugins,  Prev: Using Variables,  Up: Top
 
-4.1 Input plugins
-=================
+4 Audio processing
+******************
 
-* Menu:
-
-* Common formats::
-* Audio CD::
+For the entire audio pipeline (file decoding, transformations, output to
+the device) MPFC uses the GStreamer framework.  Specifically, "playbin"
+gstreamer element is used.  From the user perspective this is a
+monolithic part which she can't modify (in future versions MPFC may get
+ability to insert transformations such as equalizer).
 
-&#x1f;
-File: mpfc.info,  Node: Common formats,  Next: Audio CD,  Prev: Input,  Up: Input
+   The only configurable piece is the final output to the sound system.
+In GStreamer different types of outputs are called "sinks".  Examples
+are "alsasink", "osssink" and "pulsesink".  In the easiest case you
+don't have to configure the sink--default one will be used.  If you want
+to change it there are a few configuration variables.
+"gstreamer.audio-sink" sets the name of the sink (e.g.  "alsasink").
+"gstreamer.audio-sink-params" is a configuration list from which you can
+set the sink properties.  The list of properties is sink-specific, but
+most of them have "device" property.  For example, if you want to always
+output sound to ALSA device "hw:1", set these:
 
-4.1.1 Common formats
---------------------
+     gstreamer.audio-sink = alsasink
+     gstreamer.audio-sink-params.device = hw:1
 
-MPFC has four built-in plugins for common formats: MP3, Ogg Vorbis, WAV.
-These plugins have nothing special. The only aspect to note is connected
-with MP3 plugin.
+   There is a handy dialog to set these two variables (invoked with
+'<A>' key).  By default variables in "gstreamer.*" are autosaved on
+exit.
 
-   There are two methods to calculate MP3 song length: quick and
-correct. In most cases quick method works correctly but for some songs
-with variable bitrate their length would be improper. Correct method
-calculates all songs length absolutely correctly but it is rather long.
-It is quick method that is turned on by default. To change this set
-variable "quick-get-len" to "0".  Also there is a note on Ogg Vorbis
-plugin behaviour. By default it always uses UTF-8 as output charset but
-you may override this behaviour by setting "always-use-utf8" variable
-to "0", so it would save tags in your common output charset (*note
-Charsets::).
+   Please refer to the GStreamer documentation for more information on
+available sinks and their properties.
 
 &#x1f;
-File: mpfc.info,  Node: Audio CD,  Prev: Common formats,  Up: Input
-
-4.1.2 Audio CD
---------------
-
-Audio CD plugin supports Audio CDs. Audio-CD uses a special virtual file
-system with files named `track01', ..., `trackNN', where "NN" is total
-number of tracks on the disc. To specify such a file you must put
-plugin prefix ("audiocd://" before the name). You may also use patterns
-(e.g. `audiocd://track04-7') or even put `audiocd://'--this means
-total CD.
-
-   By default CD-ROM device is `/dev/cdrom', but you can change this
-behaviour by setting "device" variable.
-
-   Song info for Audio CD is supported through CDDB. If you want to
-obtain this information you must be connected to the Internet. CDDB
-server is set through "cddb-host" variable. The default value is
-"freedb.freedb.org".  After MPFC gets information it stores it on your
-local machine and further loads it from this machine. Alternatively you
-may specify info by your own and store it. CDDB submission is not
-supported yet. Note that to use info for Audio CD you must have `cddb'
-directory in your `~/.mpfc'.
-
-   Also you can submit info to CDDB. To do it click on the respective
-button in info editor for any of this CD songs. Note that you must have
-two variables set. First is "cddb-email" and it holds your e-mail
-address. Second is "cddb-category" and it holds the category of disc
-you are about to submit.  Possible values are: "blues", "classical",
-"country", "data", "folk", "jazz", "misc", "newage", "reggae", "rock"
-and "soundtrack".
-
-&#x1f;
-File: mpfc.info,  Node: Output,  Next: Effect,  Prev: Input,  Up: Plugins
-
-4.2 Output plugins
-==================
-
-There may be only one active output plugin at the time. This name is set
-using variable "output-plugin" where the plugin name is stored (by
-default "alsa" or "oss", depending on kernel version and configuration
-options).
-
-   Here is description for standard MPFC plugins.
-
-* Menu:
-
-* ALSA and OSS::
-* Disk Writer::
+File: mpfc.info,  Node: Plugins,  Next: Remote Control,  Prev: Audio processing,  Up: Top
 
-&#x1f;
-File: mpfc.info,  Node: ALSA and OSS,  Next: Disk Writer,  Prev: Output,  Up: Output
-
-4.2.1 ALSA and OSS
-------------------
-
-ALSA and OSS are standard output plugins that you probably will use.
-ALSA is default for 2.6.* kernels, while OSS is default for former
-versions.  Both of them can play music using different audio devices.
-For OSS default device is "/dev/dsp", for ALSA--"plughw:0,0". You may
-set another devices through "device" variable in the respective
-configuration list.  The value of this variable is a list of devices
-that MPFC should use to interact with audio system (the first device in
-this list is probed, then if it fails the second, and so on). For
-example:
-     plugins.output.oss.device = "/dev/dsp1;/dev/dsp"
-     plugins.output.alsa.device = "plughw:0,1;plughw:0,0"
-
-&#x1f;
-File: mpfc.info,  Node: Disk Writer,  Prev: ALSA and OSS,  Up: Output
-
-4.2.2 Disk Writer
------------------
-
-Disk Writer plugin is used to save the audio output to disk. Each song
-that you play is stored in a WAV file. The name of this file is same
-with the file name of the song you play and path is read from "path"
-variable.
+5 Plugins usage
+***************
 
-   This plugin can also encode this file using some external program
-(by default "oggenc"). This behaviour is controlled by "encode"
-variable. The file being encoded is split into parts of fixed length
-(in time units; by default 10 minutes). Use "fragment-size" to set
-another value (in seconds).  Also you can specify any other encoder
-with variable "encode-command".  This variable should contain a shell
-command containing "%i" and "%o" patterns (they expand into the input
-file name and output file name without extension respectively). For
-example:
-     lame --quiet "%i" "%o.mp3"
+In the old versions (pre 2.0) MPFC had a system of plugins which handled
+all sound processing.  Now that GStreamer is used they are no longer
+needed.  The only type of plugins in use today is playlist plugins for
+parsing various playlist file formats (e.g.  m3u or cue).
 
-&#x1f;
-File: mpfc.info,  Node: Effect,  Next: Charsets,  Prev: Output,  Up: Plugins
+   Plugins are stored commonly in '/usr/lib/mpfc/' or
+'/usr/local/lib/mpfc'.  Playlist plugins are stored in the 'plist'
+subdirectory.  Each plugin is a shared library (.so file).  To install
+plugin simply copy it to the directory.
 
-4.3 Effect plugins
-==================
+   Plugins have special configuration lists hierarchy.  Root list is
+"plugins".  It has children for each of plugin types (only "plist" for
+now).  Configuration for a speficic plugin is stored in list with name
+same with plugin name and placed in respective list (e.g.
+"plugins.plist.cueplist.rank").
 
-To enable effect plugin "plugin" set variable "enable-effect-plugin".
+   'P' key launches the Plugins manager dialog where you can view the
+loaded plugins list along with their descriptions.
 
 &#x1f;
-File: mpfc.info,  Node: Charsets,  Next: Plugins manager,  Prev: Effect,  Up: Plugins
+File: mpfc.info,  Node: Remote Control,  Next: Copying,  Prev: Plugins,  Up: Top
 
-4.4 Charset plugins
-===================
+6 Remote Control
+****************
 
-Charsets are used in song info management. Suppose you have song with
-info written in charset A and your display charset is B. This is where
-charsets management is used. Display charset is set with variable
-"charset-output".  Input charset may be stored with the text in song
-info, so in this case you don't need to specify it. But in many cases
-it is not, that's why you may want to set it. It is done with variable
-"charset-input". Also there is a variable "charset-save-info" that
-controls the charset is written down in.
-
-   And what about charset plugins? They are used to support various
-charsets.  In fact, MPFC internally supports only one charset--UTF-8
-(respective variable value is "utf-8"). So each one-byte charset that
-is used by you should be supported by some plugin. One plugin may
-support many charset (e.g. charsets for some language). Also there are
-special charsets called automatic. They expand to other charsets. These
-charsets are useful when you have songs with different charsets, so MPFC
-will try to guess charset in each case. This certainly makes sense only
-for input charsets.
-
-&#x1f;
-File: mpfc.info,  Node: Plugins manager,  Prev: Charsets,  Up: Plugins
-
-4.5 Plugins manager
-===================
+MPFC implements a server allowing to control the player remotely.  At
+the moment there is one such remote control app for Android.  The server
+starts automatically when MPFC launches and listens on port specified in
+"server-port" configuration variable (default value is 19792).  If the
+port is unavailable several consecutive values are tried (the number is
+specified in "server-port-pool-size" variable, default is 10).
 
-Plugins manager is a useful tool for configuring plugins system. It is
-called with `P' key (by default). Plugins manager allows you to view the
-loaded plugins list along with their descriptions, select output plugin
-(by pressing `<Space>' at the respective item in plugins list box,
-enable/disable effects and do plugin-specific configuration.
+   By default remote will not be allowed to add files to the play list.
+If you want to allow that, set "remote-dir-root" variable to the full
+path of local directory which can be browsed for songs.
 
 &#x1f;
-File: mpfc.info,  Node: Copying,  Prev: Plugins,  Up: Top
+File: mpfc.info,  Node: Copying,  Prev: Remote Control,  Up: Top
 
-5 Copying information
+7 Copying information
 *********************
 
-MPFC is licensed under GNU GPL license. To read it view `COPYING' file
+MPFC is licensed under GNU GPL license.  To read it view 'COPYING' file
 in MPFC distribution.
 
 
 &#x1f;
 Tag Table:
-Node: Top&#x7f;187
-Node: Introduction&#x7f;500
-Node: Getting Started&#x7f;1296
-Node: Launching MPFC&#x7f;1577
-Node: Moving around&#x7f;2689
-Node: Basic cursor movement operations&#x7f;3323
-Node: Search&#x7f;4529
-Node: Marks&#x7f;5419
-Node: Playing files&#x7f;5980
-Node: Play/pause/stop&#x7f;6241
-Node: Play modes&#x7f;7053
-Node: Boundaries&#x7f;7741
-Node: Time back&#x7f;8284
-Node: Volume and balance&#x7f;8640
-Node: Equalizer&#x7f;9035
-Node: Playlist management&#x7f;9917
-Node: Visual mode&#x7f;10187
-Node: Add/remove&#x7f;10800
-Node: File browser&#x7f;11337
-Node: Save&#x7f;13022
-Node: Sort&#x7f;13307
-Node: Move&#x7f;14049
-Node: Undo&#x7f;14560
-Node: Song Info&#x7f;14864
-Node: Window system&#x7f;16880
-Node: Overview&#x7f;17133
-Node: Using dialogs&#x7f;18381
-Node: Styles&#x7f;19090
-Node: basic&#x7f;21745
-Node: player&#x7f;22104
-Node: browser&#x7f;22907
-Node: help&#x7f;23264
-Node: eqwnd&#x7f;23427
-Node: logger_view&#x7f;23648
-Node: dialog&#x7f;24069
-Node: dlgitem&#x7f;24219
-Node: listbox and combo&#x7f;24508
-Node: Key bindings&#x7f;24729
-Node: basic keybinds&#x7f;28370
-Node: player keybinds&#x7f;29012
-Node: browser keybinds&#x7f;32674
-Node: help keybinds&#x7f;34091
-Node: equalizer keybinds&#x7f;34362
-Node: logger_view keybinds&#x7f;35004
-Node: dlgitem keybinds&#x7f;35680
-Node: button keybinds&#x7f;36042
-Node: radio keybinds&#x7f;36249
-Node: checkbox keybinds&#x7f;36651
-Node: editbox keybinds&#x7f;36874
-Node: filebox keybinds&#x7f;37990
-Node: combo keybinds&#x7f;38207
-Node: listbox keybinds&#x7f;38726
-Node: Other window system features&#x7f;39394
-Node: Other features&#x7f;40383
-Node: Command execution&#x7f;40589
-Node: Log&#x7f;40922
-Node: History&#x7f;41544
-Node: Setting mouse parameters&#x7f;41887
-Node: Using Variables&#x7f;42406
-Node: Setting variables&#x7f;43322
-Node: List of options&#x7f;46618
-Node: Plugins&#x7f;48190
-Node: Input&#x7f;49575
-Node: Common formats&#x7f;49732
-Node: Audio CD&#x7f;50661
-Node: Output&#x7f;52180
-Node: ALSA and OSS&#x7f;52612
-Node: Disk Writer&#x7f;53408
-Node: Effect&#x7f;54325
-Node: Charsets&#x7f;54515
-Node: Plugins manager&#x7f;55753
-Node: Copying&#x7f;56213
+Node: Top&#x7f;190
+Node: Introduction&#x7f;541
+Node: Getting Started&#x7f;1388
+Node: Launching MPFC&#x7f;1669
+Node: Moving around&#x7f;2414
+Node: Basic cursor movement operations&#x7f;3053
+Node: Search&#x7f;4270
+Node: Marks&#x7f;5164
+Node: Playing files&#x7f;5729
+Node: Play/pause/stop&#x7f;5968
+Node: Playback order&#x7f;6785
+Node: Boundaries&#x7f;7652
+Node: Time back&#x7f;8202
+Node: Volume&#x7f;8548
+Node: Playlist management&#x7f;8890
+Node: Visual mode&#x7f;9160
+Node: Add/remove&#x7f;9776
+Node: Regular files and directories&#x7f;10452
+Node: URIs&#x7f;11196
+Node: Playlists&#x7f;11443
+Node: Smart directory adding&#x7f;11771
+Node: File browser&#x7f;12680
+Node: Save&#x7f;14375
+Node: Sort&#x7f;14661
+Node: Move&#x7f;15407
+Node: Undo&#x7f;15922
+Node: Song Info&#x7f;16230
+Node: Window system&#x7f;18034
+Node: Overview&#x7f;18287
+Node: Using dialogs&#x7f;19826
+Node: Styles&#x7f;20535
+Node: basic&#x7f;23196
+Node: player&#x7f;23549
+Node: browser&#x7f;24333
+Node: help&#x7f;24679
+Node: logger_view&#x7f;24845
+Node: dialog&#x7f;25256
+Node: dlgitem&#x7f;25404
+Node: listbox and combo&#x7f;25691
+Node: Key bindings&#x7f;25911
+Node: basic keybinds&#x7f;29551
+Node: player keybinds&#x7f;30187
+Node: browser keybinds&#x7f;33689
+Node: help keybinds&#x7f;35089
+Node: logger_view keybinds&#x7f;35361
+Node: dlgitem keybinds&#x7f;36026
+Node: button keybinds&#x7f;36386
+Node: radio keybinds&#x7f;36593
+Node: checkbox keybinds&#x7f;36993
+Node: editbox keybinds&#x7f;37216
+Node: filebox keybinds&#x7f;38321
+Node: combo keybinds&#x7f;38538
+Node: listbox keybinds&#x7f;39053
+Node: Other window system features&#x7f;39715
+Node: Other features&#x7f;40138
+Node: Command execution&#x7f;40344
+Node: Log&#x7f;40679
+Node: History&#x7f;41306
+Node: Setting mouse parameters&#x7f;41650
+Node: Using Variables&#x7f;42171
+Node: Setting variables&#x7f;43104
+Node: List of options&#x7f;46511
+Node: Audio processing&#x7f;48367
+Node: Plugins&#x7f;49845
+Node: Remote Control&#x7f;50900
+Node: Copying&#x7f;51641
 &#x1f;
 End Tag Table

mpfc-1.3.8.1.tar.bz2/doc/mpfc.texi -> mpfc-2.0.tar.bz2/doc/mpfc.texi Changed

@@ -1,13 +1,13 @@
 \input texinfo @c -*-texinfo-*-
 @c %**start of header
 @setfilename mpfc.info
-@settitle MPFC 1.3.6
+@settitle MPFC 2.0
 @c %**end of header
 
 @copying
-This manual describes the SG Music Player For Linux Console, version 1.3.6
+This manual describes the SG Music Player For Linux Console, version 2.0
 
-Copyright @copyright{} 2003-2005 SG Software.
+Copyright @copyright{} 2003-2014 by Sergey Galanov.
 @end copying
 
 @titlepage
@@ -27,17 +27,19 @@
 
 @ifinfo
 @node Top, Introduction, (dir), (dir)
-@top MPFC 1.3.6
+@top MPFC 2.0
 
-This manual documents version 1.3.6 of SG MPFC, media player for Linux console.
+This manual documents version 2.0 of SG MPFC, media player for Linux console.
 
-Copyright @copyright{} 2003-2005 SG Software
+Copyright @copyright{} 2003-2014 SG Software
 
 @menu
 * Introduction::		
 * Getting Started::	
 * Using Variables::
-* Plugins::		
+* Audio processing::
+* Plugins::
+* Remote Control::
 * Copying::	
 @end menu
 @end ifinfo
@@ -45,12 +47,17 @@
 @node Introduction, Getting Started, Top, Top
 @chapter Introduction to MPFC
 
-MPFC is an abbrevation for Music Player For Console. It is a full-featured
-curses-based playlist-oriented player.
+MPFC is an abbrevation for Music Player For Console. It is a gstreamer-based audio player with curses interface featuring:
 
-MPFC supports a number of input file formats. This support is organised through
-input plugins model. It means that the formats list is expandable---you
-must simply add a new plugin. Also there are plugins for output and effects.
+@itemize
+@item Support for all popular formats and output systems (by virtue of gstreamer);
+@item Standard playlist paradigm;
+@item Windowed text user interface;
+@item Full cuesheet support;
+@item Integrated tags editor;
+@item Remote control for Android;
+@item High configurability.
+@end itemize
 
 To get a brief help on MPFC commands you may press @kbd{?} key in MPFC 
 main window.
@@ -82,30 +89,19 @@
 
 Here options
 is a list of variables you set directly (@pxref{Using Variables}) and files
-is a list of files you want to play. For example, to play file song.mp3 type:
+is a list of files you want to play. For example, to play file song.mp3 and all
+files found recursively under directory artist_dir type:
 
 @example
-mpfc file.mp3
+mpfc file.mp3 artist_dir
 @end example
 
+For more info on how file adding behaves see @pxref{Add/remove}.
+
 File list may be empty, this means
 you will either continue playing the previous play list (if the respective
 option is set), or start with an empty play list.
 
-You may also specify a plugin that will be used for playing file. This notation
-with special plugins that play virtual files (e.g audiocd plugin) and also
-if file has non-standard extesion. For example:
-
-@example
-mpfc audiocd://track0* mp3://some-file-with-no-mp3-extension audiocd://
-@end example
-
-First pattern in this list specifies all the Audio-CD tracks from 1 to 9,
-second is simply a hint for MPFC to use mp3 plugin, and the last means to
-add total Audio-CD.
-
-Note that ``objects'' system is no longer used.
-
 If you want to exit MPFC use command @kbd{q}.
 
 @node Moving around, Playing files, Launching MPFC, Getting Started
@@ -147,7 +143,7 @@
 To specify this value simply print it before the
 command. As soon as you start entering digits, a prompt will appear and you
 will be able to correct your input or even cancel entering this value by 
-pressing ESC. For example, to move 5 lines down type: @kbd{5j}, and to 
+pressing @kbd{@key{CTRL}-g}. For example, to move 5 lines down type: @kbd{5j}, and to 
 move to the 30-th line of playlist type: @kbd{30G}.
 
 @node Search, Marks, Basic cursor movement operations, Moving around
@@ -184,14 +180,13 @@
 @section Playing files
 @menu
 * Play/pause/stop::
-* Play modes::
+* Playback order::
 * Boundaries::
 * Time back::
-* Volume and balance::
-* Equalizer::
+* Volume::
 @end menu
 
-@node Play/pause/stop, Play modes, Playing files, Playing files
+@node Play/pause/stop, Playback order, Playing files, Playing files
 @subsection Play/pause/stop
 There are four basic playing commands:
 
@@ -213,20 +208,21 @@
 specified position (these commands support repeat values, for @kbd{gt} its
 meaning is the same as for @kbd{G}, @pxref{Basic cursor movement operations}).
 
-@node Play modes, Boundaries, Play/pause/stop, Playing files
-@subsection Play modes
+@node Playback order, Boundaries, Play/pause/stop, Playing files
+@subsection Playback order
 Normally after the song you specified to play finishes MPFC begins to play 
-the next song in playlist and so on until it reaches the playlist end when it
-stops. 
+the next song in playlist and so on until it reaches the playlist end and then it
+stops. The next song is normally the one right after the current one in the playlist
+but you may queue songs to be played next using the @kbd{'} (single quote) command.
 
-This behaviour may be changed by setting any of two play modes: shuffle or 
+Order may also be altered by setting one of the two play modes: shuffle and 
 loop. In shuffle mode (@kbd{R} command) the next song to play is selected by
 random. In loop mode (@kbd{L} command) the play order is as in the normal mode
 but MPFC begins playing from the beginning when it reaches end. Also you may
 set these modes by variables ``shuffle-play'' and ``loop-play'' 
 (@pxref{Using Variables}).
- 
-@node Boundaries, Time back, Play modes, Playing files
+
+@node Boundaries, Time back, Playback order, Playing files
 @subsection Boundaries
 Normally the beginning of playlist is the first song and the end is the last 
 one. But you can change them by setting boundaries. First select a playlist
@@ -238,37 +234,19 @@
 
 To clear boundaries use command @kbd{pc}.
 
-@node Time back, Volume and balance, Boundaries, Playing files
+@node Time back, Volume, Boundaries, Playing files
 @subsection Time back
 Time back is a feature in MPFC that helps you to return to the place in song
 where you have been the last time before jump (not that here manual jump is
 meant, e.g. with a @kbd{@key{RET}} command). To do it use command 
 @kbd{@key{BS}}.
 
-@node Volume and balance, Equalizer, Time back, Playing files
-@subsection Volume and balance
-You can see current volume and balance in the top right corner of the screen
-as two slidebars (the upper is volume). To increase or decrease volume and 
-balance levels use @kbd{-} and @kbd{+} commands for volume and @kbd{} and 
-@kbd{} commands for balance.
-
-@node Equalizer,, Volume and balance, Playing files
-@subsection Equalizer
-MPFC supports equalizer. To launch equalizer panel use command @kbd{e}. Here
-you are able to adjust equalizer band levels. To exit panel press @kbd{q} or
-@kbd{@key{ESC}}. To move between bands press @kbd{h} or @kbd{@key{Left}} and 
-@kbd{l} or @kbd{@key{Right}}, to change level press @kbd{j} or @kbd{@key{Down}}
-and @kbd{k} or @kbd{@key{Up}}.
-
-You are able also to load preset from a Winamp EQF file. To do this press
-@kbd{@key{p}} and enter file name.
-
-Equalizer's parameters are configurable. They are represented by variables
-in configuration list ``equalizer''.  ``enabled'' variable controls whether
-equalizer is enabled. ``band1'', @dots{}, ``band10'' and ``preamp'' hold
-band values. Also there is ``enable-on-change'' (default is 1). If it is set,
-equalizer is automatically enabled when you change any band value in the
-equalizer window.
+@node Volume,, Time back, Playing files
+@subsection Volume
+You can see current volume slidebar in the top right corner of the screen.
+To increase or decrease volume use @kbd{-} and @kbd{+}. Volume modification
+is done in cubic steps, so for example setting volume to 50% makes sound
+output 8 times quieter.
 
 @node Playlist management, Window system, Playing files, Getting Started
 @section Playlist management
@@ -294,15 +272,65 @@
 
 @node Add/remove, File browser, Visual mode, Playlist management
 @subsection Add/remove
-There are three commands for add/remove purposes. To add song use @kbd{a}.
-After you enter 
-this command the edit box will appear where you are able to enter file name.
-Name autocompletion is supported (by @kbd{@key{TAB}} key). 
-Note that MPFC allows you to play streaming audio. To do it place ``http://''
-in the beginning of file name.
+Besides adding songs from command line you can do it after MPFC has launched
+using the 'Add song' dialog. To display it press @kbd{a}. Name autocompletion
+(using @kbd{@key{TAB}} key) is supported. Name may also feature standard shell
+wildcards (thus multiple files may be added from a single dialog).
+The subsections below describe various types of objects which can be added.
 
 Remove command (@kbd{r}) removes the currently selected group of files.
 
+@menu
+* Regular files and directories::
+* URIs::
+* Playlists::
+* Smart directory adding::
+@end menu
+
+@node Regular files and directories, URIs, Add/remove, Add/remove
+@subsection Regular files and directories
+The simplest song to add is a regular file. MPFC supports files of all formats
+supported by your GStreamer installation provided they have appropriate
+extensions. The list of extensions recognized by MPFC is displayed in the log (@pxref{Log}).
+You can add support for additional formats by installing plugins to GStreamer.
+This is out of MPFC's scope.
+
+If you add a directory, all regular files, playlists and subdirectories found within it
+will be added. You can skip hidden files (with names starting with a dot) by setting
+``skip-hidden-files'' variable.
+
+@node URIs, Playlists, Regular files and directories, Add/remove
+@subsection URIs
+You can add songs identified by GStreamer URIs (i.e. with a prefix), for example:
+``http://somewhere'', or ``cdda://1''.
+
+@node Playlists, Smart directory adding, URIs, Add/remove
+@subsection Playlists
+MPFC supports several popular play list formats, namely m3u, pls and cue.
+There is also a handy virtual play list type for adding all tracks of
+an Audio CD: to do that just add ``audiocd://'' URI.
+
+@node Smart directory adding,, Playlists, Add/remove
+@subsection Smart directory adding
+Often a directory would contain duplicate items: regular files (or a single
+CD image) and playlist (or even multiple playlists, e.g. cue and m3u).
+To prevent adding duplicates, MPFC has a smart mode, activated by setting
+``smart-dir-add'' variable (by default it is disabled).
+
+In this mode, if a
+playlist is found inside a directory, nothing else would be added. If 
+there are multiple playlists, the one with the biggest rank is added
+(or the first encountered if ranks are equal). Ranks are determined on
+a per-type basis. By default all ranks are zero, but you can increase
+the rank of you favorite playlist type, for example:
+
+@example
+# In ~/.mpfc/mpfcrc
+plugins.plist.cueplist.rank = 1
+@end example
+
+Here ``cueplist'' is the name of playlist plugin for cue files.
+
 @node File browser, Save, Add/remove, Playlist management
 @subsection File browser
 File browser is a special tool created to help you adding files to the play
@@ -327,10 +355,10 @@
 and song info modes press @kbd{i}.
 
 You can navigate in a directory more easily using search mode. To set it
-press @kbd{s} key and the enter name of file (or its title if you are in
+press @kbd{s} key and enter name of file (or its title if you are in
 info mode) you want to jump to. As you will type the name cursor will move
 to the respective file. If you want to stop this process press 
-@kbd{@key{ESCAPE}}.
+@kbd{@key{CTRL}-G}.
 
 To exit browser press @kbd{q}.
 
@@ -384,13 +412,13 @@
 ID3 tag). 
 
 You can view and edit this information using song info editor dialog. To 
-call it place cursor to the respective song and use @kbd{i} command. 
+call it place cursor to the song and use @kbd{i} command. 
 You can also edit info for multiple songs. To do it select these songs in
 visual mode and answer ``No'' to the appearing question. The dialog
 will appear (if the format allows you). Then you will be able to change its
 contents by setting focus to the respective edit box (press @kbd{@key{TAB}}
 several times to reach it). If you want to save changes press @kbd{@key{RET}},
-otherwise press @kbd{@key{ESC}}. If some of the selected songs have different
+otherwise press @kbd{@key{CTRL}-G}. If some of the selected songs have different
 values for an info field it will remain the same unless you change it. If you
 change any field its value will be saved to each of the selected songs.
 
@@ -421,11 +449,7 @@
 The default value is ``%p - %t'' that means that title contains artist and 
 song names divided by dash sign.
 
-Some plugins may have special functions associated with their respective
-songs (e.g. function of removing tags for mp3 plugin). This function is called
-by clicking respective button in the song info dialog.
-
-Also there is a command that reloads all selected playlist songs 
+There is a command that reloads all selected playlist songs 
 information---@kbd{I}.
 
 @node Window system, Other features, Playlist management, Getting Started
@@ -440,7 +464,13 @@
 
 @node Overview, Using dialogs, Window system, Window system
 @subsection Overview
-MPFC has an advanced window system. When you start MPFC there always appears
+MPFC has an advanced window system. Please note that MPFC does not support
+non-UTF8 locales. If you have such a locale, non-ASCII characaters (including
+pseudo-graphics) will be displayed incorrectly. Also please note that
+most window system key bindings use @key{ALT} key which may conflict with
+your window manager.
+
+When you start MPFC there always appears
 play list window. As a result of some events there can appear other windows
 (e.g. file browser, help screen or various dialogs). 
 
@@ -469,11 +499,11 @@
 First of all, you can use @kbd{@key{TAB}} key to move to the next item.
 But in big dialogs it is better to use special shortcuts to items. Many of
 the items have a letter associated with them. This letter is usually marked
-red on the label. So when you press @kbd{@key{ALT}} with this letter you
+red on the label. When you press @kbd{@key{ALT}} with this letter you
 jump to it.
 
 Also there are @kbd{@key{ENTER}} key connected with the ``OK'' button and
-@kbd{@key{ESCAPE}} or @kbd{@key{CTRL}-G} connected with the ``Cancel'' button.
+@kbd{@key{CTRL}-G} or @kbd{@key{ESCAPE}} connected with the ``Cancel'' button.
 
 @node Styles, Key bindings, Using dialogs, Window system
 @subsection Styles
@@ -525,7 +555,6 @@
 * player::
 * browser::
 * help::
-* eqwnd::
 * logger_view::
 * dialog::
 * dlgitem::
@@ -561,7 +590,7 @@
 @item time-style: current time style;
 @item audio-params-style: audio parameters style;
 @item about-style: about string style;
-@item slider-style: sliders style (for time, volume and balance);
+@item slider-style: sliders style (for time and volume);
 @item play-modes-style: ``Loop'' and ``Shuffle'' strings style;
 @item status-style: status line style.
 @end itemize
@@ -582,7 +611,7 @@
 @item header-style.
 @end itemize
 
-@node help, eqwnd, browser, Styles
+@node help, logger_view, browser, Styles
 ``help'' class is class of help screen. Styles:
 
 @itemize
@@ -590,17 +619,7 @@
 @item prompt-style.
 @end itemize
 
-@node eqwnd, logger_view, help, Styles
-``eqwnd'' class is class of equalizer window. Styles:
-
-@itemize
-@item band-style;
-@item focus-band-style;
-@item label-style;
-@item focus-label-style.
-@end itemize
-
-@node logger_view, dialog, eqwnd, Styles
+@node logger_view, dialog, help, Styles
 ``logger_view'' is child of ``scrollable'' class. Styles of ``scrollable'':
 
 @itemize
@@ -710,7 +729,6 @@
 * player keybinds::
 * browser keybinds::
 * help keybinds::
-* equalizer keybinds::
 * logger_view keybinds::
 * dlgitem keybinds::
 * button keybinds::
@@ -763,8 +781,6 @@
 @item time_move: seek to any position in the song (default is ``gt'');
 @item vol_fw: increase volume (default is ``+;lv'');
 @item vol_bw: decrease volume (default is ``-;hv'');
-@item bal_fw: increase balance (default is ``;lb'');
-@item bal_bw: decrease balance (default is ``;hb'');
 @item info: launch song info dialog (default is ``i'');
 @item add: launch song adding dialog (default is ``a'');
 @item rem: remove song (default is ``r'');
@@ -778,7 +794,6 @@
 @item next_match: move to the next search match (default is ``n'');
 @item prev_match: move to the previous search match (default is ``N'');
 @item help: launch help screen (default is ``?'');
-@item equalizer: launch equalizer window (default is ``e'');
 @item shuffle: toggle shuffle mode (default is ``R'');
 @item var_manager: launch variable manager (default is ``o'');
 @item plist_down: shift play list item down (default is ``J'');
@@ -796,6 +811,7 @@
 @item time_back: return to the last song position (default is ``<Backspace>'');
 @item queue: queue the song under cursor (default is ``'@w{}'');
 @item file_browser: launch file browser (default is ``B'');
+@item audio_setup: audio output setup (default is ``A'');
 @item log: open logger window (default is ``O'');
 @item marka, @dots{}, markz: remember cursor position (defaults are ``ma'',
 @dots{}, ``mz'');
@@ -829,27 +845,14 @@
 @item help: launch help screen (default is ``?'').
 @end itemize
 
-@node help keybinds, equalizer keybinds, browser keybinds, Key bindings
+@node help keybinds, logger_view keybinds, browser keybinds, Key bindings
 @subsection help keybinds
 @itemize
 @item quit: close window (default is ``q;<Escape>'');
 @item next_page: show next page (default is ``<Enter>;<Space>'').
 @end itemize
 
-@node equalizer keybinds, logger_view keybinds, help keybinds, Key bindings
-@subsection equalizer keybinds
-@itemize
-@item quit: close window (default is ``q;<Escape>'');
-@item move_left: highlight band to the left (default is ``h;<Left>;<Ctrl-b>'');
-@item move_right: highlight band to the right (default is 
-``l;<Right>;<Ctrl-f>'');
-@item increase: increase band value (default is ``k;<Up>;<Ctrl-p>'');
-@item decrease: decrease band value (default is ``j;<Down>;<Ctrl-n>'');
-@item load_eqf: launch loading EQF file dialog (default is ``p'');
-@item help: launch help screen (default is ``?'').
-@end itemize
-
-@node logger_view keybinds, dlgitem keybinds, equalizer keybinds, Key bindings
+@node logger_view keybinds, dlgitem keybinds, help keybinds, Key bindings
 @subsection logger_view keybinds
 @itemize
 @item quit: close window (default is ``q;<Escape>'');
@@ -949,23 +952,6 @@
 @end itemize
 
 @node Other window system features,, Key bindings, Window system
-@subsection Terminfo hints
-MPFC uses terminfo(5) for translating escape sequences into real keys.
-Unfortunately, terminfo table does not always contain all of needed 
-capabilities. For example, values for @key{Ctrl-Left} and @key{Ctrl-Right}
-are often missed.
-
-To use these keys you may specify a value for this capability in 
-variable ``windows.ti.<cap_name>''. The full list of capabilities may be
-found in manpage for terminfo(5).
-
-For example, to set values for @key{Ctrl-Left} and @key{Ctrl-Right}:
-
-@example
-windows.ti.%i = "\e5C"
-windows.ti.#4 = "\e5D"
-@end example
-
 @subsection Using terminal background
 Sometimes you want to use background color of your terminal instead of
 default MPFC background (black). To do this set ``force-terminal-bg''
@@ -1014,7 +1000,7 @@
 values: ``none'' (no mouse is used), ``gpm'' (use gpm---this is normally
 used when you run MPFC on console) and ``xterm'' (on xterm-like terminal).
 
-@node Using Variables, Plugins, Getting Started, Top
+@node Using Variables, Audio processing, Getting Started, Top
 @chapter Variables usage
 
 MPFC supports variables that allow you to control some of its options. 
@@ -1053,7 +1039,8 @@
 you place the value inside double quotes, so that there is no such restriction.
 Also in that form you may use special characters: ``\n'' (new line), 
 ``\t'' (tabulation), ``\e'' (escape), ``\"'' (double quote itself), 
-``\\'' (backslash).
+``\\'' (backslash) as well as octal (``\NNN'') and hexadecimal (``\xNN'') codes
+for a character.
 
 Operation type points to what will be done with the value. Assignment (``='')
 simply assigns variable this value. Addition (``+='') replaces current 
@@ -1077,7 +1064,7 @@
 @verbatim
 # MPFC configuration file
 lib-dir=/usr/local/lib/mpfc
-output-plugin=oss
+gstreamer.audio-sink = alsasink
 play-from-stop
 
 include(some_file)
@@ -1111,7 +1098,7 @@
 Here is an example:
 
 @example
-mpfc --lib-dir=/usr/local/lib/mpfc --output-plugin=oss --play-from-stop 
+mpfc --lib-dir=/usr/local/lib/mpfc --gstreamer.audio-sink=alsasink --play-from-stop 
 -f some_file list.m3u
 @end example
 
@@ -1128,9 +1115,7 @@
 
 @table @option
 @item autosave-plugins-params
-Automatically save plugins parameters (default is 1)
-@item charset-input
-Charset to use as input when reading songs information (@pxref{Charsets})
+Automatically save plugins parameters (plugins.* and gstreamer.*) (default is 1)
 @item convert-underscores2spaces
 Convert underscores to spaces in songs titles (default is 0)
 @item log-file
@@ -1141,16 +1126,24 @@
 Turns on loop play mode (default is 0)
 @item play-from-stop
 At the beginning play from the point you stopped last time (default is 1)
+@item remote-dir-root
+Root directory for file browsing in the remote control (unset by default)
 @item save-playlist-on-exit
-Save play list to @file{~/.mpfc/list.m3u} on exit (default is 1)
+Save play list on exit (default is 1)
 @item search-nocase
 Make play list search case-insensitive (default is 1)
+@item server-port 
+Port number the server listens on (default is 19792)
+@item server-port-pool-size
+Number of ports which are tried if the primary one fails (default is 10)
 @item show-time-remaining
 Show remaining song time instead of play time (default is 0)
 @item shuffle-play
 Turns on shuffle play mode (default is 0)
-@item silent-mode
-Don't use output plugin (default is 0)
+@item skip-hidden-files
+Don't add hidden files (default is 0)
+@item smart-dir-add
+Smart directory adding (default is 0; see @pxref{Smart directory adding})
 @item sort-on-load
 Sort play list after loading (default is 0)
 @item sort-on-load-type
@@ -1162,173 +1155,72 @@
 If current song escapes view, centrize it automatically (default is 1)
 @end table
 
-@node Plugins, Copying, Using Variables, Top
+@node Audio processing, Plugins, Using Variables, Top
+@chapter Audio processing
+
+For the entire audio pipeline (file decoding, transformations, output to the device)
+MPFC uses the GStreamer framework. Specifically, ``playbin'' gstreamer element is used.
+From the user perspective this is a monolithic part which she can't modify (in
+future versions MPFC may get ability to insert transformations such as equalizer).
+
+The only configurable piece is the final output to the sound system. In GStreamer
+different types of outputs are called ``sinks''. Examples are ``alsasink'', ``osssink''
+and ``pulsesink''. In the easiest case you don't have to configure the sink---default one
+will be used. If you want to change it there are a few configuration variables.
+``gstreamer.audio-sink'' sets the name of the sink (e.g. ``alsasink'').
+``gstreamer.audio-sink-params'' is a configuration list from which you can
+set the sink properties. The list of properties is sink-specific, but most of them
+have ``device'' property. For example, if you want to always output sound to 
+ALSA device ``hw:1'', set these:
+
+@example
+gstreamer.audio-sink = alsasink
+gstreamer.audio-sink-params.device = hw:1
+@end example
+
+There is a handy dialog to set these two variables (invoked with @kbd{@key{A}} key).
+By default variables in ``gstreamer.*'' are autosaved on exit.
+
+Please refer to the GStreamer documentation for more information on available
+sinks and their properties.
+
+@node Plugins, Remote Control, Audio processing, Top
 @chapter Plugins usage
 
-Plugins are used to expand MPFC functionality. There are four kinds of
-plugins: input, output, effect and charset. Input plugins are used to play 
-files of some kind of format. Output plugins are used to work with sound 
-output devices. Effect plugins are used to add effects to playing. Charset
-plugins are used to support various charsets and convert between them.
+In the old versions (pre 2.0) MPFC had a system of plugins which handled
+all sound processing. Now that GStreamer is used they are no longer needed.
+The only type of plugins in use today is playlist plugins for parsing
+various playlist file formats (e.g. m3u or cue).
 
 Plugins are stored commonly in @file{/usr/lib/mpfc/} or 
 @file{/usr/local/lib/mpfc}.
-There are four directories for each of these plugins types: @file{input},
-@file{output}, @file{effect} and @file{charset}. Each plugin is a shared 
-library (.so file). To install plugin simply copy it to the respective 
-directory.
+Playlist plugins are stored in the @file{plist} subdirectory.
+Each plugin is a shared 
+library (.so file). To install plugin simply copy it to the directory.
 
 Plugins have special configuration lists hierarchy. Root list is ``plugins''.
-It has children for each of plugin types (``input'', ``output'', ``effect'',
-``charset''). Configuration for a speficic plugin is stored in list with 
+It has children for each of plugin types (only ``plist'' for now).
+Configuration for a speficic plugin is stored in list with 
 name same with plugin name and placed in respective list (e.g. 
-``plugins.input.mp3.quick_get_len''). Variable names given further in
-connection with the listed plugins are without ``plugins.<type>.<name>.''
-prefix.
+``plugins.plist.cueplist.rank'').
 
-Here these types are described in a greater detail and also some standard
-plugins are considered.
+@kbd{P} key launches the Plugins manager dialog where you can view the 
+loaded plugins list along with their descriptions.
 
-@menu
-* Input::
-* Output::
-* Effect::
-* Charsets::
-* Plugins manager::
-@end menu
-
-@node Input, Output, Plugins, Plugins
-@section Input plugins
-@menu
-* Common formats::
-* Audio CD::
-@end menu
-
-@node Common formats, Audio CD, Input, Input
-@subsection Common formats
-MPFC has four built-in plugins for common formats: MP3, Ogg Vorbis, WAV.
-These plugins have nothing special. The only aspect to note is connected 
-with MP3 plugin. 
-
-There are two methods to calculate MP3 song length: quick 
-and correct. In most cases quick method works correctly but for some songs with
-variable bitrate their length would be improper. Correct method calculates
-all songs length absolutely correctly but it is rather long. It is quick
-method that is turned on by default. To change this set variable
-``quick-get-len'' to ``0''.
-Also there is a note on Ogg Vorbis plugin behaviour. By default it always
-uses UTF-8 as output charset but you may override this behaviour by setting
-``always-use-utf8'' variable to ``0'', so it would save tags in your
-common output charset (@pxref{Charsets}).
-
-@node Audio CD,, Common formats, Input
-@subsection Audio CD
-Audio CD plugin supports Audio CDs. Audio-CD uses a special virtual file
-system with files named @file{track01}, ..., @file{trackNN}, where ``NN'' is
-total number of tracks on the disc. To specify such a file you must put 
-plugin prefix (``audiocd://'' before the name). You may also use patterns
-(e.g. @file{audiocd://track04-7}) or even put @file{audiocd://}---this
-means total CD.
-
-By default CD-ROM device is @file{/dev/cdrom}, but you can change this
-behaviour by setting ``device'' variable.
-
-Song info for Audio CD is supported through CDDB. If you want to obtain
-this information you must be connected to the Internet. CDDB server is set
-through ``cddb-host'' variable. The default value is ``freedb.freedb.org''.
-After MPFC gets 
-information it stores it on your local machine and further loads it from this
-machine. Alternatively you may specify info by your own and store it. CDDB
-submission is not supported yet. Note that to use info for Audio CD you must
-have @file{cddb} directory in your @file{~/.mpfc}.
-
-Also you can submit info to CDDB. To do it click on the respective button
-in info editor for any of this CD songs. Note that you must have two variables
-set. First is ``cddb-email'' and it holds your e-mail address. Second is
-``cddb-category'' and it holds the category of disc you are about to submit.
-Possible values are: ``blues'', ``classical'', ``country'', ``data'', ``folk'',
-``jazz'', ``misc'', ``newage'', ``reggae'', ``rock'' and ``soundtrack''.
-
-@node Output, Effect, Input, Plugins
-@section Output plugins
-There may be only one active output plugin at the time. This name is set
-using variable ``output-plugin'' where the plugin name is stored (by default
-``alsa'' or ``oss'', depending on kernel version and configuration options).
-
-Here is description for standard MPFC plugins.
-
-@menu
-* ALSA and OSS::
-* Disk Writer::
-@end menu
+@node Remote Control, Copying, Plugins, Top
+@chapter Remote Control
+MPFC implements a server allowing to control the player remotely. At the moment
+there is one such remote control app for Android. The server starts automatically
+when MPFC launches and listens on port specified in ``server-port'' configuration
+variable (default value is 19792). If the port is unavailable several consecutive
+values are tried (the number is specified in ``server-port-pool-size'' variable, default
+is 10).
 
-@node ALSA and OSS, Disk Writer, Output, Output
-@subsection ALSA and OSS
-ALSA and OSS are standard output plugins that you probably will use.
-ALSA is default for 2.6.* kernels, while OSS is default for former versions.
-Both of them can play music using different audio devices. For OSS default
-device is ``/dev/dsp'', for ALSA---``plughw:0,0''. You may set another
-devices through ``device'' variable in the respective configuration list.
-The value of this variable is a list of devices that MPFC should use to
-interact with audio system (the first device in this list is probed, then if it
-fails the second, and so on). For example:
-@example
-plugins.output.oss.device = "/dev/dsp1;/dev/dsp"
-plugins.output.alsa.device = "plughw:0,1;plughw:0,0"
-@end example
-
-@node Disk Writer,, ALSA and OSS, Output
-@subsection Disk Writer
-Disk Writer plugin is used to save the audio output to disk. Each song that 
-you play is stored in a WAV file. The name of this file is same with the file
-name of the song you play and path is read from ``path'' variable.
-
-This plugin can also encode this file using some external program (by default
-``oggenc''). This behaviour is controlled by ``encode'' variable. The file
-being encoded is split into parts of fixed length (in time units; by default
-10 minutes). Use ``fragment-size'' to set another value (in seconds).
-Also you can specify any other encoder with variable ``encode-command''.
-This variable should contain a shell command containing ``%i'' and ``%o''
-patterns (they expand into the input file name and output file name without
-extension respectively). For example:
-@example
-lame --quiet "%i" "%o.mp3"
-@end example
+By default remote will not be allowed to add files to the play list. If you want
+to allow that, set ``remote-dir-root'' variable to the full path of local directory
+which can be browsed for songs.
 
-@node Effect, Charsets, Output, Plugins
-@section Effect plugins
-To enable effect plugin ``plugin'' set variable ``enable-effect-plugin''.
-
-@node Charsets, Plugins manager, Effect, Plugins
-@section Charset plugins
-Charsets are used in song info management. Suppose you have song with info
-written in charset A and your display charset is B. This is where charsets
-management is used. Display charset is set with variable ``charset-output''.
-Input charset may be stored with the text in song info, so in this case you
-don't need to specify it. But in many cases it is not, that's why you may
-want to set it. It is done with variable ``charset-input''. Also there is
-a variable ``charset-save-info'' that controls the charset is written down in.
-
-And what about charset plugins? They are used to support various charsets.
-In fact, MPFC internally supports only one charset---UTF-8 (respective 
-variable value is ``utf-8''). So each one-byte
-charset that is used by you should be supported by some plugin. One plugin
-may support many charset (e.g. charsets for some language). Also there are
-special charsets called automatic. They expand to other charsets. These 
-charsets are useful when you have songs with different charsets, so MPFC
-will try to guess charset in each case. This certainly makes sense only for
-input charsets.
-
-@node Plugins manager,, Charsets, Plugins
-@section Plugins manager
-Plugins manager is a useful tool for configuring plugins system. It is called
-with @kbd{P} key (by default). Plugins manager allows you to view the 
-loaded plugins list along with their descriptions, 
-select output plugin (by pressing @kbd{@key{Space}} at the respective item
-in plugins list box, enable/disable effects and do plugin-specific 
-configuration.
-
-@node Copying,, Plugins, Top
+@node Copying,, Remote Control, Top
 @chapter Copying information
 MPFC is licensed under GNU GPL license. To read it view @file{COPYING} file in
 MPFC distribution.

mpfc-1.3.8.1.tar.bz2/doc/texinfo.tex -> mpfc-2.0.tar.bz2/doc/texinfo.tex Changed

@@ -3,11 +3,11 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2009-08-14.15}
+\def\texinfoversion{2013-02-01.11}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009 Free Software Foundation, Inc.
+% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
@@ -24,13 +24,14 @@
 %
 % As a special exception, when this file is read by TeX when processing
 % a Texinfo source document, you may use the result without
-% restriction.  (This has been our intent since Texinfo was invented.)
+% restriction. This Exception is an additional permission under section 7
+% of the GNU General Public License, version 3 ("GPLv3").
 %
 % Please try the latest version of texinfo.tex before submitting bug
 % reports; you can get the latest version from:
-%   http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
-%   ftp://tug.org/tex/texinfo.tex
-%     (and all CTAN mirrors, see http://www.ctan.org).
+%   http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
+%   http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
+%   http://www.gnu.org/software/texinfo/ (the Texinfo home page)
 % The texinfo.tex in any given distribution could well be out
 % of date, so if that's what you're using, please check.
 %
@@ -65,7 +66,6 @@
 \everyjob{\message{Texinfo version \texinfoversion}%
   \catcode`+=\active \catcode`\_=\active}
 
-
 \chardef\other=12
 
 % We never want plain's \outer definition of \+ in Texinfo.
@@ -93,14 +93,13 @@
 \let\ptexnewwrite\newwrite
 \let\ptexnoindent=\noindent
 \let\ptexplus=+
+\let\ptexraggedright=\raggedright
 \let\ptexrbrace=\}
 \let\ptexslash=\/
 \let\ptexstar=\*
 \let\ptext=\t
 \let\ptextop=\top
-{\catcode`\'=\active
-\global\let\ptexquoteright'}% Math-mode def from plain.tex.
-\let\ptexraggedright=\raggedright
+{\catcode`\'=\active \global\let\ptexquoteright'}% active in plain's math mode
 
 % If this character appears in an error message or help string, it
 % starts a new line in the output.
@@ -118,10 +117,11 @@
 % Set up fixed words for English if not already set.
 \ifx\putwordAppendix\undefined  \gdef\putwordAppendix{Appendix}\fi
 \ifx\putwordChapter\undefined   \gdef\putwordChapter{Chapter}\fi
+\ifx\putworderror\undefined     \gdef\putworderror{error}\fi
 \ifx\putwordfile\undefined      \gdef\putwordfile{file}\fi
 \ifx\putwordin\undefined        \gdef\putwordin{in}\fi
-\ifx\putwordIndexIsEmpty\undefined     \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
-\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
+\ifx\putwordIndexIsEmpty\undefined       \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
+\ifx\putwordIndexNonexistent\undefined   \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
 \ifx\putwordInfo\undefined      \gdef\putwordInfo{Info}\fi
 \ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi
 \ifx\putwordMethodon\undefined  \gdef\putwordMethodon{Method on}\fi
@@ -160,15 +160,18 @@
 \def\spaceisspace{\catcode`\ =\spacecat}
 
 % sometimes characters are active, so we need control sequences.
+\chardef\ampChar   = `\&
 \chardef\colonChar = `\:
 \chardef\commaChar = `\,
 \chardef\dashChar  = `\-
 \chardef\dotChar   = `\.
 \chardef\exclamChar= `\!
+\chardef\hashChar  = `\#
 \chardef\lquoteChar= `\`
 \chardef\questChar = `\?
 \chardef\rquoteChar= `\'
 \chardef\semiChar  = `\;
+\chardef\slashChar = `\/
 \chardef\underChar = `\_
 
 % Ignore a token.
@@ -199,36 +202,7 @@
 % that mark overfull boxes (in case you have decided
 % that the text looks ok even though it passes the margin).
 %
-\def\finalout{\overfullrule=0pt}
-
-% @| inserts a changebar to the left of the current line.  It should
-% surround any changed text.  This approach does *not* work if the
-% change spans more than two lines of output.  To handle that, we would
-% have adopt a much more difficult approach (putting marks into the main
-% vertical list for the beginning and end of each change).
-%
-\def\|{%
-  % \vadjust can only be used in horizontal mode.
-  \leavevmode
-  %
-  % Append this vertical mode material after the current line in the output.
-  \vadjust{%
-    % We want to insert a rule with the height and depth of the current
-    % leading; that is exactly what \strutbox is supposed to record.
-    \vskip-\baselineskip
-    %
-    % \vadjust-items are inserted at the left edge of the type.  So
-    % the \llap here moves out into the left-hand margin.
-    \llap{%
-      %
-      % For a thicker or thinner bar, change the `1pt'.
-      \vrule height\baselineskip width1pt
-      %
-      % This is the space between the bar and the text.
-      \hskip 12pt
-    }%
-  }%
-}
+\def\finalout{\overfullrule=0pt }
 
 % Sometimes it is convenient to have everything in the transcript file
 % and nothing on the terminal.  We don't just call \tracingall here,
@@ -246,7 +220,7 @@
   \tracingmacros2
   \tracingrestores1
   \showboxbreadth\maxdimen \showboxdepth\maxdimen
-  \ifx\eTeXversion\undefined\else % etex gives us more logging
+  \ifx\eTeXversion\thisisundefined\else % etex gives us more logging
     \tracingscantokens1
     \tracingifs1
     \tracinggroups1
@@ -257,6 +231,13 @@
   \errorcontextlines16
 }%
 
+% @errormsg{MSG}.  Do the index-like expansions on MSG, but if things
+% aren't perfect, it's not the end of the world, being an error message,
+% after all.
+% 
+\def\errormsg{\begingroup \indexnofonts \doerrormsg}
+\def\doerrormsg#1{\errmessage{#1}}
+
 % add check for \lastpenalty to plain's definitions.  If the last thing
 % we did was a \nobreak, we don't want to insert more space.
 %
@@ -267,7 +248,6 @@
 \def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount
   \removelastskip\penalty-200\bigskip\fi\fi}
 
-% For @cropmarks command.
 % Do @cropmarks to get crop marks.
 %
 \newif\ifcropmarks
@@ -577,7 +557,7 @@
 }
 \def\inenvironment#1{%
   \ifx#1\empty
-    out of any environment%
+    outside of any environment%
   \else
     in environment \expandafter\string#1%
   \fi
@@ -589,7 +569,7 @@
 \parseargdef\end{%
   \if 1\csname iscond.#1\endcsname
   \else
-    % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03
+    % The general wording of \badenverr may not be ideal.
     \expandafter\checkenv\csname#1\endcsname
     \csname E#1\endcsname
     \endgroup
@@ -599,85 +579,6 @@
 \newhelp\EMsimple{Press RETURN to continue.}
 
 
-%% Simple single-character @ commands
-
-% @@ prints an @
-% Kludge this until the fonts are right (grr).
-\def\@{{\tt\char64}}
-
-% This is turned off because it was never documented
-% and you can use @w{...} around a quote to suppress ligatures.
-%% Define @` and @' to be the same as ` and '
-%% but suppressing ligatures.
-%\def\`{{`}}
-%\def\'{{'}}
-
-% Used to generate quoted braces.
-\def\mylbrace {{\tt\char123}}
-\def\myrbrace {{\tt\char125}}
-\let\{=\mylbrace
-\let\}=\myrbrace
-\begingroup
-  % Definitions to produce \{ and \} commands for indices,
-  % and @{ and @} for the aux/toc files.
-  \catcode`\{ = \other \catcode`\} = \other
-  \catcode`\ = 1 \catcode`\ = 2
-  \catcode`\! = 0 \catcode`\\ = \other
-  !gdef!lbracecmd\{%
-  !gdef!rbracecmd\}%
-  !gdef!lbraceatcmd@{%
-  !gdef!rbraceatcmd@}%
-!endgroup
-
-% @comma{} to avoid , parsing problems.
-\let\comma = ,
-
-% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
-% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
-\let\, = \c
-\let\dotaccent = \.
-\def\ringaccent#1{{\accent23 #1}}
-\let\tieaccent = \t
-\let\ubaraccent = \b
-\let\udotaccent = \d
-
-% Other special characters: @questiondown @exclamdown @ordf @ordm
-% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
-\def\questiondown{?`}
-\def\exclamdown{!`}
-\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
-\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
-
-% Dotless i and dotless j, used for accents.
-\def\imacro{i}
-\def\jmacro{j}
-\def\dotless#1{%
-  \def\temp{#1}%
-  \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi
-  \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi
-  \else \errmessage{@dotless can be used only with i or j}%
-  \fi\fi
-}
-
-% The \TeX{} logo, as in plain, but resetting the spacing so that a
-% period following counts as ending a sentence.  (Idea found in latex.)
-%
-\edef\TeX{\TeX \spacefactor=1000 }
-
-% @LaTeX{} logo.  Not quite the same results as the definition in
-% latex.ltx, since we use a different font for the raised A; it's most
-% convenient for us to use an explicitly smaller font, rather than using
-% the \scriptstyle font (since we don't reset \scriptstyle and
-% \scriptscriptstyle).
-%
-\def\LaTeX{%
-  L\kern-.36em
-  {\setbox0=\hbox{T}%
-   \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}%
-  \kern-.15em
-  \TeX
-}
-
 % Be sure we're in horizontal mode when doing a tie, since we make space
 % equivalent to this in @example-like environments. Otherwise, a space
 % at the beginning of a line will start with \penalty -- and
@@ -694,7 +595,7 @@
 \def\:{\spacefactor=1000 }
 
 % @* forces a line break.
-\def\*{\hfil\break\hbox{}\ignorespaces}
+\def\*{\unskip\hfil\break\hbox{}\ignorespaces}
 
 % @/ allows a line break.
 \let\/=\allowbreak
@@ -719,7 +620,7 @@
   \else\ifx\temp\offword \plainnonfrenchspacing
   \else
     \errhelp = \EMsimple
-    \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
+    \errmessage{Unknown @frenchspacing option `\temp', must be on|off}%
   \fi\fi
 }
 
@@ -801,15 +702,6 @@
 
 \newdimen\mil  \mil=0.001in
 
-% Old definition--didn't work.
-%\parseargdef\need{\par %
-%% This method tries to make TeX break the page naturally
-%% if the depth of the box does not fit.
-%{\baselineskip=0pt%
-%\vtop to #1\mil{\vfil}\kern -#1\mil\nobreak
-%\prevdepth=-1000pt
-%}}
-
 \parseargdef\need{%
   % Ensure vertical mode, so we don't make a big box in the middle of a
   % paragraph.
@@ -873,7 +765,7 @@
 
 % @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current
 % paragraph.  For more general purposes, use the \margin insertion
-% class.  WHICH is `l' or `r'.
+% class.  WHICH is `l' or `r'.  Not documented, written for gawk manual.
 %
 \newskip\inmarginspacing \inmarginspacing=1cm
 \def\strutdepth{\dp\strutbox}
@@ -920,6 +812,36 @@
   \temp
 }
 
+% @| inserts a changebar to the left of the current line.  It should
+% surround any changed text.  This approach does *not* work if the
+% change spans more than two lines of output.  To handle that, we would
+% have adopt a much more difficult approach (putting marks into the main
+% vertical list for the beginning and end of each change).  This command
+% is not documented, not supported, and doesn't work.
+%
+\def\|{%
+  % \vadjust can only be used in horizontal mode.
+  \leavevmode
+  %
+  % Append this vertical mode material after the current line in the output.
+  \vadjust{%
+    % We want to insert a rule with the height and depth of the current
+    % leading; that is exactly what \strutbox is supposed to record.
+    \vskip-\baselineskip
+    %
+    % \vadjust-items are inserted at the left edge of the type.  So
+    % the \llap here moves out into the left-hand margin.
+    \llap{%
+      %
+      % For a thicker or thinner bar, change the `1pt'.
+      \vrule height\baselineskip width1pt
+      %
+      % This is the space between the bar and the text.
+      \hskip 12pt
+    }%
+  }%
+}
+
 % @include FILE -- \input text of FILE.
 %
 \def\include{\parseargusing\filenamecatcodes\includezzz}
@@ -930,6 +852,7 @@
     \makevalueexpandable  % we want to expand any @value in FILE.
     \turnoffactive        % and allow special characters in the expansion
     \indexnofonts         % Allow `@@' and other weird things in file names.
+    \wlog{texinfo.tex: doing @include of #1^^J}%
     \edef\temp{\noexpand\input #1 }%
     %
     % This trickery is to read FILE outside of a group, in case it makes
@@ -965,7 +888,7 @@
 \def\popthisfilestack{\errthisfilestackempty}
 \def\errthisfilestackempty{\errmessage{Internal error:
   the stack of filenames is empty.}}
-
+%
 \def\thisfile{}
 
 % @center line
@@ -973,36 +896,46 @@
 %
 \parseargdef\center{%
   \ifhmode
-    \let\next\centerH
+    \let\centersub\centerH
   \else
-    \let\next\centerV
+    \let\centersub\centerV
   \fi
-  \next{\hfil \ignorespaces#1\unskip \hfil}%
+  \centersub{\hfil \ignorespaces#1\unskip \hfil}%
+  \let\centersub\relax % don't let the definition persist, just in case
 }
-\def\centerH#1{%
-  {%
-    \hfil\break
-    \advance\hsize by -\leftskip
-    \advance\hsize by -\rightskip
-    \line{#1}%
-    \break
-  }%
+\def\centerH#1{{%
+  \hfil\break
+  \advance\hsize by -\leftskip
+  \advance\hsize by -\rightskip
+  \line{#1}%
+  \break
+}}
+%
+\newcount\centerpenalty
+\def\centerV#1{%
+  % The idea here is the same as in \startdefun, \cartouche, etc.: if
+  % @center is the first thing after a section heading, we need to wipe
+  % out the negative parskip inserted by \sectionheading, but still
+  % prevent a page break here.
+  \centerpenalty = \lastpenalty
+  \ifnum\centerpenalty>10000 \vskip\parskip \fi
+  \ifnum\centerpenalty>9999 \penalty\centerpenalty \fi
+  \line{\kern\leftskip #1\kern\rightskip}%
 }
-\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}}
 
 % @sp n   outputs n lines of vertical space
-
+%
 \parseargdef\sp{\vskip #1\baselineskip}
 
 % @comment ...line which is ignored...
 % @c is the same as @comment
 % @ignore ... @end ignore  is another way to write a comment
-
+%
 \def\comment{\begingroup \catcode`\^^M=\other%
 \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
 \commentxxx}
 {\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}}
-
+%
 \let\c=\comment
 
 % @paragraphindent NCHARS
@@ -1095,109 +1028,6 @@
 }
 
 
-% @asis just yields its argument.  Used with @table, for example.
-%
-\def\asis#1{#1}
-
-% @math outputs its argument in math mode.
-%
-% One complication: _ usually means subscripts, but it could also mean
-% an actual _ character, as in @math{@var{some_variable} + 1}.  So make
-% _ active, and distinguish by seeing if the current family is \slfam,
-% which is what @var uses.
-{
-  \catcode`\_ = \active
-  \gdef\mathunderscore{%
-    \catcode`\_=\active
-    \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
-  }
-}
-% Another complication: we want \\ (and @\) to output a \ character.
-% FYI, plain.tex uses \\ as a temporary control sequence (why?), but
-% this is not advertised and we don't care.  Texinfo does not
-% otherwise define @\.
-%
-% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
-\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
-%
-\def\math{%
-  \tex
-  \mathunderscore
-  \let\\ = \mathbackslash
-  \mathactive
-  % make the texinfo accent commands work in math mode
-  \let\"=\ddot
-  \let\'=\acute
-  \let\==\bar
-  \let\^=\hat
-  \let\`=\grave
-  \let\u=\breve
-  \let\v=\check
-  \let\~=\tilde
-  \let\dotaccent=\dot
-  $\finishmath
-}
-\def\finishmath#1{#1$\endgroup}  % Close the group opened by \tex.
-
-% Some active characters (such as <) are spaced differently in math.
-% We have to reset their definitions in case the @math was an argument
-% to a command which sets the catcodes (such as @item or @section).
-%
-{
-  \catcode`^ = \active
-  \catcode`< = \active
-  \catcode`> = \active
-  \catcode`+ = \active
-  \catcode`' = \active
-  \gdef\mathactive{%
-    \let^ = \ptexhat
-    \let< = \ptexless
-    \let> = \ptexgtr
-    \let+ = \ptexplus
-    \let' = \ptexquoteright
-  }
-}
-
-% Some math mode symbols.
-\def\bullet{$\ptexbullet$}
-\def\geq{\ifmmode \ge\else $\ge$\fi}
-\def\leq{\ifmmode \le\else $\le$\fi}
-\def\minus{\ifmmode -\else $-$\fi}
-
-% @dots{} outputs an ellipsis using the current font.
-% We do .5em per period so that it has the same spacing in the cm
-% typewriter fonts as three actual period characters; on the other hand,
-% in other typewriter fonts three periods are wider than 1.5em.  So do
-% whichever is larger.
-%
-\def\dots{%
-  \leavevmode
-  \setbox0=\hbox{...}% get width of three periods
-  \ifdim\wd0 > 1.5em
-    \dimen0 = \wd0
-  \else
-    \dimen0 = 1.5em
-  \fi
-  \hbox to \dimen0{%
-    \hskip 0pt plus.25fil
-    .\hskip 0pt plus1fil
-    .\hskip 0pt plus1fil
-    .\hskip 0pt plus.5fil
-  }%
-}
-
-% @enddots{} is an end-of-sentence ellipsis.
-%
-\def\enddots{%
-  \dots
-  \spacefactor=\endofsentencespacefactor
-}
-
-% @comma{} is so commas can be inserted into text without messing up
-% Texinfo's parsing.
-%
-\let\comma = ,
-
 % @refill is a no-op.
 \let\refill=\relax
 
@@ -1262,9 +1092,8 @@
 \newif\ifpdfmakepagedest
 
 % when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1
-% can be set).  So we test for \relax and 0 as well as \undefined,
-% borrowed from ifpdf.sty.
-\ifx\pdfoutput\undefined
+% can be set).  So we test for \relax and 0 as well as being undefined.
+\ifx\pdfoutput\thisisundefined
 \else
   \ifx\pdfoutput\relax
   \else
@@ -1279,50 +1108,24 @@
 % for display in the outlines, and in other places.  Thus, we have to
 % double any backslashes.  Otherwise, a name like "\node" will be
 % interpreted as a newline (\n), followed by o, d, e.  Not good.
-% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
-% (and related messages, the final outcome is that it is up to the TeX
-% user to double the backslashes and otherwise make the string valid, so
-% that's what we do).
-
-% double active backslashes.
-%
-{\catcode`\@=0 \catcode`\\=\active
- @gdef@activebackslashdouble{%
-   @catcode`@\=@active
-   @let\=@doublebackslash}
-}
-
-% To handle parens, we must adopt a different approach, since parens are
-% not active characters.  hyperref.dtx (which has the same problem as
-% us) handles it with this amazing macro to replace tokens, with minor
-% changes for Texinfo.  It is included here under the GPL by permission
-% from the author, Heiko Oberdiek.
-%
-% #1 is the tokens to replace.
-% #2 is the replacement.
-% #3 is the control sequence with the string.
-%
-\def\HyPsdSubst#1#2#3{%
-  \def\HyPsdReplace##1#1##2\END{%
-    ##1%
-    \ifx\\##2\\%
-    \else
-      #2%
-      \HyReturnAfterFi{%
-        \HyPsdReplace##2\END
-      }%
-    \fi
-  }%
-  \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
-}
-\long\def\HyReturnAfterFi#1\fi{\fi#1}
-
-% #1 is a control sequence in which to do the replacements.
-\def\backslashparens#1{%
-  \xdef#1{#1}% redefine it as its expansion; the definition is simply
-             % \lastnode when called from \setref -> \pdfmkdest.
-  \HyPsdSubst{(}{\realbackslash(}{#1}%
-  \HyPsdSubst{)}{\realbackslash)}{#1}%
+% 
+% See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and
+% related messages.  The final outcome is that it is up to the TeX user
+% to double the backslashes and otherwise make the string valid, so
+% that's what we do.  pdftex 1.30.0 (ca.2005) introduced a primitive to
+% do this reliably, so we use it.
+
+% #1 is a control sequence in which to do the replacements,
+% which we \xdef.
+\def\txiescapepdf#1{%
+  \ifx\pdfescapestring\thisisundefined
+    % No primitive available; should we give a warning or log?
+    % Many times it won't matter.
+  \else
+    % The expandable \pdfescapestring primitive escapes parentheses,
+    % backslashes, and other special chars.
+    \xdef#1{\pdfescapestring{#1}}%
+  \fi
 }
 
 \newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
@@ -1381,32 +1184,34 @@
   %
   % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
   \def\dopdfimage#1#2#3{%
-    \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
-    \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
+    \def\pdfimagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
+    \def\pdfimageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
     %
-    % pdftex (and the PDF format) support .png, .jpg, .pdf (among
-    % others).  Let's try in that order.
+    % pdftex (and the PDF format) support .pdf, .png, .jpg (among
+    % others).  Let's try in that order, PDF first since if
+    % someone has a scalable image, presumably better to use that than a
+    % bitmap.
     \let\pdfimgext=\empty
     \begingroup
-      \openin 1 #1.png \ifeof 1
-        \openin 1 #1.jpg \ifeof 1
-          \openin 1 #1.jpeg \ifeof 1
-            \openin 1 #1.JPG \ifeof 1
-              \openin 1 #1.pdf \ifeof 1
-                \openin 1 #1.PDF \ifeof 1
+      \openin 1 #1.pdf \ifeof 1
+        \openin 1 #1.PDF \ifeof 1
+          \openin 1 #1.png \ifeof 1
+            \openin 1 #1.jpg \ifeof 1
+              \openin 1 #1.jpeg \ifeof 1
+                \openin 1 #1.JPG \ifeof 1
                   \errhelp = \nopdfimagehelp
                   \errmessage{Could not find image file #1 for pdf}%
-                \else \gdef\pdfimgext{PDF}%
+                \else \gdef\pdfimgext{JPG}%
                 \fi
-              \else \gdef\pdfimgext{pdf}%
+              \else \gdef\pdfimgext{jpeg}%
               \fi
-            \else \gdef\pdfimgext{JPG}%
+            \else \gdef\pdfimgext{jpg}%
             \fi
-          \else \gdef\pdfimgext{jpeg}%
+          \else \gdef\pdfimgext{png}%
           \fi
-        \else \gdef\pdfimgext{jpg}%
+        \else \gdef\pdfimgext{PDF}%
         \fi
-      \else \gdef\pdfimgext{png}%
+      \else \gdef\pdfimgext{pdf}%
       \fi
       \closein 1
     \endgroup
@@ -1418,8 +1223,8 @@
     \else
       \immediate\pdfximage
     \fi
-      \ifdim \wd0 >0pt width \imagewidth \fi
-      \ifdim \wd2 >0pt height \imageheight \fi
+      \ifdim \wd0 >0pt width \pdfimagewidth \fi
+      \ifdim \wd2 >0pt height \pdfimageheight \fi
       \ifnum\pdftexversion<13
          #1.\pdfimgext
        \else
@@ -1434,10 +1239,9 @@
     % such as \, aren't expanded when present in a section title.
     \indexnofonts
     \turnoffactive
-    \activebackslashdouble
     \makevalueexpandable
     \def\pdfdestname{#1}%
-    \backslashparens\pdfdestname
+    \txiescapepdf\pdfdestname
     \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
   }}
   %
@@ -1469,29 +1273,24 @@
     % page number.  We could generate a destination for the section
     % text in the case where a section has no node, but it doesn't
     % seem worth the trouble, since most documents are normally structured.
-    \def\pdfoutlinedest{#3}%
+    \edef\pdfoutlinedest{#3}%
     \ifx\pdfoutlinedest\empty
       \def\pdfoutlinedest{#4}%
     \else
-      % Doubled backslashes in the name.
-      {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
-       \backslashparens\pdfoutlinedest}%
+      \txiescapepdf\pdfoutlinedest
     \fi
     %
-    % Also double the backslashes in the display string.
-    {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
-     \backslashparens\pdfoutlinetext}%
+    % Also escape PDF chars in the display string.
+    \edef\pdfoutlinetext{#1}%
+    \txiescapepdf\pdfoutlinetext
     %
     \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
   }
   %
   \def\pdfmakeoutlines{%
     \begingroup
-      % Thanh's hack / proper braces in bookmarks
-      \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
-      \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
-      %
       % Read toc silently, to get counts of subentries for \pdfoutline.
+      \def\partentry##1##2##3##4{}% ignore parts in the outlines
       \def\numchapentry##1##2##3##4{%
 	\def\thischapnum{##2}%
 	\def\thissecnum{0}%
@@ -1545,25 +1344,41 @@
       % Latin 2 (0xea) gets translated to a | character.  Info from
       % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100.
       %
-      % xx to do this right, we have to translate 8-bit characters to
-      % their "best" equivalent, based on the @documentencoding.  Right
-      % now, I guess we'll just let the pdf reader have its way.
+      % TODO this right, we have to translate 8-bit characters to
+      % their "best" equivalent, based on the @documentencoding.  Too
+      % much work for too little return.  Just use the ASCII equivalents
+      % we use for the index sort strings.
+      % 
       \indexnofonts
       \setupdatafile
+      % We can have normal brace characters in the PDF outlines, unlike
+      % Texinfo index files.  So set that up.
+      \def\{{\lbracecharliteral}%
+      \def\}{\rbracecharliteral}%
       \catcode`\\=\active \otherbackslash
       \input \tocreadfilename
     \endgroup
   }
+  {\catcode`=1 \catcode`=2
+   \catcode`{=\other \catcode`}=\other
+   \gdef\lbracecharliteral{%
+   \gdef\rbracecharliteral}%
+  
   %
   \def\skipspaces#1{\def\PP{#1}\def\D{|}%
     \ifx\PP\D\let\nextsp\relax
     \else\let\nextsp\skipspaces
-      \ifx\p\space\else\addtokens{\filename}{\PP}%
-        \advance\filenamelength by 1
-      \fi
+      \addtokens{\filename}{\PP}%
+      \advance\filenamelength by 1
     \fi
     \nextsp}
-  \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
+  \def\getfilename#1{%
+    \filenamelength=0
+    % If we don't expand the argument now, \skipspaces will get
+    % snagged on things like "@value{foo}".
+    \edef\temp{#1}%
+    \expandafter\skipspaces\temp|\relax
+  }
   \ifnum\pdftexversion < 14
     \let \startlink \pdfannotlink
   \else
@@ -1660,9 +1475,6 @@
 \def\ttsl{\setfontstyle{ttsl}}
 
 
-% Default leading.
-\newdimen\textleading  \textleading = 13.2pt
-
 % Set the baselineskip to #1, and the lineskip and strut size
 % correspondingly.  There is no deep meaning behind these magic numbers
 % used as factors; they just match (closely enough) what Knuth defined.
@@ -1674,6 +1486,7 @@
 % can get a sort of poor man's double spacing by redefining this.
 \def\baselinefactor{1}
 %
+\newdimen\textleading
 \def\setleading#1{%
   \dimen0 = #1\relax
   \normalbaselineskip = \baselinefactor\dimen0
@@ -1695,7 +1508,7 @@
 % if we are producing pdf, and we have \pdffontattr, then define cmaps.
 % (\pdffontattr was introduced many years ago, but people still run
 % older pdftex's; it's easy to conditionalize, so we do.)
-\ifpdf \ifx\pdffontattr\undefined \else
+\ifpdf \ifx\pdffontattr\thisisundefined \else
   \begingroup
     \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
     \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
@@ -1946,28 +1759,34 @@
 \fi\fi
 
 
-% Set the font macro #1 to the font named #2, adding on the
-% specified font prefix (normally `cm').
+% Set the font macro #1 to the font named \fontprefix#2.
 % #3 is the font's design size, #4 is a scale factor, #5 is the CMap
-% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
-% empty to omit).
+% encoding (only OT1, OT1IT and OT1TT are allowed, or empty to omit).
+% Example:
+% #1 = \textrm
+% #2 = \rmshape
+% #3 = 10
+% #4 = \mainmagstep
+% #5 = OT1
+%
 \def\setfont#1#2#3#4#5{%
   \font#1=\fontprefix#2#3 scaled #4
   \csname cmap#5\endcsname#1%
 }
 % This is what gets called when #5 of \setfont is empty.
 \let\cmap\gobble
-% emacs-page end of cmaps
+%
+% (end of cmaps)
 
 % Use cm as the default font prefix.
 % To specify the font prefix, you must define \fontprefix
 % before you read in texinfo.tex.
-\ifx\fontprefix\undefined
+\ifx\fontprefix\thisisundefined
 \def\fontprefix{cm}
 \fi
 % Support font families that don't use the same naming scheme as CM.
 \def\rmshape{r}
-\def\rmbshape{bx}               %where the normal face is bold
+\def\rmbshape{bx}               % where the normal face is bold
 \def\bfshape{b}
 \def\bxshape{bx}
 \def\ttshape{tt}
@@ -1982,8 +1801,7 @@
 \def\scshape{csc}
 \def\scbshape{csc}
 
-% Definitions for a main text size of 11pt.  This is the default in
-% Texinfo.
+% Definitions for a main text size of 11pt.  (The default in Texinfo.)
 %
 \def\definetextfontsizexi{%
 % Text fonts (11.2pt, magstep1).
@@ -2105,10 +1923,10 @@
 \font\reducedsy=cmsy10
 \def\reducedecsize{1000}
 
-% reset the current fonts
-\textfonts
+\textleading = 13.2pt % line spacing for 11pt CM
+\textfonts            % reset the current fonts
 \rm
-} % end of 11pt text font size definitions
+} % end of 11pt text font size definitions, \definetextfontsizexi
 
 
 % Definitions to make the main text be 10pt Computer Modern, with
@@ -2236,25 +2054,24 @@
 \font\reducedsy=cmsy9
 \def\reducedecsize{0900}
 
-% reduce space between paragraphs
-\divide\parskip by 2
-
-% reset the current fonts
-\textfonts
+\divide\parskip by 2  % reduce space between paragraphs
+\textleading = 12pt   % line spacing for 10pt CM
+\textfonts            % reset the current fonts
 \rm
-} % end of 10pt text font size definitions
+} % end of 10pt text font size definitions, \definetextfontsizex
 
 
 % We provide the user-level command
 %   @fonttextsize 10
 % (or 11) to redefine the text font size.  pt is assumed.
 %
-\def\xword{10}
 \def\xiword{11}
+\def\xword{10}
+\def\xwordpt{10pt}
 %
 \parseargdef\fonttextsize{%
   \def\textsizearg{#1}%
-  \wlog{doing @fonttextsize \textsizearg}%
+  %\wlog{doing @fonttextsize \textsizearg}%
   %
   % Set \globaldefs so that documents can use this inside @tex, since
   % makeinfo 4.8 does not support it, but we need it nonetheless.
@@ -2308,7 +2125,7 @@
   \let\tenttsl=\titlettsl
   \def\curfontsize{title}%
   \def\lsize{chap}\def\lllsize{subsec}%
-  \resetmathfonts \setleading{25pt}}
+  \resetmathfonts \setleading{27pt}}
 \def\titlefont#1{{\titlefonts\rmisbold #1}}
 \def\chapfonts{%
   \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
@@ -2436,12 +2253,14 @@
 
 % Markup style setup for left and right quotes.
 \defmarkupstylesetup\markupsetuplq{%
-  \expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname
+  \expandafter\let\expandafter \temp
+    \csname markupsetuplq\currentmarkupstyle\endcsname
   \ifx\temp\relax \markupsetuplqdefault \else \temp \fi
 }
 
 \defmarkupstylesetup\markupsetuprq{%
-  \expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname
+  \expandafter\let\expandafter \temp
+    \csname markupsetuprq\currentmarkupstyle\endcsname
   \ifx\temp\relax \markupsetuprqdefault \else \temp \fi
 }
 
@@ -2454,28 +2273,31 @@
 
 \gdef\markupsetcodequoteleft{\let`\codequoteleft}
 \gdef\markupsetcodequoteright{\let'\codequoteright}
-
-\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft}
 }
 
 \let\markupsetuplqcode \markupsetcodequoteleft
 \let\markupsetuprqcode \markupsetcodequoteright
+%
 \let\markupsetuplqexample \markupsetcodequoteleft
 \let\markupsetuprqexample \markupsetcodequoteright
+%
+\let\markupsetuplqkbd     \markupsetcodequoteleft
+\let\markupsetuprqkbd     \markupsetcodequoteright
+%
+\let\markupsetuplqsamp \markupsetcodequoteleft
+\let\markupsetuprqsamp \markupsetcodequoteright
+%
 \let\markupsetuplqverb \markupsetcodequoteleft
 \let\markupsetuprqverb \markupsetcodequoteright
+%
 \let\markupsetuplqverbatim \markupsetcodequoteleft
 \let\markupsetuprqverbatim \markupsetcodequoteright
 
-\let\markupsetuplqsamp \markupsetnoligaturesquoteleft
-\let\markupsetuplqkbd \markupsetnoligaturesquoteleft
-
-% Allow an option to not replace quotes with a regular directed right
-% quote/apostrophe (char 0x27), but instead use the undirected quote
-% from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
-% the default, but it works for pasting with more pdf viewers (at least
-% evince), the lilypond developers report.  xpdf does work with the
-% regular 0x27.
+% Allow an option to not use regular directed right quote/apostrophe
+% (char 0x27), but instead the undirected quote from cmtt (char 0x0d).
+% The undirected quote is ugly, so don't make it the default, but it
+% works for pasting with more pdf viewers (at least evince), the
+% lilypond developers report.  xpdf does work with the regular 0x27.
 %
 \def\codequoteright{%
   \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
@@ -2499,33 +2321,83 @@
   \else \char'22 \fi
 }
 
+% Commands to set the quote options.
+% 
+\parseargdef\codequoteundirected{%
+  \def\temp{#1}%
+  \ifx\temp\onword
+    \expandafter\let\csname SETtxicodequoteundirected\endcsname
+      = t%
+  \else\ifx\temp\offword
+    \expandafter\let\csname SETtxicodequoteundirected\endcsname
+      = \relax
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}%
+  \fi\fi
+}
+%
+\parseargdef\codequotebacktick{%
+  \def\temp{#1}%
+  \ifx\temp\onword
+    \expandafter\let\csname SETtxicodequotebacktick\endcsname
+      = t%
+  \else\ifx\temp\offword
+    \expandafter\let\csname SETtxicodequotebacktick\endcsname
+      = \relax
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @codequotebacktick value `\temp', must be on|off}%
+  \fi\fi
+}
+
 % Knuth pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font.
 \def\noligaturesquoteleft{\relax\lq}
 
 % Count depth in font-changes, for error checks
 \newcount\fontdepth \fontdepth=0
 
-%% Add scribe-like font environments, plus @l for inline lisp (usually sans
-%% serif) and @ii for TeX italic
+% Font commands.
 
-% \smartitalic{ARG} outputs arg in italics, followed by an italic correction
-% unless the following character is such as not to need one.
-\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else
-                    \ptexslash\fi\fi\fi}
-\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
-\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
-
-% like \smartslanted except unconditionally uses \ttsl.
-% @var is set to this for defun arguments.
-\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
+% #1 is the font command (\sl or \it), #2 is the text to slant.
+% If we are in a monospaced environment, however, 1) always use \ttsl,
+% and 2) do not add an italic correction.
+\def\dosmartslant#1#2{%
+  \ifusingtt 
+    {{\ttsl #2}\let\next=\relax}%
+    {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}%
+  \next
+}
+\def\smartslanted{\dosmartslant\sl}
+\def\smartitalic{\dosmartslant\it}
+
+% Output an italic correction unless \next (presumed to be the following
+% character) is such as not to need one.
+\def\smartitaliccorrection{%
+  \ifx\next,%
+  \else\ifx\next-%
+  \else\ifx\next.%
+  \else\ptexslash
+  \fi\fi\fi
+  \aftersmartic
+}
+
+% Unconditional use \ttsl, and no ic.  @var is set to this for defuns.
+\def\ttslanted#1{{\ttsl #1}}
 
 % @cite is like \smartslanted except unconditionally use \sl.  We never want
 % ttsl for book titles, do we?
-\def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
+\def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection}
+
+\def\aftersmartic{}
+\def\var#1{%
+  \let\saveaftersmartic = \aftersmartic
+  \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}%
+  \smartslanted{#1}%
+}
 
 \let\i=\smartitalic
 \let\slanted=\smartslanted
-\def\var#1{{\setupmarkupstyle{var}\smartslanted{#1}}}
 \let\dfn=\smartslanted
 \let\emph=\smartitalic
 
@@ -2575,34 +2447,12 @@
 % @samp.
 \def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
 
-% definition of @key that produces a lozenge.  Doesn't adjust to text size.
-%\setfont\keyrm\rmshape{8}{1000}{OT1}
-%\font\keysy=cmsy9
-%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
-%  \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
-%    \vbox{\hrule\kern-0.4pt
-%     \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
-%    \kern-0.4pt\hrule}%
-%  \kern-.06em\raise0.4pt\hbox{\angleright}}}}
-
-% definition of @key with no lozenge.  If the current font is already
-% monospace, don't change it; that way, we respect @kbdinputstyle.  But
-% if it isn't monospace, then use \tt.
-%
-\def\key#1{{\setupmarkupstyle{key}%
-  \nohyphenation
-  \ifmonospace\else\tt\fi
-  #1}\null}
+% @indicateurl is \samp, that is, with quotes.
+\let\indicateurl=\samp
 
-% ctrl is no longer a Texinfo command.
-\def\ctrl #1{{\tt \rawbackslash \hat}#1}
-
-% @file, @option are the same as @samp.
-\let\file=\samp
-\let\option=\samp
-
-% @code is a modification of @t,
-% which makes spaces the same size as normal in the surrounding text.
+% @code (and similar) prints in typewriter, but with spaces the same
+% size as normal in the surrounding text, without hyphenation, etc.
+% This is a subroutine for that.
 \def\tclose#1{%
   {%
     % Change normal interword space to be same as for the current font.
@@ -2621,13 +2471,13 @@
     \plainfrenchspacing
     #1%
   }%
-  \null
+  \null % reset spacefactor to 1000
 }
 
 % We *must* turn on hyphenation at `-' and `_' in @code.
 % Otherwise, it is too hard to avoid overfull hboxes
 % in the Emacs manual, the Library manual, etc.
-
+%
 % Unfortunately, TeX uses one parameter (\hyphenchar) to control
 % both hyphenation at - and hyphenation within words.
 % We must therefore turn them both off (\tclose does that)
@@ -2646,14 +2496,16 @@
      \let-\codedash
      \let_\codeunder
     \else
-     \let-\realdash
+     \let-\normaldash
      \let_\realunder
     \fi
     \codex
   }
 }
 
-\def\realdash{-}
+\def\codex #1{\tclose{#1}\endgroup}
+
+\def\normaldash{-}
 \def\codedash{-\discretionary{}{}{}}
 \def\codeunder{%
   % this is all so @math{@code{var_name}+1} can work.  In math mode, _
@@ -2666,12 +2518,11 @@
              \discretionary{}{}{}}%
             {\_}%
 }
-\def\codex #1{\tclose{#1}\endgroup}
 
 % An additional complication: the above will allow breaks after, e.g.,
-% each of the four underscores in __typeof__.  This is undesirable in
-% some manuals, especially if they don't have long identifiers in
-% general.  @allowcodebreaks provides a way to control this.
+% each of the four underscores in __typeof__.  This is bad.
+% @allowcodebreaks provides a document-level way to turn breaking at -
+% and _ on and off.
 %
 \newif\ifallowcodebreaks  \allowcodebreakstrue
 
@@ -2686,63 +2537,25 @@
     \allowcodebreaksfalse
   \else
     \errhelp = \EMsimple
-    \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
+    \errmessage{Unknown @allowcodebreaks option `\txiarg', must be true|false}%
   \fi\fi
 }
 
-% @kbd is like @code, except that if the argument is just one @key command,
-% then @kbd has no effect.
-\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
-
-% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
-%   `example' (@kbd uses ttsl only inside of @example and friends),
-%   or `code' (@kbd uses normal tty font always).
-\parseargdef\kbdinputstyle{%
-  \def\txiarg{#1}%
-  \ifx\txiarg\worddistinct
-    \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
-  \else\ifx\txiarg\wordexample
-    \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
-  \else\ifx\txiarg\wordcode
-    \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
-  \else
-    \errhelp = \EMsimple
-    \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
-  \fi\fi\fi
-}
-\def\worddistinct{distinct}
-\def\wordexample{example}
-\def\wordcode{code}
-
-% Default is `distinct'.
-\kbdinputstyle distinct
-
-\def\xkey{\key}
-\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
-\ifx\one\xkey\ifx\threex\three \key{#2}%
-\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
-\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi}
-
-% For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
-\let\indicateurl=\code
-\let\env=\code
+% For @command, @env, @file, @option quotes seem unnecessary,
+% so use \code rather than \samp.
 \let\command=\code
-
-% @clicksequence{File @click{} Open ...}
-\def\clicksequence#1{\begingroup #1\endgroup}
-
-% @clickstyle @arrow   (by default)
-\parseargdef\clickstyle{\def\click{#1}}
-\def\click{\arrow}
+\let\env=\code
+\let\file=\code
+\let\option=\code
 
 % @uref (abbreviation for `urlref') takes an optional (comma-separated)
 % second argument specifying the text to display and an optional third
 % arg as text to display instead of (rather than in addition to) the url
-% itself.  First (mandatory) arg is the url.  Perhaps eventually put in
-% a hypertex \special here.
-%
-\def\uref#1{\douref #1,,,\finish}
-\def\douref#1,#2,#3,#4\finish{\begingroup
+% itself.  First (mandatory) arg is the url.
+% (This \urefnobreak definition isn't used now, leaving it for a while
+% for comparison.)
+\def\urefnobreak#1{\dourefnobreak #1,,,\finish}
+\def\dourefnobreak#1,#2,#3,#4\finish{\begingroup
   \unsepspaces
   \pdfurl{#1}%
   \setbox0 = \hbox{\ignorespaces #3}%
@@ -2763,6 +2576,103 @@
   \endlink
 \endgroup}
 
+% This \urefbreak definition is the active one.
+\def\urefbreak{\begingroup \urefcatcodes \dourefbreak}
+\let\uref=\urefbreak
+\def\dourefbreak#1{\urefbreakfinish #1,,,\finish}
+\def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example
+  \unsepspaces
+  \pdfurl{#1}%
+  \setbox0 = \hbox{\ignorespaces #3}%
+  \ifdim\wd0 > 0pt
+    \unhbox0 % third arg given, show only that
+  \else
+    \setbox0 = \hbox{\ignorespaces #2}%
+    \ifdim\wd0 > 0pt
+      \ifpdf
+        \unhbox0             % PDF: 2nd arg given, show only it
+      \else
+        \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url
+      \fi
+    \else
+      \urefcode{#1}% only url given, so show it
+    \fi
+  \fi
+  \endlink
+\endgroup}
+
+% Allow line breaks around only a few characters (only).
+\def\urefcatcodes{%
+  \catcode\ampChar=\active   \catcode\dotChar=\active
+  \catcode\hashChar=\active  \catcode\questChar=\active
+  \catcode\slashChar=\active
+}
+{
+  \urefcatcodes
+  %
+  \global\def\urefcode{\begingroup
+    \setupmarkupstyle{code}%
+    \urefcatcodes
+    \let&\urefcodeamp
+    \let.\urefcodedot
+    \let#\urefcodehash
+    \let?\urefcodequest
+    \let/\urefcodeslash
+    \codex
+  }
+  %
+  % By default, they are just regular characters.
+  \global\def&{\normalamp}
+  \global\def.{\normaldot}
+  \global\def#{\normalhash}
+  \global\def?{\normalquest}
+  \global\def/{\normalslash}
+}
+
+% we put a little stretch before and after the breakable chars, to help
+% line breaking of long url's.  The unequal skips make look better in
+% cmtt at least, especially for dots.
+\def\urefprestretch{\urefprebreak \hskip0pt plus.13em }
+\def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em }
+%
+\def\urefcodeamp{\urefprestretch \&\urefpoststretch}
+\def\urefcodedot{\urefprestretch .\urefpoststretch}
+\def\urefcodehash{\urefprestretch \#\urefpoststretch}
+\def\urefcodequest{\urefprestretch ?\urefpoststretch}
+\def\urefcodeslash{\futurelet\next\urefcodeslashfinish}
+{
+  \catcode`\/=\active
+  \global\def\urefcodeslashfinish{%
+    \urefprestretch \slashChar
+    % Allow line break only after the final / in a sequence of
+    % slashes, to avoid line break between the slashes in http://.
+    \ifx\next/\else \urefpoststretch \fi
+  }
+}
+
+% One more complication: by default we'll break after the special
+% characters, but some people like to break before the special chars, so
+% allow that.  Also allow no breaking at all, for manual control.
+% 
+\parseargdef\urefbreakstyle{%
+  \def\txiarg{#1}%
+  \ifx\txiarg\wordnone
+    \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak}
+  \else\ifx\txiarg\wordbefore
+    \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak}
+  \else\ifx\txiarg\wordafter
+    \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak}
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @urefbreakstyle setting `\txiarg'}%
+  \fi\fi\fi
+}
+\def\wordafter{after}
+\def\wordbefore{before}
+\def\wordnone{none}
+
+\urefbreakstyle after
+
 % @url synonym for @uref, since that's how everyone uses it.
 %
 \let\url=\uref
@@ -2784,6 +2694,67 @@
   \let\email=\uref
 \fi
 
+% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
+%   `example' (@kbd uses ttsl only inside of @example and friends),
+%   or `code' (@kbd uses normal tty font always).
+\parseargdef\kbdinputstyle{%
+  \def\txiarg{#1}%
+  \ifx\txiarg\worddistinct
+    \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
+  \else\ifx\txiarg\wordexample
+    \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
+  \else\ifx\txiarg\wordcode
+    \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @kbdinputstyle setting `\txiarg'}%
+  \fi\fi\fi
+}
+\def\worddistinct{distinct}
+\def\wordexample{example}
+\def\wordcode{code}
+
+% Default is `distinct'.
+\kbdinputstyle distinct
+
+% @kbd is like @code, except that if the argument is just one @key command,
+% then @kbd has no effect.
+\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}}
+
+\def\xkey{\key}
+\def\kbdsub#1#2#3\par{%
+  \def\one{#1}\def\three{#3}\def\threex{??}%
+  \ifx\one\xkey\ifx\threex\three \key{#2}%
+  \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
+  \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
+}
+
+% definition of @key that produces a lozenge.  Doesn't adjust to text size.
+%\setfont\keyrm\rmshape{8}{1000}{OT1}
+%\font\keysy=cmsy9
+%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
+%  \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
+%    \vbox{\hrule\kern-0.4pt
+%     \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
+%    \kern-0.4pt\hrule}%
+%  \kern-.06em\raise0.4pt\hbox{\angleright}}}}
+
+% definition of @key with no lozenge.  If the current font is already
+% monospace, don't change it; that way, we respect @kbdinputstyle.  But
+% if it isn't monospace, then use \tt.
+%
+\def\key#1{{\setupmarkupstyle{key}%
+  \nohyphenation
+  \ifmonospace\else\tt\fi
+  #1}\null}
+
+% @clicksequence{File @click{} Open ...}
+\def\clicksequence#1{\begingroup #1\endgroup}
+
+% @clickstyle @arrow   (by default)
+\parseargdef\clickstyle{\def\click{#1}}
+\def\click{\arrow}
+
 % Typeset a dimension, e.g., `in' or `pt'.  The only reason for the
 % argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
 %
@@ -2805,6 +2776,7 @@
   \ifx\temp\empty \else
     \space ({\unsepspaces \ignorespaces \temp \unskip})%
   \fi
+  \null % reset \spacefactor=1000
 }
 
 % @abbr for "Comput. J." and the like.
@@ -2817,10 +2789,222 @@
   \ifx\temp\empty \else
     \space ({\unsepspaces \ignorespaces \temp \unskip})%
   \fi
+  \null % reset \spacefactor=1000
+}
+
+% @asis just yields its argument.  Used with @table, for example.
+%
+\def\asis#1{#1}
+
+% @math outputs its argument in math mode.
+%
+% One complication: _ usually means subscripts, but it could also mean
+% an actual _ character, as in @math{@var{some_variable} + 1}.  So make
+% _ active, and distinguish by seeing if the current family is \slfam,
+% which is what @var uses.
+{
+  \catcode`\_ = \active
+  \gdef\mathunderscore{%
+    \catcode`\_=\active
+    \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
+  }
+}
+% Another complication: we want \\ (and @\) to output a math (or tt) \.
+% FYI, plain.tex uses \\ as a temporary control sequence (for no
+% particular reason), but this is not advertised and we don't care.
+%
+% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
+\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
+%
+\def\math{%
+  \tex
+  \mathunderscore
+  \let\\ = \mathbackslash
+  \mathactive
+  % make the texinfo accent commands work in math mode
+  \let\"=\ddot
+  \let\'=\acute
+  \let\==\bar
+  \let\^=\hat
+  \let\`=\grave
+  \let\u=\breve
+  \let\v=\check
+  \let\~=\tilde
+  \let\dotaccent=\dot
+  $\finishmath
+}
+\def\finishmath#1{#1$\endgroup}  % Close the group opened by \tex.
+
+% Some active characters (such as <) are spaced differently in math.
+% We have to reset their definitions in case the @math was an argument
+% to a command which sets the catcodes (such as @item or @section).
+%
+{
+  \catcode`^ = \active
+  \catcode`< = \active
+  \catcode`> = \active
+  \catcode`+ = \active
+  \catcode`' = \active
+  \gdef\mathactive{%
+    \let^ = \ptexhat
+    \let< = \ptexless
+    \let> = \ptexgtr
+    \let+ = \ptexplus
+    \let' = \ptexquoteright
+  }
+}
+
+% ctrl is no longer a Texinfo command, but leave this definition for fun.
+\def\ctrl #1{{\tt \rawbackslash \hat}#1}
+
+% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}.
+% Ignore unless FMTNAME == tex; then it is like @iftex and @tex,
+% except specified as a normal braced arg, so no newlines to worry about.
+% 
+\def\outfmtnametex{tex}
+%
+\long\def\inlinefmt#1{\doinlinefmt #1,\finish}
+\long\def\doinlinefmt#1,#2,\finish{%
+  \def\inlinefmtname{#1}%
+  \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi
+}
+% For raw, must switch into @tex before parsing the argument, to avoid
+% setting catcodes prematurely.  Doing it this way means that, for
+% example, @inlineraw{html, foo{bar} gets a parse error instead of being
+% ignored.  But this isn't important because if people want a literal
+% *right* brace they would have to use a command anyway, so they may as
+% well use a command to get a left brace too.  We could re-use the
+% delimiter character idea from \verb, but it seems like overkill.
+% 
+\long\def\inlineraw{\tex \doinlineraw}
+\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
+\def\doinlinerawtwo#1,#2,\finish{%
+  \def\inlinerawname{#1}%
+  \ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi
+  \endgroup % close group opened by \tex.
 }
 
 
 \message{glyphs,}
+% and logos.
+
+% @@ prints an @, as does @atchar{}.
+\def\@{\char64 }
+\let\atchar=\@
+
+% @{ @} @lbracechar{} @rbracechar{} all generate brace characters.
+% Unless we're in typewriter, use \ecfont because the CM text fonts do
+% not have braces, and we don't want to switch into math.
+\def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}}
+\def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}}
+\let\{=\mylbrace \let\lbracechar=\{
+\let\}=\myrbrace \let\rbracechar=\}
+\begingroup
+  % Definitions to produce \{ and \} commands for indices,
+  % and @{ and @} for the aux/toc files.
+  \catcode`\{ = \other \catcode`\} = \other
+  \catcode`\ = 1 \catcode`\ = 2
+  \catcode`\! = 0 \catcode`\\ = \other
+  !gdef!lbracecmd\{%
+  !gdef!rbracecmd\}%
+  !gdef!lbraceatcmd@{%
+  !gdef!rbraceatcmd@}%
+!endgroup
+
+% @comma{} to avoid , parsing problems.
+\let\comma = ,
+
+% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
+% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
+\let\, = \ptexc
+\let\dotaccent = \ptexdot
+\def\ringaccent#1{{\accent23 #1}}
+\let\tieaccent = \ptext
+\let\ubaraccent = \ptexb
+\let\udotaccent = \d
+
+% Other special characters: @questiondown @exclamdown @ordf @ordm
+% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
+\def\questiondown{?`}
+\def\exclamdown{!`}
+\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
+\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
+
+% Dotless i and dotless j, used for accents.
+\def\imacro{i}
+\def\jmacro{j}
+\def\dotless#1{%
+  \def\temp{#1}%
+  \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi
+  \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi
+  \else \errmessage{@dotless can be used only with i or j}%
+  \fi\fi
+}
+
+% The \TeX{} logo, as in plain, but resetting the spacing so that a
+% period following counts as ending a sentence.  (Idea found in latex.)
+%
+\edef\TeX{\TeX \spacefactor=1000 }
+
+% @LaTeX{} logo.  Not quite the same results as the definition in
+% latex.ltx, since we use a different font for the raised A; it's most
+% convenient for us to use an explicitly smaller font, rather than using
+% the \scriptstyle font (since we don't reset \scriptstyle and
+% \scriptscriptstyle).
+%
+\def\LaTeX{%
+  L\kern-.36em
+  {\setbox0=\hbox{T}%
+   \vbox to \ht0{\hbox{%
+     \ifx\textnominalsize\xwordpt
+       % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX.
+       % Revert to plain's \scriptsize, which is 7pt.
+       \count255=\the\fam $\fam\count255 \scriptstyle A$%
+     \else
+       % For 11pt, we can use our lllsize.
+       \selectfonts\lllsize A%
+     \fi
+     }%
+     \vss
+  }}%
+  \kern-.15em
+  \TeX
+}
+
+% Some math mode symbols.
+\def\bullet{$\ptexbullet$}
+\def\geq{\ifmmode \ge\else $\ge$\fi}
+\def\leq{\ifmmode \le\else $\le$\fi}
+\def\minus{\ifmmode -\else $-$\fi}
+
+% @dots{} outputs an ellipsis using the current font.
+% We do .5em per period so that it has the same spacing in the cm
+% typewriter fonts as three actual period characters; on the other hand,
+% in other typewriter fonts three periods are wider than 1.5em.  So do
+% whichever is larger.
+%
+\def\dots{%
+  \leavevmode
+  \setbox0=\hbox{...}% get width of three periods
+  \ifdim\wd0 > 1.5em
+    \dimen0 = \wd0
+  \else
+    \dimen0 = 1.5em
+  \fi
+  \hbox to \dimen0{%
+    \hskip 0pt plus.25fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus.5fil
+  }%
+}
+
+% @enddots{} is an end-of-sentence ellipsis.
+%
+\def\enddots{%
+  \dots
+  \spacefactor=\endofsentencespacefactor
+}
 
 % @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
 %
@@ -2842,7 +3026,7 @@
 {\tentt \global\dimen0 = 3em}% Width of the box.
 \dimen2 = .55pt % Thickness of rules
 % The text. (`r' is open on the right, `e' somewhat less so on the left.)
-\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
+\setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt}
 %
 \setbox\errorbox=\hbox to \dimen0{\hfil
    \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
@@ -2963,12 +3147,17 @@
   % hopefully nobody will notice/care.
   \edef\ecsize{\csname\curfontsize ecsize\endcsname}%
   \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
-  \ifx\curfontstyle\bfstylename
-    % bold:
-    \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
-  \else
-    % regular:
-    \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
+  \ifmonospace
+    % typewriter:
+    \font\thisecfont = ectt\ecsize \space at \nominalsize
+  \else
+    \ifx\curfontstyle\bfstylename
+      % bold:
+      \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
+    \else
+      % regular:
+      \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
+    \fi
   \fi
   \thisecfont
 }
@@ -2991,7 +3180,7 @@
 %  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
 % so we'll define it if necessary.
 %
-\ifx\Orb\undefined
+\ifx\Orb\thisisundefined
 \def\Orb{\mathhexbox20D}
 \fi
 
@@ -3019,8 +3208,9 @@
 \newif\ifsetshortcontentsaftertitlepage
  \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
 
-\parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
-        \endgroup\page\hbox{}\page}
+\parseargdef\shorttitlepage{%
+  \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}%
+  \endgroup\page\hbox{}\page}
 
 \envdef\titlepage{%
   % Open one extra group, as we want to close it in the middle of \Etitlepage.
@@ -3080,14 +3270,28 @@
   \finishedtitlepagetrue
 }
 
-%%% Macros to be used within @titlepage:
+% Settings used for typesetting titles: no hyphenation, no indentation,
+% don't worry much about spacing, ragged right.  This should be used
+% inside a \vbox, and fonts need to be set appropriately first.  Because
+% it is always used for titles, nothing else, we call \rmisbold.  \par
+% should be specified before the end of the \vbox, since a vbox is a group.
+% 
+\def\raggedtitlesettings{%
+  \rmisbold
+  \hyphenpenalty=10000
+  \parindent=0pt
+  \tolerance=5000
+  \ptexraggedright
+}
+
+% Macros to be used within @titlepage:
 
 \let\subtitlerm=\tenrm
 \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
 
 \parseargdef\title{%
   \checkenv\titlepage
-  \leftline{\titlefonts\rmisbold #1}
+  \vbox{\titlefonts \raggedtitlesettings #1\par}%
   % print a rule at the page bottom also.
   \finishedtitlepagefalse
   \vskip4pt \hrule height 4pt width \hsize \vskip4pt
@@ -3113,7 +3317,7 @@
 }
 
 
-%%% Set up page headings and footings.
+% Set up page headings and footings.
 
 \let\thispage=\folio
 
@@ -3207,10 +3411,14 @@
 
 \def\headings #1 {\csname HEADINGS#1\endcsname}
 
-\def\HEADINGSoff{%
-\global\evenheadline={\hfil} \global\evenfootline={\hfil}
-\global\oddheadline={\hfil} \global\oddfootline={\hfil}}
-\HEADINGSoff
+\def\headingsoff{% non-global headings elimination
+  \evenheadline={\hfil}\evenfootline={\hfil}%
+   \oddheadline={\hfil}\oddfootline={\hfil}%
+}
+
+\def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting
+\HEADINGSoff  % it's the default
+
 % When we turn headings on, set the page number to 1.
 % For double-sided printing, put current file name in lower left corner,
 % chapter name on inside top of right hand pages, document
@@ -3261,7 +3469,7 @@
 % This produces Day Month Year style of output.
 % Only define if not already defined, in case a txi-??.tex file has set
 % up a different format (e.g., txi-cs.tex does this).
-\ifx\today\undefined
+\ifx\today\thisisundefined
 \def\today{%
   \number\day\space
   \ifcase\month
@@ -3322,7 +3530,7 @@
     \begingroup
       \advance\leftskip by-\tableindent
       \advance\hsize by\tableindent
-      \advance\rightskip by0pt plus1fil
+      \advance\rightskip by0pt plus1fil\relax
       \leavevmode\unhbox0\par
     \endgroup
     %
@@ -3808,18 +4016,18 @@
 \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
 \global\advance\multitablelinespace by-\ht0
 \fi
-%% Test to see if parskip is larger than space between lines of
-%% table. If not, do nothing.
-%%        If so, set to same dimension as multitablelinespace.
+% Test to see if parskip is larger than space between lines of
+% table. If not, do nothing.
+%        If so, set to same dimension as multitablelinespace.
 \ifdim\multitableparskip>\multitablelinespace
 \global\multitableparskip=\multitablelinespace
-\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
-                                      %% than skip between lines in the table.
+\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller
+                                      % than skip between lines in the table.
 \fi%
 \ifdim\multitableparskip=0pt
 \global\multitableparskip=\multitablelinespace
-\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
-                                      %% than skip between lines in the table.
+\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller
+                                      % than skip between lines in the table.
 \fi}
 
 
@@ -3980,7 +4188,7 @@
     % ..., but we might end up with active ones in the argument if
     % we're called from @code, as @code{@value{foo-bar_}}, though.
     % So \let them to their normal equivalents.
-    \let-\realdash \let_\normalunderscore
+    \let-\normaldash \let_\normalunderscore
   }
 }
 
@@ -4020,7 +4228,7 @@
 }
 \def\ifsetfail{\doignore{ifset}}
 
-% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
+% @ifclear VAR ... @end executes the `...' iff VAR has never been
 % defined with @set, or has been undefined with @clear.
 %
 % The `\else' inside the `\doifset' parameter is a trick to reuse the
@@ -4031,6 +4239,35 @@
 \def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
 \def\ifclearfail{\doignore{ifclear}}
 
+% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written
+% without the @) is in fact defined.  We can only feasibly check at the
+% TeX level, so something like `mathcode' is going to considered
+% defined even though it is not a Texinfo command.
+% 
+\makecond{ifcommanddefined}
+\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}}
+%
+\def\doifcmddefined#1#2{{%
+    \makevalueexpandable
+    \let\next=\empty
+    \expandafter\ifx\csname #2\endcsname\relax
+      #1% If not defined, \let\next as above.
+    \fi
+    \expandafter
+  }\next
+}
+\def\ifcmddefinedfail{\doignore{ifcommanddefined}}
+
+% @ifcommandnotdefined CMD ... handled similar to @ifclear above.
+\makecond{ifcommandnotdefined}
+\def\ifcommandnotdefined{%
+  \parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}}
+\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}}
+
+% Set the `txicommandconditionals' variable, so documents have a way to
+% test if the @ifcommand...defined conditionals are available.
+\set txicommandconditionals
+
 % @dircategory CATEGORY  -- specify a category of the dir file
 % which this file should belong to.  Ignore this in TeX.
 \let\dircategory=\comment
@@ -4134,11 +4371,14 @@
   \def\@{@}% change to @@ when we switch to @ as escape char in index files.
   \def\ {\realbackslash\space }%
   %
-  % Need these in case \tex is in effect and \{ is a \delimiter again.
-  % But can't use \lbracecmd and \rbracecmd because texindex assumes
-  % braces and backslashes are used only as delimiters.
-  \let\{ = \mylbrace
-  \let\} = \myrbrace
+  % Need these unexpandable (because we define \tt as a dummy)
+  % definitions when @{ or @} appear in index entry text.  Also, more
+  % complicated, when \tex is in effect and \{ is a \delimiter again.
+  % We can't use \lbracecmd and \rbracecmd because texindex assumes
+  % braces and backslashes are used only as delimiters.  Perhaps we
+  % should define @lbrace and @rbrace commands a la @comma.
+  \def\{{{\tt\char123}}%
+  \def\}{{\tt\char125}}%
   %
   % I don't entirely understand this, but when an index entry is
   % generated from a macro call, the \endinput which \scanmacro inserts
@@ -4191,7 +4431,7 @@
 \def\commondummies{%
   %
   % \definedummyword defines \#1 as \string\#1\space, thus effectively
-  % preventing its expansion.  This is used only for control% words,
+  % preventing its expansion.  This is used only for control words,
   % not control letters, because the \space would be incorrect for
   % control characters, but is needed to separate the control word
   % from whatever follows.
@@ -4210,6 +4450,7 @@
   \commondummiesnofonts
   %
   \definedummyletter\_%
+  \definedummyletter\-%
   %
   % Non-English letters.
   \definedummyword\AA
@@ -4246,20 +4487,25 @@
   \definedummyword\TeX
   %
   % Assorted special characters.
+  \definedummyword\arrow
   \definedummyword\bullet
   \definedummyword\comma
   \definedummyword\copyright
   \definedummyword\registeredsymbol
   \definedummyword\dots
   \definedummyword\enddots
+  \definedummyword\entrybreak
   \definedummyword\equiv
   \definedummyword\error
   \definedummyword\euro
+  \definedummyword\expansion
+  \definedummyword\geq
   \definedummyword\guillemetleft
   \definedummyword\guillemetright
   \definedummyword\guilsinglleft
   \definedummyword\guilsinglright
-  \definedummyword\expansion
+  \definedummyword\lbracechar
+  \definedummyword\leq
   \definedummyword\minus
   \definedummyword\ogonek
   \definedummyword\pounds
@@ -4271,6 +4517,7 @@
   \definedummyword\quoteleft
   \definedummyword\quoteright
   \definedummyword\quotesinglbase
+  \definedummyword\rbracechar
   \definedummyword\result
   \definedummyword\textdegree
   %
@@ -4316,19 +4563,27 @@
   \definedummyword\b
   \definedummyword\i
   \definedummyword\r
+  \definedummyword\sansserif
   \definedummyword\sc
+  \definedummyword\slanted
   \definedummyword\t
   %
   % Commands that take arguments.
+  \definedummyword\abbr
   \definedummyword\acronym
+  \definedummyword\anchor
   \definedummyword\cite
   \definedummyword\code
   \definedummyword\command
   \definedummyword\dfn
+  \definedummyword\dmn
   \definedummyword\email
   \definedummyword\emph
   \definedummyword\env
   \definedummyword\file
+  \definedummyword\image
+  \definedummyword\indicateurl
+  \definedummyword\inforef
   \definedummyword\kbd
   \definedummyword\key
   \definedummyword\math
@@ -4356,7 +4611,7 @@
   \def\definedummyaccent##1{\let##1\asis}%
   % We can just ignore other control letters.
   \def\definedummyletter##1{\let##1\empty}%
-  % Hopefully, all control words can become @asis.
+  % All control words become @asis by default; overrides below.
   \let\definedummyword\definedummyaccent
   %
   \commondummiesnofonts
@@ -4368,8 +4623,17 @@
   %
   \def\ { }%
   \def\@{@}%
-  % how to handle braces?
   \def\_{\normalunderscore}%
+  \def\-{}% @- shouldn't affect sorting
+  %
+  % Unfortunately, texindex is not prepared to handle braces in the
+  % content at all.  So for index sorting, we map @{ and @} to strings
+  % starting with |, since that ASCII character is between ASCII { and }.
+  \def\{{|a}%
+  \def\lbracechar{|a}%
+  %
+  \def\}{|b}%
+  \def\rbracechar{|b}%
   %
   % Non-English letters.
   \def\AA{AA}%
@@ -4397,6 +4661,7 @@
   %
   % Assorted special characters.
   % (The following {} will end up in the sort string, but that's ok.)
+  \def\arrow{->}%
   \def\bullet{bullet}%
   \def\comma{,}%
   \def\copyright{copyright}%
@@ -4406,10 +4671,12 @@
   \def\error{error}%
   \def\euro{euro}%
   \def\expansion{==>}%
+  \def\geq{>=}%
   \def\guillemetleft{<<}%
   \def\guillemetright{>>}%
   \def\guilsinglleft{<}%
   \def\guilsinglright{>}%
+  \def\leq{<=}%
   \def\minus{-}%
   \def\point{.}%
   \def\pounds{pounds}%
@@ -4424,6 +4691,9 @@
   \def\result{=>}%
   \def\textdegree{o}%
   %
+  \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax
+  \else \indexlquoteignore \fi
+  %
   % We need to get rid of all macros, leaving only the arguments (if present).
   % Of course this is not nearly correct, but it is the best we can do for now.
   % makeinfo does not expand macros in the argument to @deffn, which ends up
@@ -4437,6 +4707,11 @@
   \macrolist
 }
 
+% Undocumented (for FSFS 2nd ed.): @set txiindexlquoteignore makes us
+% ignore left quotes in the sort term.
+{\catcode`\`=\active
+ \gdef\indexlquoteignore{\let`=\empty}}
+
 \let\indexbackslash=0  %overridden during \printindex.
 \let\SETmarginindex=\relax % put index entries in margin (undocumented)?
 
@@ -4534,10 +4809,9 @@
 %
 % ..., ready, GO:
 %
-\def\safewhatsit#1{%
-\ifhmode
+\def\safewhatsit#1{\ifhmode
   #1%
-\else
+ \else
   % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
   \whatsitskip = \lastskip
   \edef\lastskipmacro{\the\lastskip}%
@@ -4561,7 +4835,6 @@
     % to re-insert the same penalty (values >10000 are used for various
     % signals); since we just inserted a non-discardable item, any
     % following glue (such as a \parskip) would be a breakpoint.  For example:
-    %
     %   @deffn deffn-whatever
     %   @vindex index-whatever
     %   Description.
@@ -4574,8 +4847,7 @@
     % (the whatsit from the \write), so we must insert a \nobreak.
     \nobreak\vskip\whatsitskip
   \fi
-\fi
-}
+\fi}
 
 % The index entry written in the file actually looks like
 %  \entry {sortstring}{page}{topic}
@@ -4694,7 +4966,6 @@
 % But this freezes the catcodes in the argument, and can cause problems to
 % @code, which sets - active.  This problem was fixed by a kludge---
 % ``-'' was active throughout whole index, but this isn't really right.
-%
 % The right solution is to prevent \entry from swallowing the whole text.
 %                                 --kasal, 21nov03
 \def\entry{%
@@ -4731,10 +5002,17 @@
     % columns.
     \vskip 0pt plus1pt
     %
+    % When reading the text of entry, convert explicit line breaks
+    % from @* into spaces.  The user might give these in long section
+    % titles, for instance.
+    \def\*{\unskip\space\ignorespaces}%
+    \def\entrybreak{\hfil\break}%
+    %
     % Swallow the left brace of the text (first parameter):
     \afterassignment\doentry
     \let\temp =
 }
+\def\entrybreak{\unskip\space\ignorespaces}%
 \def\doentry{%
     \bgroup % Instead of the swallowed brace.
       \noindent
@@ -4967,7 +5245,22 @@
 \message{sectioning,}
 % Chapters, sections, etc.
 
-% \unnumberedno is an oxymoron, of course.  But we count the unnumbered
+% Let's start with @part.
+\outer\parseargdef\part{\partzzz{#1}}
+\def\partzzz#1{%
+  \chapoddpage
+  \null
+  \vskip.3\vsize  % move it down on the page a bit
+  \begingroup
+    \noindent \titlefonts\rmisbold #1\par % the text
+    \let\lastnode=\empty      % no node to associate with
+    \writetocentry{part}{#1}{}% but put it in the toc
+    \headingsoff              % no headline or footline on the part page
+    \chapoddpage
+  \endgroup
+}
+
+% \unnumberedno is an oxymoron.  But we count the unnumbered
 % sections so that we can refer to them unambiguously in the pdf
 % outlines by their "section number".  We avoid collisions with chapter
 % numbers by starting them at 10000.  (If a document ever has 10000
@@ -5046,8 +5339,8 @@
 \chardef\maxseclevel = 3
 %
 % A numbered section within an unnumbered changes to unnumbered too.
-% To achive this, remember the "biggest" unnum. sec. we are currently in:
-\chardef\unmlevel = \maxseclevel
+% To achieve this, remember the "biggest" unnum. sec. we are currently in:
+\chardef\unnlevel = \maxseclevel
 %
 % Trace whether the current chapter is an appendix or not:
 % \chapheadtype is "N" or "A", unnumbered chapters are ignored.
@@ -5072,8 +5365,8 @@
   % The heading type:
   \def\headtype{#1}%
   \if \headtype U%
-    \ifnum \absseclevel < \unmlevel
-      \chardef\unmlevel = \absseclevel
+    \ifnum \absseclevel < \unnlevel
+      \chardef\unnlevel = \absseclevel
     \fi
   \else
     % Check for appendix sections:
@@ -5085,10 +5378,10 @@
       \fi\fi
     \fi
     % Check for numbered within unnumbered:
-    \ifnum \absseclevel > \unmlevel
+    \ifnum \absseclevel > \unnlevel
       \def\headtype{U}%
     \else
-      \chardef\unmlevel = 3
+      \chardef\unnlevel = 3
     \fi
   \fi
   % Now print the heading:
@@ -5174,7 +5467,8 @@
   \global\let\subsubsection = \appendixsubsubsec
 }
 
-\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
+% normally unnmhead0 calls unnumberedzzz:
+\outer\parseargdef\unnumbered{\unnmhead0{#1}}
 \def\unnumberedzzz#1{%
   \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
     \global\advance\unnumberedno by 1
@@ -5218,40 +5512,47 @@
 \let\top\unnumbered
 
 % Sections.
+% 
 \outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz
 \def\seczzz#1{%
   \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
   \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}%
 }
 
-\outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz
+% normally calls appendixsectionzzz:
+\outer\parseargdef\appendixsection{\apphead1{#1}}
 \def\appendixsectionzzz#1{%
   \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
   \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}%
 }
 \let\appendixsec\appendixsection
 
-\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz
+% normally calls unnumberedseczzz:
+\outer\parseargdef\unnumberedsec{\unnmhead1{#1}}
 \def\unnumberedseczzz#1{%
   \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
   \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}%
 }
 
 % Subsections.
-\outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz
+% 
+% normally calls numberedsubseczzz:
+\outer\parseargdef\numberedsubsec{\numhead2{#1}}
 \def\numberedsubseczzz#1{%
   \global\subsubsecno=0  \global\advance\subsecno by 1
   \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}%
 }
 
-\outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz
+% normally calls appendixsubseczzz:
+\outer\parseargdef\appendixsubsec{\apphead2{#1}}
 \def\appendixsubseczzz#1{%
   \global\subsubsecno=0  \global\advance\subsecno by 1
   \sectionheading{#1}{subsec}{Yappendix}%
                  {\appendixletter.\the\secno.\the\subsecno}%
 }
 
-\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
+% normally calls unnumberedsubseczzz:
+\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}}
 \def\unnumberedsubseczzz#1{%
   \global\subsubsecno=0  \global\advance\subsecno by 1
   \sectionheading{#1}{subsec}{Ynothing}%
@@ -5259,21 +5560,25 @@
 }
 
 % Subsubsections.
-\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz
+% 
+% normally numberedsubsubseczzz:
+\outer\parseargdef\numberedsubsubsec{\numhead3{#1}}
 \def\numberedsubsubseczzz#1{%
   \global\advance\subsubsecno by 1
   \sectionheading{#1}{subsubsec}{Ynumbered}%
                  {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}%
 }
 
-\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz
+% normally appendixsubsubseczzz:
+\outer\parseargdef\appendixsubsubsec{\apphead3{#1}}
 \def\appendixsubsubseczzz#1{%
   \global\advance\subsubsecno by 1
   \sectionheading{#1}{subsubsec}{Yappendix}%
                  {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}%
 }
 
-\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
+% normally unnumberedsubsubseczzz:
+\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}}
 \def\unnumberedsubsubseczzz#1{%
   \global\advance\subsubsecno by 1
   \sectionheading{#1}{subsubsec}{Ynothing}%
@@ -5289,14 +5594,6 @@
 
 % Define @majorheading, @heading and @subheading
 
-% NOTE on use of \vbox for chapter headings, section headings, and such:
-%       1) We use \vbox rather than the earlier \line to permit
-%          overlong headings to fold.
-%       2) \hyphenpenalty is set to 10000 because hyphenation in a
-%          heading is obnoxious; this forbids it.
-%       3) Likewise, headings look best if no \parindent is used, and
-%          if justification is not attempted.  Hence \raggedright.
-
 \def\majorheading{%
   {\advance\chapheadingskip by 10pt \chapbreak }%
   \parsearg\chapheadingzzz
@@ -5304,10 +5601,8 @@
 
 \def\chapheading{\chapbreak \parsearg\chapheadingzzz}
 \def\chapheadingzzz#1{%
-  {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                    \parindent=0pt\ptexraggedright
-                    \rmisbold #1\hfill}}%
-  \bigskip \par\penalty 200\relax
+  \vbox{\chapfonts \raggedtitlesettings #1\par}%
+  \nobreak\bigskip \nobreak
   \suppressfirstparagraphindent
 }
 
@@ -5323,14 +5618,13 @@
 % (including whitespace, linebreaking, etc. around it),
 % given all the information in convenient, parsed form.
 
-%%% Args are the skip and penalty (usually negative)
+% Args are the skip and penalty (usually negative)
 \def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
 
-%%% Define plain chapter starts, and page on/off switching for it
 % Parameter controlling skip before chapter headings (if needed)
-
 \newskip\chapheadingskip
 
+% Define plain chapter starts, and page on/off switching for it.
 \def\chapbreak{\dobreak \chapheadingskip {-4000}}
 \def\chappager{\par\vfill\supereject}
 % Because \domark is called before \chapoddpage, the filler page will
@@ -5340,9 +5634,8 @@
   \chappager
   \ifodd\pageno \else
     \begingroup
-      \evenheadline={\hfil}\evenfootline={\hfil}%
-      \oddheadline={\hfil}\oddfootline={\hfil}%
-      \hbox to 0pt{}%
+      \headingsoff
+      \null
       \chappager
     \endgroup
   \fi
@@ -5468,8 +5761,7 @@
     %
     % Typeset the actual heading.
     \nobreak % Avoid page breaks at the interline glue.
-    \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
-          \hangindent=\wd0 \centerparametersmaybe
+    \vbox{\raggedtitlesettings \hangindent=\wd0 \centerparametersmaybe
           \unhbox0 #1\par}%
   }%
   \nobreak\bigskip % no page break after a chapter title
@@ -5491,18 +5783,18 @@
 \def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
 %
 \def\unnchfopen #1{%
-\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                       \parindent=0pt\ptexraggedright
-                       \rmisbold #1\hfill}}\bigskip \par\nobreak
+  \chapoddpage
+  \vbox{\chapfonts \raggedtitlesettings #1\par}%
+  \nobreak\bigskip\nobreak
 }
 \def\chfopen #1#2{\chapoddpage {\chapfonts
 \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
 \par\penalty 5000 %
 }
 \def\centerchfopen #1{%
-\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                       \parindent=0pt
-                       \hfill {\rmisbold #1}\hfill}}\bigskip \par\nobreak
+  \chapoddpage
+  \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}%
+  \nobreak\bigskip \nobreak
 }
 \def\CHAPFopen{%
   \global\let\chapmacro=\chfopen
@@ -5534,6 +5826,8 @@
 %
 \def\sectionheading#1#2#3#4{%
   {%
+    \checkenv{}% should not be in an environment.
+    %
     % Switch to the right set of fonts.
     \csname #2fonts\endcsname \rmisbold
     %
@@ -5645,15 +5939,15 @@
   %
   % We'll almost certainly start a paragraph next, so don't let that
   % glue accumulate.  (Not a breakpoint because it's preceded by a
-  % discardable item.)
+  % discardable item.)  However, when a paragraph is not started next
+  % (\startdefun, \cartouche, \center, etc.), this needs to be wiped out
+  % or the negative glue will cause weirdly wrong output, typically
+  % obscuring the section heading with something else.
   \vskip-\parskip
   %
-  % This is purely so the last item on the list is a known \penalty >
-  % 10000.  This is so \startdefun can avoid allowing breakpoints after
-  % section headings.  Otherwise, it would insert a valid breakpoint between:
-  %
-  %   @section sec-whatever
-  %   @deffn def-whatever
+  % This is so the last item on the main vertical list is a known
+  % \penalty > 10000, so \startdefun, etc., can recognize the situation
+  % and do the needful.
   \penalty 10001
 }
 
@@ -5785,6 +6079,7 @@
 \def\summarycontents{%
   \startcontents{\putwordShortTOC}%
     %
+    \let\partentry = \shortpartentry
     \let\numchapentry = \shortchapentry
     \let\appentry = \shortchapentry
     \let\unnchapentry = \shortunnchapentry
@@ -5840,6 +6135,19 @@
 % The last argument is the page number.
 % The arguments in between are the chapter number, section number, ...
 
+% Parts, in the main contents.  Replace the part number, which doesn't
+% exist, with an empty box.  Let's hope all the numbers have the same width.
+% Also ignore the page number, which is conventionally not printed.
+\def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}}
+\def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}}
+%
+% Parts, in the short toc.
+\def\shortpartentry#1#2#3#4{%
+  \penalty-300
+  \vskip.5\baselineskip plus.15\baselineskip minus.1\baselineskip
+  \shortchapentry{{\bf #1}}{\numeralbox}{}{}%
+}
+
 % Chapters, in the main contents.
 \def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}}
 %
@@ -5929,9 +6237,9 @@
 \message{environments,}
 % @foo ... @end foo.
 
-% @tex ... @end tex    escapes into raw Tex temporarily.
+% @tex ... @end tex    escapes into raw TeX temporarily.
 % One exception: @ is still an escape character, so that @end tex works.
-% But \@ or @@ will get a plain tex @ character.
+% But \@ or @@ will get a plain @ character.
 
 \envdef\tex{%
   \setupmarkupstyle{tex}%
@@ -5948,6 +6256,10 @@
   \catcode`\'=\other
   \escapechar=`\\
   %
+  % ' is active in math mode (mathcode"8000).  So reset it, and all our
+  % other math active characters (just in case), to plain's definitions.
+  \mathactive
+  %
   \let\b=\ptexb
   \let\bullet=\ptexbullet
   \let\c=\ptexc
@@ -6051,6 +6363,12 @@
   \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
   % Flag to tell @lisp, etc., not to narrow margin.
   \let\nonarrowing = t%
+  %
+  % If this cartouche directly follows a sectioning command, we need the
+  % \parskip glue (backspaced over by default) or the cartouche can
+  % collide with the section heading.
+  \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi
+  %
   \vbox\bgroup
       \baselineskip=0pt\parskip=0pt\lineskip=0pt
       \carttop
@@ -6064,7 +6382,7 @@
 	      \lineskip=\normlskip
 	      \parskip=\normpskip
 	      \vskip -\parskip
-	      \comment % For explanation, see the end of \def\group.
+	      \comment % For explanation, see the end of def\group.
 }
 \def\Ecartouche{%
               \ifhmode\par\fi
@@ -6150,41 +6468,42 @@
 }
 
 % We often define two environments, @foo and @smallfoo.
-% Let's do it by one command:
-\def\makedispenv #1#2{
-  \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}
-  \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}
+% Let's do it in one command.  #1 is the env name, #2 the definition.
+\def\makedispenvdef#1#2{%
+  \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}%
+  \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}%
   \expandafter\let\csname E#1\endcsname \afterenvbreak
   \expandafter\let\csname Esmall#1\endcsname \afterenvbreak
 }
 
-% Define two synonyms:
-\def\maketwodispenvs #1#2#3{
-  \makedispenv{#1}{#3}
-  \makedispenv{#2}{#3}
+% Define two environment synonyms (#1 and #2) for an environment.
+\def\maketwodispenvdef#1#2#3{%
+  \makedispenvdef{#1}{#3}%
+  \makedispenvdef{#2}{#3}%
 }
-
-% @lisp: indented, narrowed, typewriter font; @example: same as @lisp.
+%
+% @lisp: indented, narrowed, typewriter font;
+% @example: same as @lisp.
 %
 % @smallexample and @smalllisp: use smaller fonts.
 % Originally contributed by Pavel@xerox.
 %
-\maketwodispenvs {lisp}{example}{%
+\maketwodispenvdef{lisp}{example}{%
   \nonfillstart
   \tt\setupmarkupstyle{example}%
   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
-  \gobble       % eat return
+  \gobble % eat return
 }
 % @display/@smalldisplay: same as @lisp except keep current font.
 %
-\makedispenv {display}{%
+\makedispenvdef{display}{%
   \nonfillstart
   \gobble
 }
 
 % @format/@smallformat: same as @display except don't narrow margins.
 %
-\makedispenv{format}{%
+\makedispenvdef{format}{%
   \let\nonarrowing = t%
   \nonfillstart
   \gobble
@@ -6203,7 +6522,7 @@
 \envdef\flushright{%
   \let\nonarrowing = t%
   \nonfillstart
-  \advance\leftskip by 0pt plus 1fill
+  \advance\leftskip by 0pt plus 1fill\relax
   \gobble
 }
 \let\Eflushright = \afterenvbreak
@@ -6238,43 +6557,28 @@
 % we're doing normal filling.  So, when using \aboveenvbreak and
 % \afterenvbreak, temporarily make \parskip 0.
 %
+\makedispenvdef{quotation}{\quotationstart}
+%
 \def\quotationstart{%
-  {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
-  \parindent=0pt
-  %
-  % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
+  \indentedblockstart % same as \indentedblock, but increase right margin too.
   \ifx\nonarrowing\relax
-    \advance\leftskip by \lispnarrowing
     \advance\rightskip by \lispnarrowing
-    \exdentamount = \lispnarrowing
-  \else
-    \let\nonarrowing = \relax
   \fi
   \parsearg\quotationlabel
 }
 
-\envdef\quotation{%
-  \setnormaldispenv
-  \quotationstart
-}
-
-\envdef\smallquotation{%
-  \setsmalldispenv
-  \quotationstart
-}
-\let\Esmallquotation = \Equotation
-
 % We have retained a nonzero parskip for the environment, since we're
 % doing normal filling.
 %
 \def\Equotation{%
   \par
-  \ifx\quotationauthor\undefined\else
+  \ifx\quotationauthor\thisisundefined\else
     % indent a bit.
     \leftline{\kern 2\leftskip \sl ---\quotationauthor}%
   \fi
   {\parskip=0pt \afterenvbreak}%
 }
+\def\Esmallquotation{\Equotation}
 
 % If we're given an argument, typeset it in bold with a colon after.
 \def\quotationlabel#1{%
@@ -6284,6 +6588,32 @@
   \fi
 }
 
+% @indentedblock is like @quotation, but indents only on the left and
+% has no optional argument.
+% 
+\makedispenvdef{indentedblock}{\indentedblockstart}
+%
+\def\indentedblockstart{%
+  {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
+  \parindent=0pt
+  %
+  % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
+  \ifx\nonarrowing\relax
+    \advance\leftskip by \lispnarrowing
+    \exdentamount = \lispnarrowing
+  \else
+    \let\nonarrowing = \relax
+  \fi
+}
+
+% Keep a nonzero parskip for the environment, since we're doing normal filling.
+%
+\def\Eindentedblock{%
+  \par
+  {\parskip=0pt \afterenvbreak}%
+}
+\def\Esmallindentedblock{\Eindentedblock}
+
 
 % LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>}
 % If we want to allow any <char> as delimiter,
@@ -6331,21 +6661,28 @@
 
 % Setup for the @verbatim environment
 %
-% Real tab expansion
+% Real tab expansion.
 \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
 %
-\def\starttabbox{\setbox0=\hbox\bgroup}
+% We typeset each line of the verbatim in an \hbox, so we can handle
+% tabs.  The \global is in case the verbatim line starts with an accent,
+% or some other command that starts with a begin-group.  Otherwise, the
+% entire \verbbox would disappear at the corresponding end-group, before
+% it is typeset.  Meanwhile, we can't have nested verbatim commands
+% (can we?), so the \global won't be overwriting itself.
+\newbox\verbbox
+\def\starttabbox{\global\setbox\verbbox=\hbox\bgroup}
 %
 \begingroup
   \catcode`\^^I=\active
   \gdef\tabexpand{%
     \catcode`\^^I=\active
     \def^^I{\leavevmode\egroup
-      \dimen0=\wd0 % the width so far, or since the previous tab
-      \divide\dimen0 by\tabw
-      \multiply\dimen0 by\tabw % compute previous multiple of \tabw
-      \advance\dimen0 by\tabw  % advance to next multiple of \tabw
-      \wd0=\dimen0 \box0 \starttabbox
+      \dimen\verbbox=\wd\verbbox % the width so far, or since the previous tab
+      \divide\dimen\verbbox by\tabw
+      \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw
+      \advance\dimen\verbbox by\tabw  % advance to next multiple of \tabw
+      \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox
     }%
   }
 \endgroup
@@ -6354,15 +6691,16 @@
 \def\setupverbatim{%
   \let\nonarrowing = t%
   \nonfillstart
-  % Easiest (and conventionally used) font for verbatim
-  \tt
-  \def\par{\leavevmode\egroup\box0\endgraf}%
+  \tt % easiest (and conventionally used) font for verbatim
+  % The \leavevmode here is for blank lines.  Otherwise, we would
+  % never \starttabox and the \egroup would end verbatim mode.
+  \def\par{\leavevmode\egroup\box\verbbox\endgraf}%
   \tabexpand
   \setupmarkupstyle{verbatim}%
   % Respect line breaks,
   % print special symbols as themselves, and
-  % make each space count
-  % must do in this order:
+  % make each space count.
+  % Must do in this order:
   \obeylines \uncatcodespecials \sepspaces
   \everypar{\starttabbox}%
 }
@@ -6419,6 +6757,7 @@
     \makevalueexpandable
     \setupverbatim
     \indexnofonts       % Allow `@@' and other weird things in file names.
+    \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}%
     \input #1
     \afterenvbreak
   }%
@@ -6468,7 +6807,7 @@
     % commands also insert a nobreak penalty, and we don't want to allow
     % a break between a section heading and a defun.
     %
-    % As a minor refinement, we avoid "club" headers by signalling
+    % As a further refinement, we avoid "club" headers by signalling
     % with penalty of 10003 after the very first @deffn in the
     % sequence (see above), and penalty of 10002 after any following
     % @def command.
@@ -6505,7 +6844,7 @@
     #1#2 \endheader
     % common ending:
     \interlinepenalty = 10000
-    \advance\rightskip by 0pt plus 1fil
+    \advance\rightskip by 0pt plus 1fil\relax
     \endgraf
     \nobreak\vskip -\parskip
     \penalty\defunpenalty  % signal to \startdefun and \dodefunx
@@ -6535,13 +6874,36 @@
 \def\domakedefun#1#2#3{%
   \envdef#1{%
     \startdefun
+    \doingtypefnfalse    % distinguish typed functions from all else
     \parseargusing\activeparens{\printdefunline#3}%
   }%
   \def#2{\dodefunx#1}%
   \def#3%
 }
 
-%%% Untyped functions:
+\newif\ifdoingtypefn       % doing typed function?
+\newif\ifrettypeownline    % typeset return type on its own line?
+
+% @deftypefnnewline on|off says whether the return type of typed functions
+% are printed on their own line.  This affects @deftypefn, @deftypefun,
+% @deftypeop, and @deftypemethod.
+% 
+\parseargdef\deftypefnnewline{%
+  \def\temp{#1}%
+  \ifx\temp\onword
+    \expandafter\let\csname SETtxideftypefnnl\endcsname
+      = \empty
+  \else\ifx\temp\offword
+    \expandafter\let\csname SETtxideftypefnnl\endcsname
+      = \relax
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @txideftypefnnl value `\temp',
+                must be on|off}%
+  \fi\fi
+}
+
+% Untyped functions:
 
 % @deffn category name args
 \makedefun{deffn}{\deffngeneral{}}
@@ -6560,7 +6922,7 @@
   \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
 }
 
-%%% Typed functions:
+% Typed functions:
 
 % @deftypefn category type name args
 \makedefun{deftypefn}{\deftypefngeneral{}}
@@ -6575,10 +6937,11 @@
 %
 \def\deftypefngeneral#1#2 #3 #4 #5\endheader{%
   \dosubind{fn}{\code{#4}}{#1}%
+  \doingtypefntrue
   \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
 }
 
-%%% Typed variables:
+% Typed variables:
 
 % @deftypevr category type var args
 \makedefun{deftypevr}{\deftypecvgeneral{}}
@@ -6596,7 +6959,7 @@
   \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
 }
 
-%%% Untyped variables:
+% Untyped variables:
 
 % @defvr category var args
 \makedefun{defvr}#1 {\deftypevrheader{#1} {} }
@@ -6607,7 +6970,8 @@
 % \defcvof {category of}class var args
 \def\defcvof#1#2 {\deftypecvof{#1}#2 {} }
 
-%%% Type:
+% Types:
+
 % @deftp category name args
 \makedefun{deftp}#1 #2 #3\endheader{%
   \doind{tp}{\code{#2}}%
@@ -6635,25 +6999,49 @@
 % We are followed by (but not passed) the arguments, if any.
 %
 \def\defname#1#2#3{%
+  \par
   % Get the values of \leftskip and \rightskip as they were outside the @def...
   \advance\leftskip by -\defbodyindent
   %
-  % How we'll format the type name.  Putting it in brackets helps
+  % Determine if we are typesetting the return type of a typed function
+  % on a line by itself.
+  \rettypeownlinefalse
+  \ifdoingtypefn  % doing a typed function specifically?
+    % then check user option for putting return type on its own line:
+    \expandafter\ifx\csname SETtxideftypefnnl\endcsname\relax \else
+      \rettypeownlinetrue
+    \fi
+  \fi
+  %
+  % How we'll format the category name.  Putting it in brackets helps
   % distinguish it from the body text that may end up on the next line
   % just below it.
   \def\temp{#1}%
   \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else \rm\temp\fi}
   %
-  % Figure out line sizes for the paragraph shape.
+  % Figure out line sizes for the paragraph shape.  We'll always have at
+  % least two.
+  \tempnum = 2
+  %
   % The first line needs space for \box0; but if \rightskip is nonzero,
   % we need only space for the part of \box0 which exceeds it:
   \dimen0=\hsize  \advance\dimen0 by -\wd0  \advance\dimen0 by \rightskip
+  %
+  % If doing a return type on its own line, we'll have another line.
+  \ifrettypeownline
+    \advance\tempnum by 1
+    \def\maybeshapeline{0in \hsize}%
+  \else
+    \def\maybeshapeline{}%
+  \fi
+  %
   % The continuations:
   \dimen2=\hsize  \advance\dimen2 by -\defargsindent
-  % (plain.tex says that \dimen1 should be used only as global.)
-  \parshape 2 0in \dimen0 \defargsindent \dimen2
   %
-  % Put the type name to the right margin.
+  % The final paragraph shape:
+  \parshape \tempnum  0in \dimen0  \maybeshapeline  \defargsindent \dimen2
+  %
+  % Put the category name at the right margin.
   \noindent
   \hbox to 0pt{%
     \hfil\box0 \kern-\hsize
@@ -6675,8 +7063,16 @@
     % . this still does not fix the ?` and !` ligatures, but so far no
     %   one has made identifiers using them :).
     \df \tt
-    \def\temp{#2}% return value type
-    \ifx\temp\empty\else \tclose{\temp} \fi
+    \def\temp{#2}% text of the return type
+    \ifx\temp\empty\else
+      \tclose{\temp}% typeset the return type
+      \ifrettypeownline
+        % put return type on its own line; prohibit line break following:
+        \hfil\vadjust{\nobreak}\break  
+      \else
+        \space  % type on same line, so just followed by a space
+      \fi
+    \fi           % no return type
     #3% output function name
   }%
   {\rm\enskip}% hskip 0.5 em of \tenrm
@@ -6696,7 +7092,10 @@
   \df \sl \hyphenchar\font=0
   %
   % On the other hand, if an argument has two dashes (for instance), we
-  % want a way to get ttsl.  Let's try @var for that.
+  % want a way to get ttsl.  We used to recommend @var for that, so
+  % leave the code in, but it's strange for @var to lead to typewriter.
+  % Nowadays we recommend @code, since the difference between a ttsl hyphen
+  % and a tt hyphen is pretty tiny.  @code also disables ?` !`.
   \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}%
   #1%
   \sl\hyphenchar\font=45
@@ -6794,7 +7193,7 @@
 
 % To do this right we need a feature of e-TeX, \scantokens,
 % which we arrange to emulate with a temporary file in ordinary TeX.
-\ifx\eTeXversion\undefined
+\ifx\eTeXversion\thisisundefined
   \newwrite\macscribble
   \def\scantokens#1{%
     \toks0={#1}%
@@ -6805,25 +7204,30 @@
   }
 \fi
 
-\def\scanmacro#1{%
-  \begingroup
-    \newlinechar`\^^M
-    \let\xeatspaces\eatspaces
-    % Undo catcode changes of \startcontents and \doprintindex
-    % When called from @insertcopying or (short)caption, we need active
-    % backslash to get it printed correctly.  Previously, we had
-    % \catcode`\\=\other instead.  We'll see whether a problem appears
-    % with macro expansion.				--kasal, 19aug04
-    \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
-    % ... and \example
-    \spaceisspace
-    %
-    % Append \endinput to make sure that TeX does not see the ending newline.
-    % I've verified that it is necessary both for e-TeX and for ordinary TeX
-    %							--kasal, 29nov03
-    \scantokens{#1\endinput}%
-  \endgroup
-}
+\def\scanmacro#1{\begingroup
+  \newlinechar`\^^M
+  \let\xeatspaces\eatspaces
+  %
+  % Undo catcode changes of \startcontents and \doprintindex
+  % When called from @insertcopying or (short)caption, we need active
+  % backslash to get it printed correctly.  Previously, we had
+  % \catcode`\\=\other instead.  We'll see whether a problem appears
+  % with macro expansion.				--kasal, 19aug04
+  \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
+  %
+  % ... and for \example:
+  \spaceisspace
+  %
+  % The \empty here causes a following catcode 5 newline to be eaten as
+  % part of reading whitespace after a control sequence.  It does not
+  % eat a catcode 13 newline.  There's no good way to handle the two
+  % cases (untried: maybe e-TeX's \everyeof could help, though plain TeX
+  % would then have different behavior).  See the Macro Details node in
+  % the manual for the workaround we recommend for macros and
+  % line-oriented commands.
+  % 
+  \scantokens{#1\empty}%
+\endgroup}
 
 \def\scanexp#1{%
   \edef\temp{\noexpand\scanmacro{#1}}%
@@ -6877,17 +7281,18 @@
 
 % Macro bodies are absorbed as an argument in a context where
 % all characters are catcode 10, 11 or 12, except \ which is active
-% (as in normal texinfo). It is necessary to change the definition of \.
-
+% (as in normal texinfo). It is necessary to change the definition of \
+% to recognize macro arguments; this is the job of \mbodybackslash.
+%
 % Non-ASCII encodings make 8-bit characters active, so un-activate
 % them to avoid their expansion.  Must do this non-globally, to
 % confine the change to the current group.
-
+%
 % It's necessary to have hard CRs when the macro is executed. This is
-% done by  making ^^M (\endlinechar) catcode 12 when reading the macro
+% done by making ^^M (\endlinechar) catcode 12 when reading the macro
 % body, and then making it the \newlinechar in \scanmacro.
-
-\def\scanctxt{%
+%
+\def\scanctxt{% used as subroutine
   \catcode`\"=\other
   \catcode`\+=\other
   \catcode`\<=\other
@@ -6900,13 +7305,13 @@
   \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi
 }
 
-\def\scanargctxt{%
+\def\scanargctxt{% used for copying and captions, not macros.
   \scanctxt
   \catcode`\\=\other
   \catcode`\^^M=\other
 }
 
-\def\macrobodyctxt{%
+\def\macrobodyctxt{% used for @macro definitions
   \scanctxt
   \catcode`\{=\other
   \catcode`\}=\other
@@ -6914,32 +7319,56 @@
   \usembodybackslash
 }
 
-\def\macroargctxt{%
+\def\macroargctxt{% used when scanning invocations
   \scanctxt
-  \catcode`\\=\other
+  \catcode`\\=0
 }
+% why catcode 0 for \ in the above?  To recognize \\ \{ \} as "escapes"
+% for the single characters \ { }.  Thus, we end up with the "commands"
+% that would be written @\ @{ @} in a Texinfo document.
+% 
+% We already have @{ and @}.  For @\, we define it here, and only for
+% this purpose, to produce a typewriter backslash (so, the @\ that we
+% define for @math can't be used with @macro calls):
+%
+\def\\{\normalbackslash}%
+% 
+% We would like to do this for \, too, since that is what makeinfo does.
+% But it is not possible, because Texinfo already has a command @, for a
+% cedilla accent.  Documents must use @comma{} instead.
+%
+% \anythingelse will almost certainly be an error of some kind.
+
 
 % \mbodybackslash is the definition of \ in @macro bodies.
 % It maps \foo\ => \csname macarg.foo\endcsname => #N
 % where N is the macro parameter number.
 % We define \csname macarg.\endcsname to be \realbackslash, so
 % \\ in macro replacement text gets you a backslash.
-
+%
 {\catcode`@=0 @catcode`@\=@active
  @gdef@usembodybackslash{@let\=@mbodybackslash}
  @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname}
 }
 \expandafter\def\csname macarg.\endcsname{\realbackslash}
 
+\def\margbackslash#1{\char`\#1 }
+
 \def\macro{\recursivefalse\parsearg\macroxxx}
 \def\rmacro{\recursivetrue\parsearg\macroxxx}
 
 \def\macroxxx#1{%
-  \getargs{#1}%           now \macname is the macname and \argl the arglist
+  \getargs{#1}% now \macname is the macname and \argl the arglist
   \ifx\argl\empty       % no arguments
-     \paramno=0%
+     \paramno=0\relax
   \else
      \expandafter\parsemargdef \argl;%
+     \if\paramno>256\relax
+       \ifx\eTeXversion\thisisundefined
+         \errhelp = \EMsimple
+         \errmessage{You need eTeX to compile a file with macros with more than 256 arguments}
+       \fi
+     \fi
   \fi
   \if1\csname ismacro.\the\macname\endcsname
      \message{Warning: redefining \the\macname}%
@@ -6986,46 +7415,269 @@
 % an opening brace, and that opening brace is not consumed.
 \def\getargs#1{\getargsxxx#1{}}
 \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs}
-\def\getmacname #1 #2\relax{\macname={#1}}
+\def\getmacname#1 #2\relax{\macname={#1}}
 \def\getmacargs#1{\def\argl{#1}}
 
+% For macro processing make @ a letter so that we can make Texinfo private macro names.
+\edef\texiatcatcode{\the\catcode`\@}
+\catcode `@=11\relax
+
 % Parse the optional {params} list.  Set up \paramno and \paramlist
-% so \defmacro knows what to do.  Define \macarg.blah for each blah
-% in the params list, to be ##N where N is the position in that list.
+% so \defmacro knows what to do.  Define \macarg.BLAH for each BLAH
+% in the params list to some hook where the argument si to be expanded.  If
+% there are less than 10 arguments that hook is to be replaced by ##N where N
+% is the position in that list, that is to say the macro arguments are to be
+% defined `a la TeX in the macro body.  
+%
 % That gets used by \mbodybackslash (above).
-
+%
 % We need to get `macro parameter char #' into several definitions.
-% The technique used is stolen from LaTeX:  let \hash be something
+% The technique used is stolen from LaTeX: let \hash be something
 % unexpandable, insert that wherever you need a #, and then redefine
 % it to # just before using the token list produced.
 %
 % The same technique is used to protect \eatspaces till just before
 % the macro is used.
-
-\def\parsemargdef#1;{\paramno=0\def\paramlist{}%
-        \let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,}
+%
+% If there are 10 or more arguments, a different technique is used, where the
+% hook remains in the body, and when macro is to be expanded the body is
+% processed again to replace the arguments.
+%
+% In that case, the hook is \the\toks N-1, and we simply set \toks N-1 to the
+% argument N value and then \edef  the body (nothing else will expand because of
+% the catcode regime underwhich the body was input).
+%
+% If you compile with TeX (not eTeX), and you have macros with 10 or more
+% arguments, you need that no macro has more than 256 arguments, otherwise an
+% error is produced.
+\def\parsemargdef#1;{%
+  \paramno=0\def\paramlist{}%
+  \let\hash\relax
+  \let\xeatspaces\relax
+  \parsemargdefxxx#1,;,%
+  % In case that there are 10 or more arguments we parse again the arguments
+  % list to set new definitions for the \macarg.BLAH macros corresponding to
+  % each BLAH argument. It was anyhow needed to parse already once this list
+  % in order to count the arguments, and as macros with at most 9 arguments
+  % are by far more frequent than macro with 10 or more arguments, defining
+  % twice the \macarg.BLAH macros does not cost too much processing power.
+  \ifnum\paramno<10\relax\else
+    \paramno0\relax
+    \parsemmanyargdef@@#1,;,% 10 or more arguments
+  \fi
+}
 \def\parsemargdefxxx#1,{%
   \if#1;\let\next=\relax
   \else \let\next=\parsemargdefxxx
-    \advance\paramno by 1%
+    \advance\paramno by 1
     \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
         {\xeatspaces{\hash\the\paramno}}%
     \edef\paramlist{\paramlist\hash\the\paramno,}%
   \fi\next}
 
+\def\parsemmanyargdef@@#1,{%
+  \if#1;\let\next=\relax
+  \else 
+    \let\next=\parsemmanyargdef@@
+    \edef\tempb{\eatspaces{#1}}%
+    \expandafter\def\expandafter\tempa
+       \expandafter{\csname macarg.\tempb\endcsname}%
+    % Note that we need some extra \noexpand\noexpand, this is because we
+    % don't want \the  to be expanded in the \parsermacbody  as it uses an
+    % \xdef .
+    \expandafter\edef\tempa
+      {\noexpand\noexpand\noexpand\the\toks\the\paramno}%
+    \advance\paramno by 1\relax
+  \fi\next}
+
 % These two commands read recursive and nonrecursive macro bodies.
 % (They're different since rec and nonrec macros end differently.)
+%
 
+\catcode `\@\texiatcatcode
 \long\def\parsemacbody#1@end macro%
 {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
 \long\def\parsermacbody#1@end rmacro%
 {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
+\catcode `\@=11\relax
+
+\let\endargs@\relax
+\let\nil@\relax
+\def\nilm@{\nil@}%
+\long\def\nillm@{\nil@}%
+
+% This macro is expanded during the Texinfo macro expansion, not during its
+% definition.  It gets all the arguments values and assigns them to macros
+% macarg.ARGNAME
+%
+% #1 is the macro name
+% #2 is the list of argument names
+% #3 is the list of argument values
+\def\getargvals@#1#2#3{%
+  \def\macargdeflist@{}%
+  \def\saveparamlist@{#2}% Need to keep a copy for parameter expansion.
+  \def\paramlist{#2,\nil@}%
+  \def\macroname{#1}%
+  \begingroup
+  \macroargctxt
+  \def\argvaluelist{#3,\nil@}%
+  \def\@tempa{#3}%
+  \ifx\@tempa\empty
+    \setemptyargvalues@
+  \else
+    \getargvals@@
+  \fi
+}
+
+% 
+\def\getargvals@@{%
+  \ifx\paramlist\nilm@
+      % Some sanity check needed here that \argvaluelist is also empty.
+      \ifx\argvaluelist\nillm@
+      \else
+        \errhelp = \EMsimple
+        \errmessage{Too many arguments in macro `\macroname'!}%
+      \fi
+      \let\next\macargexpandinbody@
+  \else
+    \ifx\argvaluelist\nillm@
+       % No more arguments values passed to macro.  Set remaining named-arg
+       % macros to empty.
+       \let\next\setemptyargvalues@
+    \else
+      % pop current arg name into \@tempb
+      \def\@tempa##1{\pop@{\@tempb}{\paramlist}##1\endargs@}%
+      \expandafter\@tempa\expandafter{\paramlist}%
+       % pop current argument value into \@tempc
+      \def\@tempa##1{\longpop@{\@tempc}{\argvaluelist}##1\endargs@}%
+      \expandafter\@tempa\expandafter{\argvaluelist}%
+       % Here \@tempb is the current arg name and \@tempc is the current arg value.
+       % First place the new argument macro definition into \@tempd
+       \expandafter\macname\expandafter{\@tempc}%
+       \expandafter\let\csname macarg.\@tempb\endcsname\relax
+       \expandafter\def\expandafter\@tempe\expandafter{%
+         \csname macarg.\@tempb\endcsname}%
+       \edef\@tempd{\long\def\@tempe{\the\macname}}%
+       \push@\@tempd\macargdeflist@
+       \let\next\getargvals@@
+    \fi
+  \fi
+  \next
+}
+
+\def\push@#1#2{%
+  \expandafter\expandafter\expandafter\def
+  \expandafter\expandafter\expandafter#2%
+  \expandafter\expandafter\expandafter{%
+  \expandafter#1#2}%
+}
+
+% Replace arguments by their values in the macro body, and place the result
+% in macro \@tempa
+\def\macvalstoargs@{%
+  %  To do this we use the property that token registers that are \the'ed
+  % within an \edef  expand only once. So we are going to place all argument
+  % values into respective token registers.
+  %
+  % First we save the token context, and initialize argument numbering.
+  \begingroup
+    \paramno0\relax
+    % Then, for each argument number #N, we place the corresponding argument
+    % value into a new token list register \toks#N
+    \expandafter\putargsintokens@\saveparamlist@,;,%
+    % Then, we expand the body so that argument are replaced by their
+    % values. The trick for values not to be expanded themselves is that they
+    % are within tokens and that tokens expand only once in an \edef .
+    \edef\@tempc{\csname mac.\macroname .body\endcsname}%
+    % Now we restore the token stack pointer to free the token list registers
+    % which we have used, but we make sure that expanded body is saved after
+    % group.
+    \expandafter
+  \endgroup
+  \expandafter\def\expandafter\@tempa\expandafter{\@tempc}%
+  }
+
+\def\macargexpandinbody@{% 
+  %% Define the named-macro outside of this group and then close this group. 
+  \expandafter
+  \endgroup
+  \macargdeflist@
+  % First the replace in body the macro arguments by their values, the result
+  % is in \@tempa .
+  \macvalstoargs@
+  % Then we point at the \norecurse or \gobble (for recursive) macro value
+  % with \@tempb .
+  \expandafter\let\expandafter\@tempb\csname mac.\macroname .recurse\endcsname
+  % Depending on whether it is recursive or not, we need some tailing
+  % \egroup .
+  \ifx\@tempb\gobble
+     \let\@tempc\relax
+  \else
+     \let\@tempc\egroup
+  \fi
+  % And now we do the real job:
+  \edef\@tempd{\noexpand\@tempb{\macroname}\noexpand\scanmacro{\@tempa}\@tempc}%
+  \@tempd
+}
+
+\def\putargsintokens@#1,{%
+  \if#1;\let\next\relax
+  \else
+    \let\next\putargsintokens@
+    % First we allocate the new token list register, and give it a temporary
+    % alias \@tempb .
+    \toksdef\@tempb\the\paramno
+    % Then we place the argument value into that token list register.
+    \expandafter\let\expandafter\@tempa\csname macarg.#1\endcsname
+    \expandafter\@tempb\expandafter{\@tempa}%
+    \advance\paramno by 1\relax
+  \fi
+  \next
+}
+
+% Save the token stack pointer into macro #1
+\def\texisavetoksstackpoint#1{\edef#1{\the\@cclvi}}
+% Restore the token stack pointer from number in macro #1
+\def\texirestoretoksstackpoint#1{\expandafter\mathchardef\expandafter\@cclvi#1\relax}
+% newtoks that can be used non \outer .
+\def\texinonouternewtoks{\alloc@ 5\toks \toksdef \@cclvi}
+
+% Tailing missing arguments are set to empty
+\def\setemptyargvalues@{%
+  \ifx\paramlist\nilm@
+    \let\next\macargexpandinbody@
+  \else
+    \expandafter\setemptyargvaluesparser@\paramlist\endargs@
+    \let\next\setemptyargvalues@
+  \fi
+  \next
+}
+
+\def\setemptyargvaluesparser@#1,#2\endargs@{%
+  \expandafter\def\expandafter\@tempa\expandafter{%
+    \expandafter\def\csname macarg.#1\endcsname{}}%
+  \push@\@tempa\macargdeflist@
+  \def\paramlist{#2}%
+}
+
+% #1 is the element target macro
+% #2 is the list macro
+% #3,#4\endargs@ is the list value
+\def\pop@#1#2#3,#4\endargs@{%
+   \def#1{#3}%
+   \def#2{#4}%
+}
+\long\def\longpop@#1#2#3,#4\endargs@{%
+   \long\def#1{#3}%
+   \long\def#2{#4}%
+}
 
-% This defines the macro itself. There are six cases: recursive and
-% nonrecursive macros of zero, one, and many arguments.
+% This defines a Texinfo @macro. There are eight cases: recursive and
+% nonrecursive macros of zero, one, up to nine, and many arguments.
 % Much magic with \expandafter here.
 % \xdef is used so that macro definitions will survive the file
 % they're defined in; @include reads the file inside a group.
+%
 \def\defmacro{%
   \let\hash=##% convert placeholders to macro parameter chars
   \ifrecursive
@@ -7040,17 +7692,25 @@
          \expandafter\noexpand\csname\the\macname xxx\endcsname}%
       \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
          \egroup\noexpand\scanmacro{\temp}}%
-    \else % many
-      \expandafter\xdef\csname\the\macname\endcsname{%
-         \bgroup\noexpand\macroargctxt
-         \noexpand\csname\the\macname xx\endcsname}%
-      \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-          \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
-      \expandafter\expandafter
-      \expandafter\xdef
-      \expandafter\expandafter
-        \csname\the\macname xxx\endcsname
-          \paramlist{\egroup\noexpand\scanmacro{\temp}}%
+    \else
+      \ifnum\paramno<10\relax % at most 9
+        \expandafter\xdef\csname\the\macname\endcsname{%
+           \bgroup\noexpand\macroargctxt
+           \noexpand\csname\the\macname xx\endcsname}%
+        \expandafter\xdef\csname\the\macname xx\endcsname##1{%
+            \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
+        \expandafter\expandafter
+        \expandafter\xdef
+        \expandafter\expandafter
+          \csname\the\macname xxx\endcsname
+            \paramlist{\egroup\noexpand\scanmacro{\temp}}%
+      \else % 10 or more
+        \expandafter\xdef\csname\the\macname\endcsname{%
+          \noexpand\getargvals@{\the\macname}{\argl}%
+        }%    
+        \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp
+        \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble
+      \fi
     \fi
   \else
     \ifcase\paramno
@@ -7067,29 +7727,40 @@
         \egroup
         \noexpand\norecurse{\the\macname}%
         \noexpand\scanmacro{\temp}\egroup}%
-    \else % many
-      \expandafter\xdef\csname\the\macname\endcsname{%
-         \bgroup\noexpand\macroargctxt
-         \expandafter\noexpand\csname\the\macname xx\endcsname}%
-      \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-          \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
-      \expandafter\expandafter
-      \expandafter\xdef
-      \expandafter\expandafter
-      \csname\the\macname xxx\endcsname
-      \paramlist{%
-          \egroup
-          \noexpand\norecurse{\the\macname}%
-          \noexpand\scanmacro{\temp}\egroup}%
+    \else % at most 9
+      \ifnum\paramno<10\relax
+        \expandafter\xdef\csname\the\macname\endcsname{%
+           \bgroup\noexpand\macroargctxt
+           \expandafter\noexpand\csname\the\macname xx\endcsname}%
+        \expandafter\xdef\csname\the\macname xx\endcsname##1{%
+            \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
+        \expandafter\expandafter
+        \expandafter\xdef
+        \expandafter\expandafter
+        \csname\the\macname xxx\endcsname
+        \paramlist{%
+            \egroup
+            \noexpand\norecurse{\the\macname}%
+            \noexpand\scanmacro{\temp}\egroup}%
+      \else % 10 or more:
+        \expandafter\xdef\csname\the\macname\endcsname{%
+          \noexpand\getargvals@{\the\macname}{\argl}%
+        }%
+        \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp
+        \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\norecurse
+      \fi
     \fi
   \fi}
 
+\catcode `\@\texiatcatcode\relax
+
 \def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}}
 
 % \braceorline decides whether the next nonwhitespace character is a
 % {.  If so it reads up to the closing }, if not, it reads the whole
 % line.  Whatever was read is then fed to the next control sequence
-% as an argument (by \parsebrace or \parsearg)
+% as an argument (by \parsebrace or \parsearg).
+% 
 \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
 \def\braceorlinexxx{%
   \ifx\nchar\bgroup\else
@@ -7099,7 +7770,8 @@
 
 % @alias.
 % We need some trickery to remove the optional spaces around the equal
-% sign.  Just make them active and then expand them all to nothing.
+% sign.  Make them active and then expand them all to nothing.
+%
 \def\alias{\parseargusing\obeyspaces\aliasxxx}
 \def\aliasxxx #1{\aliasyyy#1\relax}
 \def\aliasyyy #1=#2\relax{%
@@ -7120,7 +7792,8 @@
 
 % @inforef is relatively simple.
 \def\inforef #1{\inforefzzz #1,,,,**}
-\def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
+\def\inforefzzz #1,#2,#3,#4**{%
+  \putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
   node \samp{\ignorespaces#1{}}}
 
 % @node's only job in TeX is to define \lastnode, which is used in
@@ -7181,11 +7854,32 @@
       \toks0 = \expandafter{\lastsection}%
       \immediate \writexrdef{title}{\the\toks0 }%
       \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
-      \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout
+      \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout
     }%
   \fi
 }
 
+% @xrefautosectiontitle on|off says whether @section(ing) names are used
+% automatically in xrefs, if the third arg is not explicitly specified.
+% This was provided as a "secret" @set xref-automatic-section-title
+% variable, now it's official.
+% 
+\parseargdef\xrefautomaticsectiontitle{%
+  \def\temp{#1}%
+  \ifx\temp\onword
+    \expandafter\let\csname SETxref-automatic-section-title\endcsname
+      = \empty
+  \else\ifx\temp\offword
+    \expandafter\let\csname SETxref-automatic-section-title\endcsname
+      = \relax
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @xrefautomaticsectiontitle value `\temp',
+                must be on|off}%
+  \fi\fi
+}
+
+% &#xc;
 % @xref, @pxref, and @ref generate cross-references.  For \xrefX, #1 is
 % the node name, #2 the name of the Info cross-reference, #3 the printed
 % node name, #4 the name of the Info file, #5 the name of the printed
@@ -7194,26 +7888,41 @@
 \def\pxref#1{\putwordsee{} \xrefX#1,,,,,,,}
 \def\xref#1{\putwordSee{} \xrefX#1,,,,,,,}
 \def\ref#1{\xrefX#1,,,,,,,}
+%
+\newbox\toprefbox
+\newbox\printedrefnamebox
+\newbox\infofilenamebox
+\newbox\printedmanualbox
+%
 \def\xrefX#1,#2,#3,#4,#5,#6{\begingroup
   \unsepspaces
-  \def\printedmanual{\ignorespaces #5}%
+  %
+  % Get args without leading/trailing spaces.
   \def\printedrefname{\ignorespaces #3}%
-  \setbox1=\hbox{\printedmanual\unskip}%
-  \setbox0=\hbox{\printedrefname\unskip}%
-  \ifdim \wd0 = 0pt
+  \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
+  %
+  \def\infofilename{\ignorespaces #4}%
+  \setbox\infofilenamebox = \hbox{\infofilename\unskip}%
+  %
+  \def\printedmanual{\ignorespaces #5}%
+  \setbox\printedmanualbox  = \hbox{\printedmanual\unskip}%
+  %
+  % If the printed reference name (arg #3) was not explicitly given in
+  % the @xref, figure out what we want to use.
+  \ifdim \wd\printedrefnamebox = 0pt
     % No printed node name was explicitly given.
-    \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax
-      % Use the node name inside the square brackets.
+    \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax
+      % Not auto section-title: use node name inside the square brackets.
       \def\printedrefname{\ignorespaces #1}%
     \else
-      % Use the actual chapter/section title appear inside
-      % the square brackets.  Use the real section title if we have it.
-      \ifdim \wd1 > 0pt
-        % It is in another manual, so we don't have it.
+      % Auto section-title: use chapter/section title inside
+      % the square brackets if we have it.
+      \ifdim \wd\printedmanualbox > 0pt
+        % It is in another manual, so we don't have it; use node name.
         \def\printedrefname{\ignorespaces #1}%
       \else
         \ifhavexrefs
-          % We know the real title if we have the xref values.
+          % We (should) know the real title if we have the xref values.
           \def\printedrefname{\refx{#1-title}{}}%
         \else
           % Otherwise just copy the Info node name.
@@ -7227,13 +7936,20 @@
   \ifpdf
     {\indexnofonts
      \turnoffactive
+     \makevalueexpandable
      % This expands tokens, so do it after making catcode changes, so _
-     % etc. don't get their TeX definitions.
+     % etc. don't get their TeX definitions.  This ignores all spaces in
+     % #4, including (wrongly) those in the middle of the filename.
      \getfilename{#4}%
      %
-     % See comments at \activebackslashdouble.
-     {\activebackslashdouble \xdef\pdfxrefdest{#1}%
-      \backslashparens\pdfxrefdest}%
+     % This (wrongly) does not take account of leading or trailing
+     % spaces in #1, which should be ignored.
+     \edef\pdfxrefdest{#1}%
+     \ifx\pdfxrefdest\empty
+       \def\pdfxrefdest{Top}% no empty targets
+     \else
+       \txiescapepdf\pdfxrefdest  % escape PDF special chars
+     \fi
      %
      \leavevmode
      \startlink attr{/Border 0 0 0}%
@@ -7260,29 +7976,42 @@
   \iffloat\Xthisreftitle
     % If the user specified the print name (third arg) to the ref,
     % print it instead of our usual "Figure 1.2".
-    \ifdim\wd0 = 0pt
+    \ifdim\wd\printedrefnamebox = 0pt
       \refx{#1-snt}{}%
     \else
       \printedrefname
     \fi
     %
-    % if the user also gave the printed manual name (fifth arg), append
+    % If the user also gave the printed manual name (fifth arg), append
     % "in MANUALNAME".
-    \ifdim \wd1 > 0pt
+    \ifdim \wd\printedmanualbox > 0pt
       \space \putwordin{} \cite{\printedmanual}%
     \fi
   \else
     % node/anchor (non-float) references.
+    % 
+    % If we use \unhbox to print the node names, TeX does not insert
+    % empty discretionaries after hyphens, which means that it will not
+    % find a line break at a hyphen in a node names.  Since some manuals
+    % are best written with fairly long node names, containing hyphens,
+    % this is a loss.  Therefore, we give the text of the node name
+    % again, so it is as if TeX is seeing it for the first time.
+    % 
+    \ifdim \wd\printedmanualbox > 0pt
+      % Cross-manual reference with a printed manual name.
+      % 
+      \crossmanualxref{\cite{\printedmanual\unskip}}%
+    %
+    \else\ifdim \wd\infofilenamebox > 0pt
+      % Cross-manual reference with only an info filename (arg 4), no
+      % printed manual name (arg 5).  This is essentially the same as
+      % the case above; we output the filename, since we have nothing else.
+      % 
+      \crossmanualxref{\code{\infofilename\unskip}}%
     %
-    % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
-    % insert empty discretionaries after hyphens, which means that it will
-    % not find a line break at a hyphen in a node names.  Since some manuals
-    % are best written with fairly long node names, containing hyphens, this
-    % is a loss.  Therefore, we give the text of the node name again, so it
-    % is as if TeX is seeing it for the first time.
-    \ifdim \wd1 > 0pt
-      \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
     \else
+      % Reference within this manual.
+      %
       % _ (for example) has to be the character _ for the purposes of the
       % control sequence corresponding to the node, but it has to expand
       % into the usual \leavevmode...\vrule stuff for purposes of
@@ -7294,7 +8023,7 @@
        \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
        \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
       }%
-      % output the `mynode' via a macro so it can be overridden.
+      % output the `mynode' via the macro below so it can be overridden.
       \xrefprintnodename\printedrefname
       %
       % But we always want a comma and a space:
@@ -7302,11 +8031,37 @@
       %
       % output the `page 3'.
       \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
-    \fi
+    \fi\fi
   \fi
   \endlink
 \endgroup}
 
+% Output a cross-manual xref to #1.  Used just above (twice).
+% 
+% Only include the text "Section ``foo'' in" if the foo is neither
+% missing or Top.  Thus, @xref{,,,foo,The Foo Manual} outputs simply
+% "see The Foo Manual", the idea being to refer to the whole manual.
+% 
+% But, this being TeX, we can't easily compare our node name against the
+% string "Top" while ignoring the possible spaces before and after in
+% the input.  By adding the arbitrary 7sp below, we make it much less
+% likely that a real node name would have the same width as "Top" (e.g.,
+% in a monospaced font).  Hopefully it will never happen in practice.
+% 
+% For the same basic reason, we retypeset the "Top" at every
+% reference, since the current font is indeterminate.
+% 
+\def\crossmanualxref#1{%
+  \setbox\toprefbox = \hbox{Top\kern7sp}%
+  \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
+  \ifdim \wd2 > 7sp  % nonempty?
+    \ifdim \wd2 = \wd\toprefbox \else  % same as Top?
+      \putwordSection{} ``\printedrefname'' \putwordin{}\space
+    \fi
+  \fi
+  #1%
+}
+
 % This macro is called from \xrefX for the `nodename' part of xref
 % output.  It's a separate macro only so it can be changed more easily,
 % since square brackets don't work well in some documents.  Particularly
@@ -7357,7 +8112,8 @@
     \angleleft un\-de\-fined\angleright
     \iflinks
       \ifhavexrefs
-        \message{\linenumber Undefined cross reference `#1'.}%
+        {\toks0 = {#1}% avoid expansion of possibly-complex value
+         \message{\linenumber Undefined cross reference `\the\toks0'.}}%
       \else
         \ifwarnedxrefs\else
           \global\warnedxrefstrue
@@ -7521,7 +8277,7 @@
 % space to prevent strange expansion errors.)
 \def\supereject{\par\penalty -20000\footnoteno =0 }
 
-% @footnotestyle is meaningful for info output only.
+% @footnotestyle is meaningful for Info output only.
 \let\footnotestyle=\comment
 
 {\catcode `\@=11
@@ -7584,6 +8340,8 @@
   % expands into a box, it must come within the paragraph, lest it
   % provide a place where TeX can split the footnote.
   \footstrut
+  %
+  % Invoke rest of plain TeX footnote routine.
   \futurelet\next\fo@t
 }
 }%end \catcode `\@=11
@@ -7671,7 +8429,7 @@
   it from ftp://tug.org/tex/epsf.tex.}
 %
 \def\image#1{%
-  \ifx\epsfbox\undefined
+  \ifx\epsfbox\thisisundefined
     \ifwarnednoepsf \else
       \errhelp = \noepsfhelp
       \errmessage{epsf.tex not found, images will be ignored}%
@@ -7687,7 +8445,7 @@
 % #2 is (optional) width, #3 is (optional) height.
 % #4 is (ignored optional) html alt text.
 % #5 is (ignored optional) extension.
-% #6 is just the usual extra ignored arg for parsing this stuff.
+% #6 is just the usual extra ignored arg for parsing stuff.
 \newif\ifimagevmode
 \def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup
   \catcode`\^^M = 5     % in case we're inside an example
@@ -7695,6 +8453,13 @@
   % If the image is by itself, center it.
   \ifvmode
     \imagevmodetrue
+  \else \ifx\centersub\centerV
+    % for @center @image, we need a vbox so we can have our vertical space
+    \imagevmodetrue
+    \vbox\bgroup % vbox has better behavior than vtop herev
+  \fi\fi
+  %
+  \ifimagevmode
     \nobreak\medskip
     % Usually we'll have text after the image which will insert
     % \parskip glue, so insert it here too to equalize the space
@@ -7704,9 +8469,13 @@
   \fi
   %
   % Leave vertical mode so that indentation from an enclosing
-  % environment such as @quotation is respected.  On the other hand, if
-  % it's at the top level, we don't want the normal paragraph indentation.
-  \noindent
+  %  environment such as @quotation is respected.
+  % However, if we're at the top level, we don't want the
+  %  normal paragraph indentation.
+  % On the other hand, if we are in the case of @center @image, we don't
+  %  want to start a paragraph, which will create a hsize-width box and
+  %  eradicate the centering.
+  \ifx\centersub\centerV\else \noindent \fi
   %
   % Output the image.
   \ifpdf
@@ -7718,7 +8487,10 @@
     \epsfbox{#1.eps}%
   \fi
   %
-  \ifimagevmode \medskip \fi  % space after the standalone image
+  \ifimagevmode
+    \medskip  % space after a standalone image
+  \fi  
+  \ifx\centersub\centerV \egroup \fi
 \endgroup}
 
 
@@ -8136,7 +8908,7 @@
 %
 % Latin1 (ISO-8859-1) character definitions.
 \def\latonechardefs{%
-  \gdef^^a0{~}
+  \gdef^^a0{\tie}
   \gdef^^a1{\exclamdown}
   \gdef^^a2{\missingcharmsg{CENT SIGN}}
   \gdef^^a3{{\pounds}}
@@ -8166,7 +8938,7 @@
   \gdef^^b9{$^1$}
   \gdef^^ba{\ordm}
   %
-  \gdef^^bb{\guilletright}
+  \gdef^^bb{\guillemetright}
   \gdef^^bc{$1\over4$}
   \gdef^^bd{$1\over2$}
   \gdef^^be{$3\over4$}
@@ -8258,7 +9030,7 @@
 
 % Latin2 (ISO-8859-2) character definitions.
 \def\lattwochardefs{%
-  \gdef^^a0{~}
+  \gdef^^a0{\tie}
   \gdef^^a1{\ogonek{A}}
   \gdef^^a2{\u{}}
   \gdef^^a3{\L}
@@ -8339,8 +9111,8 @@
   \gdef^^ea{\ogonek{e}}
   \gdef^^eb{\"e}
   \gdef^^ec{\v e}
-  \gdef^^ed{\'\i}
-  \gdef^^ee{\^\i}
+  \gdef^^ed{\'{\dotless{i}}}
+  \gdef^^ee{\^{\dotless{i}}}
   \gdef^^ef{\v d}
   %
   \gdef^^f0{\dh}
@@ -8431,7 +9203,7 @@
 
   \gdef\DeclareUnicodeCharacter#1#2{%
     \countUTFz = "#1\relax
-    \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
+    %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
     \begingroup
       \parseXMLCharref
       \def\UTFviiiTwoOctets##1##2{%
@@ -8899,8 +9671,8 @@
 % Prevent underfull vbox error messages.
 \vbadness = 10000
 
-% Don't be so finicky about underfull hboxes, either.
-\hbadness = 2000
+% Don't be very finicky about underfull hboxes, either.
+\hbadness = 6666
 
 % Following George Bush, get rid of widows and orphans.
 \widowpenalty=10000
@@ -9107,28 +9879,21 @@
 
 \message{and turning on texinfo input format.}
 
+\def^^L{\par} % remove \outer, so ^L can appear in an @comment
+
 % DEL is a comment character, in case @c does not suffice.
 \catcode`\^^? = 14
 
 % Define macros to output various characters with catcode for normal text.
-\catcode`\"=\other
-\catcode`\~=\other
-\catcode`\^=\other
-\catcode`\_=\other
-\catcode`\|=\other
-\catcode`\<=\other
-\catcode`\>=\other
-\catcode`\+=\other
-\catcode`\$=\other
-\def\normaldoublequote{"}
-\def\normaltilde{~}
-\def\normalcaret{^}
-\def\normalunderscore{_}
-\def\normalverticalbar{|}
-\def\normalless{<}
-\def\normalgreater{>}
-\def\normalplus{+}
-\def\normaldollar{$}%$ font-lock fix
+\catcode`\"=\other \def\normaldoublequote{"}
+\catcode`\$=\other \def\normaldollar{$}%$ font-lock fix
+\catcode`\+=\other \def\normalplus{+}
+\catcode`\<=\other \def\normalless{<}
+\catcode`\>=\other \def\normalgreater{>}
+\catcode`\^=\other \def\normalcaret{^}
+\catcode`\_=\other \def\normalunderscore{_}
+\catcode`\|=\other \def\normalverticalbar{|}
+\catcode`\~=\other \def\normaltilde{~}
 
 % This macro is used to make a character print one way in \tt
 % (where it can probably be output as-is), and another way in other fonts,
@@ -9206,34 +9971,48 @@
 
 % In texinfo, backslash is an active character; it prints the backslash
 % in fixed width font.
-\catcode`\\=\active
-@def@normalbackslash{{@tt@backslashcurfont}}
+\catcode`\\=\active  % @ for escape char from now on.
+
+% The story here is that in math mode, the \char of \backslashcurfont
+% ends up printing the roman \ from the math symbol font (because \char
+% in math mode uses the \mathcode, and plain.tex sets
+% \mathcode`\\="026E).  It seems better for @backslashchar{} to always
+% print a typewriter backslash, hence we use an explicit \mathchar,
+% which is the decimal equivalent of "715c (class 7, e.g., use \fam;
+% ignored family value; char position "5C).  We can't use " for the
+% usual hex value because it has already been made active.
+@def@normalbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}}
+@let@backslashchar = @normalbackslash % @backslashchar{} is for user documents.
+
 % On startup, @fixbackslash assigns:
 %  @let \ = @normalbackslash
-
 % \rawbackslash defines an active \ to do \backslashcurfont.
 % \otherbackslash defines an active \ to be a literal `\' character with
-% catcode other.
+% catcode other.  We switch back and forth between these.
 @gdef@rawbackslash{@let\=@backslashcurfont}
 @gdef@otherbackslash{@let\=@realbackslash}
 
 % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.
+% the literal character `\'.  Also revert - to its normal character, in
+% case the active - from code has slipped in.
 %
-@def@normalturnoffactive{%
-  @let\=@normalbackslash
-  @let"=@normaldoublequote
-  @let~=@normaltilde
-  @let^=@normalcaret
-  @let_=@normalunderscore
-  @let|=@normalverticalbar
-  @let<=@normalless
-  @let>=@normalgreater
-  @let+=@normalplus
-  @let$=@normaldollar %$ font-lock fix
-  @markupsetuplqdefault
-  @markupsetuprqdefault
-  @unsepspaces
+{@catcode`- = @active
+ @gdef@normalturnoffactive{%
+   @let-=@normaldash
+   @let"=@normaldoublequote
+   @let$=@normaldollar %$ font-lock fix
+   @let+=@normalplus
+   @let<=@normalless
+   @let>=@normalgreater
+   @let\=@normalbackslash
+   @let^=@normalcaret
+   @let_=@normalunderscore
+   @let|=@normalverticalbar
+   @let~=@normaltilde
+   @markupsetuplqdefault
+   @markupsetuprqdefault
+   @unsepspaces
+ }
 }
 
 % Make _ and + \other characters, temporarily.
@@ -9262,10 +10041,19 @@
 % Say @foo, not \foo, in error messages.
 @escapechar = `@@
 
+% These (along with & and #) are made active for url-breaking, so need
+% active definitions as the normal characters.
+@def@normaldot{.}
+@def@normalquest{?}
+@def@normalslash{/}
+
 % These look ok in all fonts, so just make them not special.
-@catcode`@& = @other
-@catcode`@# = @other
-@catcode`@% = @other
+% @hashchar{} gets its own user-level command, because of #line.
+@catcode`@& = @other @def@normalamp{&}
+@catcode`@# = @other @def@normalhash{#}
+@catcode`@% = @other @def@normalpercent{%}
+
+@let @hashchar = @normalhash
 
 @c Finally, make ` and ' active, so that txicodequoteundirected and
 @c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}.  If we

mpfc-1.3.8.1.tar.bz2/install-sh -> mpfc-2.0.tar.bz2/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | =!) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | =!) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,13 +202,17 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | =!) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -347,7 +354,7 @@
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	-=!*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then

mpfc-1.3.8.1.tar.bz2/intl/plural.c -> mpfc-2.0.tar.bz2/intl/plural.c Changed

@@ -1,20 +1,19 @@
-/* A Bison parser, made by GNU Bison 2.4.3.  */
+/* A Bison parser, made by GNU Bison 3.0.2.  */
+
+/* Bison implementation for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2009, 2010 Free Software Foundation, Inc.
-   
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -27,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -45,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "3.0.2"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -59,23 +58,17 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
-/* Using locations.  */
-#define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
 #define yyparse         __gettextparse
 #define yylex           __gettextlex
 #define yyerror         __gettexterror
-#define yylval          __gettextlval
-#define yychar          __gettextchar
 #define yydebug         __gettextdebug
 #define yynerrs         __gettextnerrs
 
 
 /* Copy the first part of user declarations.  */
-
-/* Line 189 of yacc.c  */
-#line 1 "plural.y"
+#line 1 "../../mpfc/intl/plural.y" /* yacc.c:339  */
 
 /* Expression parsing for plural form selection.
    Copyright (C) 2000-2001, 2003, 2005 Free Software Foundation, Inc.
@@ -123,14 +116,15 @@
 #define YYLEX_PARAM	&((struct parse_args *) arg)->cp
 #define YYPARSE_PARAM	arg
 
+#line 120 "../../mpfc/intl/plural.c" /* yacc.c:339  */
 
-/* Line 189 of yacc.c  */
-#line 129 "plural.c"
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
@@ -140,24 +134,29 @@
 # define YYERROR_VERBOSE 0
 #endif
 
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* In a future release of Bison, this section will be replaced
+   by #include "plural.h".  */
+#ifndef YY__GETTEXT_MPFC_INTL_PLURAL_H_INCLUDED
+# define YY__GETTEXT_MPFC_INTL_PLURAL_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int __gettextdebug;
 #endif
 
-
-/* Tokens.  */
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     EQUOP2 = 258,
-     CMPOP2 = 259,
-     ADDOP2 = 260,
-     MULOP2 = 261,
-     NUMBER = 262
-   };
+  enum yytokentype
+  {
+    EQUOP2 = 258,
+    CMPOP2 = 259,
+    ADDOP2 = 260,
+    MULOP2 = 261,
+    NUMBER = 262
+  };
 #endif
 /* Tokens.  */
 #define EQUOP2 258
@@ -166,35 +165,31 @@
 #define MULOP2 261
 #define NUMBER 262
 
-
-
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
 {
-
-/* Line 214 of yacc.c  */
-#line 51 "plural.y"
+#line 51 "../../mpfc/intl/plural.y" /* yacc.c:355  */
 
   unsigned long int num;
   enum operator op;
   struct expression *exp;
 
-
-
-/* Line 214 of yacc.c  */
-#line 187 "plural.c"
-} YYSTYPE;
+#line 180 "../../mpfc/intl/plural.c" /* yacc.c:355  */
+};
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
-/* Copy the second part of user declarations.  */
 
-/* Line 264 of yacc.c  */
-#line 57 "plural.y"
+int __gettextparse (void);
+
+#endif /* !YY__GETTEXT_MPFC_INTL_PLURAL_H_INCLUDED  */
+
+/* Copy the second part of user declarations.  */
+#line 57 "../../mpfc/intl/plural.y" /* yacc.c:358  */
 
 /* Prototypes for local functions.  */
 static int yylex (YYSTYPE *lval, const char **pexp);
@@ -269,9 +264,7 @@
 }
 
 
-
-/* Line 264 of yacc.c  */
-#line 275 "plural.c"
+#line 268 "../../mpfc/intl/plural.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -285,11 +278,8 @@
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
 #else
-typedef short int yytype_int8;
+typedef signed char yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
@@ -309,8 +299,7 @@
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -324,38 +313,67 @@
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
 #endif
 
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(n) (n)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
 #else
-static int
-YYID (yyi)
-    int yyi;
+# define YY_INITIAL_VALUE(Value) Value
 #endif
-{
-  return yyi;
-}
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
 #endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
 
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
@@ -374,11 +392,11 @@
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -386,8 +404,8 @@
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
        and a page size can be as small as 4096 bytes.  So we cannot safely
@@ -401,25 +419,23 @@
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
-	     && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined malloc && ! defined EXIT_SUCCESS
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined free && ! defined EXIT_SUCCESS
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
@@ -429,7 +445,7 @@
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
@@ -447,42 +463,46 @@
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)yyi = (From)yyi;		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
 
 #endif
 
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)yyi = (Src)yyi;            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  9
 /* YYLAST -- Last index in YYTABLE.  */
@@ -494,17 +514,19 @@
 #define YYNNTS  3
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  13
-/* YYNRULES -- Number of states.  */
+/* YYNSTATES -- Number of states.  */
 #define YYNSTATES  27
 
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATEYYX -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   262
 
-#define YYTRANSLATE(YYX)						\
+#define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslateYYX : YYUNDEFTOK)
 
-/* YYTRANSLATEYYLEX -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATETOKEN-NUM -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
 static const yytype_uint8 yytranslate =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -537,25 +559,7 @@
 };
 
 #if YYDEBUG
-/* YYPRHSYYN -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint8 yyprhs =
-{
-       0,     0,     3,     5,    11,    15,    19,    23,    27,    31,
-      35,    38,    40,    42
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs =
-{
-      17,     0,    -1,    18,    -1,    18,     3,    18,    12,    18,
-      -1,    18,     4,    18,    -1,    18,     5,    18,    -1,    18,
-       6,    18,    -1,    18,     7,    18,    -1,    18,     8,    18,
-      -1,    18,     9,    18,    -1,    10,    18,    -1,    13,    -1,
-      11,    -1,    14,    18,    15,    -1
-};
-
-/* YYRLINEYYN -- source line where rule number YYN was defined.  */
+  /* YYRLINEYYN -- Source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline =
 {
        0,   152,   152,   160,   164,   168,   172,   176,   180,   184,
@@ -563,20 +567,20 @@
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAMESYMBOL-NUM -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname =
 {
   "$end", "error", "$undefined", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2",
   "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'",
-  "$accept", "start", "exp", 0
+  "$accept", "start", "exp", YY_NULLPTR
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUMYYLEX-NUM -- Internal token number corresponding to
-   token YYLEX-NUM.  */
+/* YYTOKNUMNUM -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_uint16 yytoknum =
 {
        0,   256,   257,    63,   124,    38,   258,   259,   260,   261,
@@ -584,23 +588,28 @@
 };
 # endif
 
-/* YYR1YYN -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1 =
-{
-       0,    16,    17,    18,    18,    18,    18,    18,    18,    18,
-      18,    18,    18,    18
-};
+#define YYPACT_NINF -10
 
-/* YYR2YYN -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2 =
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-10)))
+
+#define YYTABLE_NINF -1
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int8 yypact =
 {
-       0,     2,     1,     5,     3,     3,     3,     3,     3,     3,
-       2,     1,     1,     3
+      -9,    -9,   -10,   -10,    -9,     8,    36,   -10,    13,   -10,
+      -9,    -9,    -9,    -9,    -9,    -9,    -9,   -10,    26,    41,
+      45,    18,    -2,    14,   -10,    -9,    36
 };
 
-/* YYDEFACTSTATE-NAME -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_uint8 yydefact =
 {
        0,     0,    12,    11,     0,     0,     2,    10,     0,     1,
@@ -608,33 +617,21 @@
        5,     6,     7,     8,     9,     0,     3
 };
 
-/* YYDEFGOTONTERM-NUM.  */
-static const yytype_int8 yydefgoto =
-{
-      -1,     5,     6
-};
-
-/* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -10
-static const yytype_int8 yypact =
+  /* YYPGOTONTERM-NUM.  */
+static const yytype_int8 yypgoto =
 {
-      -9,    -9,   -10,   -10,    -9,     8,    36,   -10,    13,   -10,
-      -9,    -9,    -9,    -9,    -9,    -9,    -9,   -10,    26,    41,
-      45,    18,    -2,    14,   -10,    -9,    36
+     -10,   -10,    -1
 };
 
-/* YYPGOTONTERM-NUM.  */
-static const yytype_int8 yypgoto =
+  /* YYDEFGOTONTERM-NUM.  */
+static const yytype_int8 yydefgoto =
 {
-     -10,   -10,    -1
+      -1,     5,     6
 };
 
-/* YYTABLEYYPACTSTATE-NUM.  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -1
+  /* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_uint8 yytable =
 {
        7,     1,     2,     8,     3,     4,    15,    16,     9,    18,
@@ -655,8 +652,8 @@
        9,     6,     7,     8,     9
 };
 
-/* YYSTOSSTATE-NUM -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
+  /* YYSTOSSTATE-NUM -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos =
 {
        0,    10,    11,    13,    14,    17,    18,    18,    18,     0,
@@ -664,104 +661,55 @@
       18,    18,    18,    18,    18,    12,    18
 };
 
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
-
-#define YYFAIL		goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
+  /* YYR1YYN -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1 =
+{
+       0,    16,    17,    18,    18,    18,    18,    18,    18,    18,
+      18,    18,    18,    18
+};
 
-#define YYRECOVERING()  (!!yyerrstatus)
+  /* YYR2YYN -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2 =
+{
+       0,     2,     1,     5,     3,     3,     3,     3,     3,     3,
+       2,     1,     1,     3
+};
 
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK (1);						\
-      goto yybackup;						\
-    }								\
-  else								\
-    {								\
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;							\
-    }								\
-while (YYID (0))
-
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS1 to RHSN.
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS0 (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)K)
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
-    do									\
-      if (YYID (N))                                                    \
-	{								\
-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
-      else								\
-	{								\
-	  (Current).first_line   = (Current).last_line   =		\
-	    YYRHSLOC (Rhs, 0).last_line;				\
-	  (Current).first_column = (Current).last_column =		\
-	    YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
-    while (YYID (0))
-#endif
 
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
 
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
 
-#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
 
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
 
-/* YYLEX -- calling `yylex' with the right arguments.  */
 
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval)
-#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -771,54 +719,46 @@
 #  define YYFPRINTF fprintf
 # endif
 
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (YYID (0))
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-do {									  \
-  if (yydebug)								  \
-    {									  \
-      YYFPRINTF (stderr, "%s ", Title);					  \
-      yy_symbol_print (stderr,						  \
-		  Type, Value); \
-      YYFPRINTF (stderr, "\n");						  \
-    }									  \
-} while (YYID (0))
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
 
 
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknumyytype, *yyvaluep);
-# else
-  YYUSE (yyoutput);
 # endif
-  switch (yytype)
-    {
-      default:
-	break;
-    }
+  YYUSE (yytype);
 }
 
 
@@ -826,22 +766,11 @@
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytnameyytype);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytnameyytype);
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytnameyytype);
 
   yy_symbol_value_print (yyoutput, yytype, yyvaluep);
   YYFPRINTF (yyoutput, ")");
@@ -852,16 +781,8 @@
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
-#endif
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -872,49 +793,42 @@
   YYFPRINTF (stderr, "\n");
 }
 
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
+  unsigned long int yylno = yyrlineyyrule;
   int yynrhs = yyr2yyrule;
   int yyi;
-  unsigned long int yylno = yyrlineyyrule;
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	     yyrule - 1, yylno);
+             yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhsyyprhsyyrule + yyi,
-		       &(yyvsp(yyi + 1) - (yynrhs))
-		       		       );
+      yy_symbol_print (stderr,
+                       yystosyysspyyi + 1 - yynrhs,
+                       &(yyvsp(yyi + 1) - (yynrhs))
+                                              );
       YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -928,7 +842,7 @@
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
+#ifndef YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -943,7 +857,6 @@
 # define YYMAXDEPTH 10000
 #endif
 
-&#xc;
 
 #if YYERROR_VERBOSE
 
@@ -952,15 +865,8 @@
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
 yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif
 {
   YYSIZE_T yylen;
   for (yylen = 0; yystryylen; yylen++)
@@ -976,16 +882,8 @@
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static char *
 yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
 {
   char *yyd = yydest;
   const char *yys = yysrc;
@@ -1015,27 +913,27 @@
       char const *yyp = yystr;
 
       for (;;)
-	switch (*++yyp)
-	  {
-	  case '\'':
-	  case ',':
-	    goto do_not_strip_quotes;
-
-	  case '\\':
-	    if (*++yyp != '\\')
-	      goto do_not_strip_quotes;
-	    /* Fall through.  */
-	  default:
-	    if (yyres)
-	      yyresyyn = *yyp;
-	    yyn++;
-	    break;
-
-	  case '"':
-	    if (yyres)
-	      yyresyyn = '\0';
-	    return yyn;
-	  }
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyresyyn = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyresyyn = '\0';
+            return yyn;
+          }
     do_not_strip_quotes: ;
     }
 
@@ -1046,197 +944,178 @@
 }
 # endif
 
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypactyystate;
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
 
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytnameyytoken);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyargYYERROR_VERBOSE_ARGS_MAXIMUM;
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
     {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytnameyytype);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyargYYERROR_VERBOSE_ARGS_MAXIMUM;
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected = "syntax error, unexpected %s";
-      static char const yyexpecting = ", expecting %s";
-      static char const yyor = " or %s";
-      char yyformatsizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1));
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg0 = yytnameyytype;
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheckyyx + yyn == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformatsizeof yyunexpected - 1 = '\0';
-		break;
-	      }
-	    yyargyycount++ = yytnameyyx;
-	    yysize1 = yysize + yytnamerr (0, yytnameyyx);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
+      int yyn = yypact*yyssp;
+      yyargyycount++ = yytnameyytoken;
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheckyyx + yyn == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytableyyx + yyn))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyargyycount++ = yytnameyyx;
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytnameyyx);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
 
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
 
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
 
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf1 == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyargyyi++);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
     }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat1 == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyargyyi++);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
-&#xc;
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
 {
   YYUSE (yyvaluep);
-
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-  switch (yytype)
-    {
-
-      default:
-	break;
-    }
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
-/* Prevent warnings from -Wmissing-prototypes.  */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
 
 
 
+/*----------.
+| yyparse.  |
+`----------*/
 
-
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
-
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
 {
 /* The lookahead symbol.  */
 int yychar;
 
+
 /* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
+/* Default value used for initialization, for pacifying older GCCs
+   or non-GCC compilers.  */
+YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
+YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
     /* Number of syntax errors so far.  */
     int yynerrs;
@@ -1246,10 +1125,10 @@
     int yyerrstatus;
 
     /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
+       'yyss': related to states.
+       'yyvs': related to semantic values.
 
-       Refer to the stacks thru separate pointers, to allow yyoverflow
+       Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
@@ -1267,7 +1146,7 @@
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
+  int yytoken = 0;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
@@ -1285,9 +1164,8 @@
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
   yystacksize = YYINITDEPTH;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1296,14 +1174,6 @@
   yyerrstatus = 0;
   yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-  yyssp = yyss;
-  yyvsp = yyvs;
-
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1324,23 +1194,23 @@
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack.  Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	yytype_int16 *yyss1 = yyss;
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow (YY_("memory exhausted"),
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
@@ -1348,22 +1218,22 @@
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;
 
       {
-	yytype_int16 *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
       }
 # endif
 #endif /* no yyoverflow */
@@ -1372,10 +1242,10 @@
       yyvsp = yyvs + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
+                  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
+        YYABORT;
     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1395,7 +1265,7 @@
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypactyystate;
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1404,7 +1274,7 @@
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
+      yychar = yylex (&yylval);
     }
 
   if (yychar <= YYEOF)
@@ -1426,8 +1296,8 @@
   yyn = yytableyyn;
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -1444,7 +1314,9 @@
   yychar = YYEMPTY;
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -1467,7 +1339,7 @@
   yylen = yyr2yyn;
 
   /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
+     '$$ = $1'.
 
      Otherwise, the following line sets YYVAL to garbage.
      This behavior is undocumented and Bison
@@ -1481,122 +1353,119 @@
   switch (yyn)
     {
         case 2:
-
-/* Line 1464 of yacc.c  */
-#line 153 "plural.y"
+#line 153 "../../mpfc/intl/plural.y" /* yacc.c:1646  */
     {
-	    if ((yyvsp(1) - (1).exp) == NULL)
+	    if ((yyvsp0.exp) == NULL)
 	      YYABORT;
-	    ((struct parse_args *) arg)->res = (yyvsp(1) - (1).exp);
+	    ((struct parse_args *) arg)->res = (yyvsp0.exp);
 	  }
+#line 1363 "../../mpfc/intl/plural.c" /* yacc.c:1646  */
     break;
 
   case 3:
-
-/* Line 1464 of yacc.c  */
-#line 161 "plural.y"
+#line 161 "../../mpfc/intl/plural.y" /* yacc.c:1646  */
     {
-	    (yyval.exp) = new_exp_3 (qmop, (yyvsp(1) - (5).exp), (yyvsp(3) - (5).exp), (yyvsp(5) - (5).exp));
+	    (yyval.exp) = new_exp_3 (qmop, (yyvsp-4.exp), (yyvsp-2.exp), (yyvsp0.exp));
 	  }
+#line 1371 "../../mpfc/intl/plural.c" /* yacc.c:1646  */
     break;
 
   case 4:
-
-/* Line 1464 of yacc.c  */
-#line 165 "plural.y"
+#line 165 "../../mpfc/intl/plural.y" /* yacc.c:1646  */
     {
-	    (yyval.exp) = new_exp_2 (lor, (yyvsp(1) - (3).exp), (yyvsp(3) - (3).exp));
+	    (yyval.exp) = new_exp_2 (lor, (yyvsp-2.exp), (yyvsp0.exp));
 	  }
+#line 1379 "../../mpfc/intl/plural.c" /* yacc.c:1646  */
     break;
 
   case 5:
-
-/* Line 1464 of yacc.c  */
-#line 169 "plural.y"
+#line 169 "../../mpfc/intl/plural.y" /* yacc.c:1646  */
     {
-	    (yyval.exp) = new_exp_2 (land, (yyvsp(1) - (3).exp), (yyvsp(3) - (3).exp));
+	    (yyval.exp) = new_exp_2 (land, (yyvsp-2.exp), (yyvsp0.exp));
 	  }
+#line 1387 "../../mpfc/intl/plural.c" /* yacc.c:1646  */
     break;
 
   case 6:
-
-/* Line 1464 of yacc.c  */
-#line 173 "plural.y"
+#line 173 "../../mpfc/intl/plural.y" /* yacc.c:1646  */
     {
-	    (yyval.exp) = new_exp_2 ((yyvsp(2) - (3).op), (yyvsp(1) - (3).exp), (yyvsp(3) - (3).exp));
+	    (yyval.exp) = new_exp_2 ((yyvsp-1.op), (yyvsp-2.exp), (yyvsp0.exp));
 	  }
+#line 1395 "../../mpfc/intl/plural.c" /* yacc.c:1646  */
     break;
 
   case 7:
-
-/* Line 1464 of yacc.c  */
-#line 177 "plural.y"
+#line 177 "../../mpfc/intl/plural.y" /* yacc.c:1646  */
     {
-	    (yyval.exp) = new_exp_2 ((yyvsp(2) - (3).op), (yyvsp(1) - (3).exp), (yyvsp(3) - (3).exp));
+	    (yyval.exp) = new_exp_2 ((yyvsp-1.op), (yyvsp-2.exp), (yyvsp0.exp));
 	  }
+#line 1403 "../../mpfc/intl/plural.c" /* yacc.c:1646  */
     break;
 
   case 8:
-
-/* Line 1464 of yacc.c  */
-#line 181 "plural.y"
+#line 181 "../../mpfc/intl/plural.y" /* yacc.c:1646  */
     {
-	    (yyval.exp) = new_exp_2 ((yyvsp(2) - (3).op), (yyvsp(1) - (3).exp), (yyvsp(3) - (3).exp));
+	    (yyval.exp) = new_exp_2 ((yyvsp-1.op), (yyvsp-2.exp), (yyvsp0.exp));
 	  }
+#line 1411 "../../mpfc/intl/plural.c" /* yacc.c:1646  */
     break;
 
   case 9:
-
-/* Line 1464 of yacc.c  */
-#line 185 "plural.y"
+#line 185 "../../mpfc/intl/plural.y" /* yacc.c:1646  */
     {
-	    (yyval.exp) = new_exp_2 ((yyvsp(2) - (3).op), (yyvsp(1) - (3).exp), (yyvsp(3) - (3).exp));
+	    (yyval.exp) = new_exp_2 ((yyvsp-1.op), (yyvsp-2.exp), (yyvsp0.exp));
 	  }
+#line 1419 "../../mpfc/intl/plural.c" /* yacc.c:1646  */
     break;
 
   case 10:
-
-/* Line 1464 of yacc.c  */
-#line 189 "plural.y"
+#line 189 "../../mpfc/intl/plural.y" /* yacc.c:1646  */
     {
-	    (yyval.exp) = new_exp_1 (lnot, (yyvsp(2) - (2).exp));
+	    (yyval.exp) = new_exp_1 (lnot, (yyvsp0.exp));
 	  }
+#line 1427 "../../mpfc/intl/plural.c" /* yacc.c:1646  */
     break;
 
   case 11:
-
-/* Line 1464 of yacc.c  */
-#line 193 "plural.y"
+#line 193 "../../mpfc/intl/plural.y" /* yacc.c:1646  */
     {
 	    (yyval.exp) = new_exp_0 (var);
 	  }
+#line 1435 "../../mpfc/intl/plural.c" /* yacc.c:1646  */
     break;
 
   case 12:
-
-/* Line 1464 of yacc.c  */
-#line 197 "plural.y"
+#line 197 "../../mpfc/intl/plural.y" /* yacc.c:1646  */
     {
 	    if (((yyval.exp) = new_exp_0 (num)) != NULL)
-	      (yyval.exp)->val.num = (yyvsp(1) - (1).num);
+	      (yyval.exp)->val.num = (yyvsp0.num);
 	  }
+#line 1444 "../../mpfc/intl/plural.c" /* yacc.c:1646  */
     break;
 
   case 13:
-
-/* Line 1464 of yacc.c  */
-#line 202 "plural.y"
+#line 202 "../../mpfc/intl/plural.y" /* yacc.c:1646  */
     {
-	    (yyval.exp) = (yyvsp(2) - (3).exp);
+	    (yyval.exp) = (yyvsp-1.exp);
 	  }
+#line 1452 "../../mpfc/intl/plural.c" /* yacc.c:1646  */
     break;
 
 
-
-/* Line 1464 of yacc.c  */
-#line 1598 "plural.c"
+#line 1456 "../../mpfc/intl/plural.c" /* yacc.c:1646  */
       default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1yyn, &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -1605,7 +1474,7 @@
 
   *++yyvsp = yyval;
 
-  /* Now `shift' the result of the reduction.  Determine what state
+  /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
 
@@ -1620,10 +1489,14 @@
   goto yynewstate;
 
 
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -1631,37 +1504,36 @@
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
       {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
-	      YYSTACK_FREE (yymsg);
-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (yymsg);
-	  }
-	else
-	  {
-	    yyerror (YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
       }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -1670,20 +1542,20 @@
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
+         error, discard it.  */
 
       if (yychar <= YYEOF)
-	{
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
-	}
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
       else
-	{
-	  yydestruct ("Error: discarding",
-		      yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
     }
 
   /* Else will try to reuse lookahead token after shifting the error
@@ -1702,7 +1574,7 @@
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
@@ -1715,35 +1587,37 @@
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
   for (;;)
     {
       yyn = yypactyystate;
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheckyyn == YYTERROR)
-	    {
-	      yyn = yytableyyn;
-	      if (0 < yyn)
-		break;
-	    }
-	}
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheckyyn == YYTERROR)
+            {
+              yyn = yytableyyn;
+              if (0 < yyn)
+                break;
+            }
+        }
 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)
-	YYABORT;
+        YYABORT;
 
 
       yydestruct ("Error: popping",
-		  yystosyystate, yyvsp);
+                  yystosyystate, yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -1767,7 +1641,7 @@
   yyresult = 1;
   goto yyreturn;
 
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -1779,16 +1653,21 @@
 
 yyreturn:
   if (yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
-  /* Do not reclaim the symbols of the rule which action triggered
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   YY_STACK_PRINT (yyss, yyssp);
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-		  yystos*yyssp, yyvsp);
+                  yystos*yyssp, yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -1799,14 +1678,9 @@
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;
 }
-
-
-
-/* Line 1684 of yacc.c  */
-#line 207 "plural.y"
+#line 207 "../../mpfc/intl/plural.y" /* yacc.c:1906  */
 
 
 void
@@ -1984,4 +1858,3 @@
 {
   /* Do nothing.  We don't print error messages here.  */
 }
-

mpfc-2.0.tar.bz2/libcue Added

mpfc-2.0.tar.bz2/libcue/AUTHORS Added

mpfc-2.0.tar.bz2/libcue/COPYING Added

@@ -0,0 +1,693 @@
+== IMPORTANT ==
+
+There are two licences involved in this software.
+
+The whole libcue project is released under GPLv2 due to its heritage
+from cuetools. Some code was added independently from cuetools. These
+files have a copyright notice and licensing information on their own.
+
+All files that contain this note:
+'Copyright (c) 2004, 2005, 2006, 2007, Svend Sorensen'
+are taken from cuetools and are therefore under licence of GPLv2.
+
+== IMPORTANT ==
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+&#xc;
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+&#xc;
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+&#xc;
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+&#xc;
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+&#xc;
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+&#xc;
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+&#xc;
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+&#xc;
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+&#xc;
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+&#xc;
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

mpfc-2.0.tar.bz2/libcue/ChangeLog Added

@@ -0,0 +1,68 @@
+* force make to *not* build things in parallel since this tends to mess things up
+
+* update changelog
+
+* set version number to 1.4.0 (libtool)
+
+* update copyright
+
+* fix compiler warning: input() defined but not used
+
+* new flex behaviour: explicitly enable yylineno usage
+
+* new automake macro name
+
+* possible fix for compilation problems on win32
+
+* update COPYING and corrected copyright notices in several source code files
+
+* Update general COPYRIGHT notice as well as several file specific notifications
+
+* update ChangeLog and NEWS
+
+---------------------------------------
+
+* set version number to 1.3.0 (libtool)
+
+* fix for invalid pointer
+
+---------------------------------------
+
+* set version number to 1.2.0 (libtool)
+
+* update comment on libtool versioning
+
+* update copyright notifications
+
+* switch copyright licence to 2-clause BSD
+
+* update AUTHORS to reflect recent changes
+
+* dump old README
+
+* simple test program (not yet supported by autotools, needs flac lib
+
+* autoheader/config.h support for parser buffer size
+
+* update autotool build system
+
+* update main interface/api file
+
+* support for custom cue values hidden as rem comments
+
+* add buffer size to config.h
+
+* prevent the parser from memory leaking/replace strdup() with
+  fixed-size array and strncpy/implement yacc|bison macros for buffer
+  creation/deletion
+
+* prevent the lexer from memory leaking/replace strdup() with
+  fixed-size array and strncpy
+
+* cd_delete() and track_delete() methods
+
+* support for cdtext filename
+
+* major code clean up
+
+* initial clean up for libcue

mpfc-2.0.tar.bz2/libcue/Makefile.am Added

mpfc-2.0.tar.bz2/libcue/Makefile.in Added

@@ -0,0 +1,692 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#ACLOCAL_AMFLAGS		= -I config
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = libcue
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am AUTHORS \
+	COPYING ChangeLog NEWS README
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/mpfc-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$^/*$/.*$$,\1,'; \
+  sed_rest='s,^^/*/*,,'; \
+  sed_last='s,^.*/$^/*$$$,\1,'; \
+  sed_butlast='s,/*^/*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COMMON_LIBS = @COMMON_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_CFLAGS = @CURSES_CFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GENERAL_PLUGINS = @GENERAL_PLUGINS@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GPM_LIBS = @GPM_LIBS@
+GREP = @GREP@
+GSTREAMER_AUDIO_CFLAGS = @GSTREAMER_AUDIO_CFLAGS@
+GSTREAMER_AUDIO_LIBS = @GSTREAMER_AUDIO_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSON_CFLAGS = @JSON_CFLAGS@
+JSON_LIBS = @JSON_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MATH_LIBS = @MATH_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLIST_PLUGINS = @PLIST_PLUGINS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+RESOLV_LIBS = @RESOLV_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
+TAGLIB_LIBS = @TAGLIB_LIBS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAKEFLAGS = -j1
+
+#AUTOMAKE_OPTIONS	= foreign 1.10 dist-bzip2
+SUBDIRS = src/libcue
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libcue/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign libcue/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+
+#EXTRA_DIST		= autogen.sh
+
+# 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:

mpfc-2.0.tar.bz2/libcue/NEWS Added

@@ -0,0 +1,112 @@
+Changes since 1.3.0
+
+* force make to *not* build things in parallel since this tends to mess things up
+
+* update changelog
+
+* set version number to 1.4.0 (libtool)
+
+* update copyright
+
+* fix compiler warning: input() defined but not used
+
+* new flex behaviour: explicitly enable yylineno usage
+
+* new automake macro name
+
+* possible fix for compilation problems on win32
+
+* update COPYING and corrected copyright notices in several source code files
+
+* Update general COPYRIGHT notice as well as several file specific notifications
+
+* update ChangeLog and NEWS
+
+Changes since 1.2.0
+
+* fix for invalid pointer
+
+Changes from cuetools svn (>1.3.1) to libcue 1.2.0
+
+* Update copyright notifications
+
+* Switch copyright licence to 2-clause BSD
+
+* Update AUTHORS to reflect recent changes
+
+* Update autotool build system
+
+* Update main interface/api file
+
+* API for parsing non standard values in REM comments
+
+* Fix the lexer and parser memory leak
+
+* Methods for freeing allocated Cd and Track objects
+
+* Support for cdtext filename
+
+* Major code clean up
+
+* Initial clean up for libcue
+
+Changes since 1.3
+
+* Applied most of Branden Robinson's Debian patch
+  (cuetools_1.3-2.diff.gz). This included many fixes and enhancements
+  to tools and manual pages. cuebreakpoints and cueconvert will exit if
+  they fail on any of the input files. cuebreakpoints, cueconvert, and
+  cuetools will exit with a nonzero return value if there was a failure
+  on an input file.
+
+* Added version option to all tools.
+
+* Single quoted string support has been removed.  This was broken, and I am not
+  sure of any software that supports single quoted strings in cue or toc files.
+
+Changes since 1.2
+
+* Build system has been rewritten using automake/autoconf.
+
+* Added append, prepend, and split pregap modes to cuebreakpoints.
+
+* Fixed possible compilation error with Bison.
+
+* All tools accept long options.
+
+* Programs exit if --input-format or --output-format is an illegal value.
+
+Changes since 1.1
+
+* cuebreakpoints was not printing the last track breakpoint.  This has been
+  fixed.
+
+* cueprint now prints a zero-length string for undefined values.  Flags, width,
+  and precision are applied to conversion characters which have no conversion.
+
+* Added a tagging script, cuetag.sh, which uses cueprint, vorbiscomment, and
+  mp3info to tag Ogg Vorbis and MP3 files.  This needs more testing and
+  documentation.
+
+* Added a track selection flag to cueprint.
+
+Changes since 1.0
+
+* File formats documentation has been readded and updated (docs/formats.txt).
+
+* ``CDTEXTFILE`` is now a recognized (but ignored) keyword.
+
+* If only a disc or track template is specified on the command line, then only
+  the disc or track information is printed, respectively.
+
+* cueprint now supports flags and width and precision values for template
+  expansion (like the printf command).
+
+Changes since 0.6
+
+* cuetools-1.x is a significant code rewrite of 0.x.  The cue/toc parsing code
+  has been reimplemented in lex/yacc.
+
+* cuerename has been replaced by the more general utility cueprint.
+
+* Usage syntax of the utilities has changed.  See the respective man pages.

mpfc-2.0.tar.bz2/libcue/README Added

mpfc-2.0.tar.bz2/libcue/src Added

mpfc-2.0.tar.bz2/libcue/src/libcue Added

mpfc-2.0.tar.bz2/libcue/src/libcue/Makefile.am Added

mpfc-2.0.tar.bz2/libcue/src/libcue/Makefile.in Added

@@ -0,0 +1,714 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = libcue/src/libcue
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am cue_parser.h \
+	cue_parser.c cue_scanner.c $(top_srcdir)/depcomp \
+	$(top_srcdir)/ylwrap
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/mpfc-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmpfccue_la_LIBADD =
+am_libmpfccue_la_OBJECTS = cd.lo cdtext.lo rem.lo time.lo \
+	cue_parser.lo cue_scanner.lo
+libmpfccue_la_OBJECTS = $(am_libmpfccue_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
+AM_V_LEX = $(am__v_LEX_@AM_V@)
+am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
+am__v_LEX_0 = @echo "  LEX     " $@;
+am__v_LEX_1 = 
+YLWRAP = $(top_srcdir)/ylwrap
+am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
+		   -e s/c++$$/h++/ -e s/c$$/h/
+YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
+LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
+AM_V_YACC = $(am__v_YACC_@AM_V@)
+am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
+am__v_YACC_0 = @echo "  YACC    " $@;
+am__v_YACC_1 = 
+SOURCES = $(libmpfccue_la_SOURCES)
+DIST_SOURCES = $(libmpfccue_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COMMON_LIBS = @COMMON_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_CFLAGS = @CURSES_CFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GENERAL_PLUGINS = @GENERAL_PLUGINS@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GPM_LIBS = @GPM_LIBS@
+GREP = @GREP@
+GSTREAMER_AUDIO_CFLAGS = @GSTREAMER_AUDIO_CFLAGS@
+GSTREAMER_AUDIO_LIBS = @GSTREAMER_AUDIO_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSON_CFLAGS = @JSON_CFLAGS@
+JSON_LIBS = @JSON_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MATH_LIBS = @MATH_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLIST_PLUGINS = @PLIST_PLUGINS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+RESOLV_LIBS = @RESOLV_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
+TAGLIB_LIBS = @TAGLIB_LIBS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_YFLAGS = -d
+EXTRA_DIST = libcue.h cd.h cdtext.h rem.h time.h config.h # libcue.pc.in
+
+#pkgconfigdir		= $(libdir)/pkgconfig
+#pkgconfig_DATA		= libcue.pc
+AM_CPPFLAGS = \
+			-I.				\
+			-Wall -Wmissing-declarations
+
+libmpfccue_la_SOURCES = \
+			cd.c				\
+			cdtext.c			\
+			rem.c				\
+			time.c				\
+			cue_parser.y			\
+			cue_scanner.l
+
+
+#libmpfccueinclude_HEADERS	= 				\
+#			libcue.h			\
+#			cd.h				\
+#			cdtext.h			\
+#			rem.h				\
+#			time.h
+noinst_LTLIBRARIES = libmpfccue.la
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .l .lo .o .obj .y
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libcue/src/libcue/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign libcue/src/libcue/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+cue_parser.h: cue_parser.c
+	@if test ! -f $@; then rm -f cue_parser.c; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) cue_parser.c; else :; fi
+
+libmpfccue.la: $(libmpfccue_la_OBJECTS) $(libmpfccue_la_DEPENDENCIES) $(EXTRA_libmpfccue_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libmpfccue_la_OBJECTS) $(libmpfccue_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdtext.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cue_parser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cue_scanner.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rem.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+.l.c:
+	$(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
+
+.y.c:
+	$(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f cue_parser.c
+	-rm -f cue_parser.h
+	-rm -f cue_scanner.c
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+#libmpfccue_la_LDFLAGS	= -version-info 2:0 
+#libmpfccueincludedir	= $(includedir)/@LIBMPFCCUE_LIBRARY_NAME@
+
+# 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:

mpfc-2.0.tar.bz2/libcue/src/libcue/cd.c Added

@@ -0,0 +1,426 @@
+/*
+ * Copyright (c) 2004, 2005, 2006, 2007, Svend Sorensen
+ * Copyright (c) 2009, 2010 Jochen Keil
+ * For license terms, see the file COPYING in this distribution.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "cd.h"
+
+typedef struct Data Data;
+struct Data {
+	int type;			/* DataType */
+	char *name;			/* data source name */
+	long start;			/* start time for data */
+	long length;			/* length of data */
+};
+
+struct Track {
+	Data zero_pre;			/* pre-gap generated with zero data */
+	Data file;			/* track data file */
+	Data zero_post;			/* post-gap generated with zero data */
+	int mode;			/* track mode */
+	int sub_mode;			/* sub-channel mode */
+	int flags;			/* flags */
+	char *isrc;			/* IRSC Code (5.22.4) 12 bytes */
+	Cdtext *cdtext;			/* CD-TEXT */
+	Rem* rem;
+	int nindex;			/* number of indexes */
+	long indexMAXINDEX;		/* indexes (in frames) (5.29.2.5)
+					 * relative to start of track
+					 * index0 should always be zero */
+};
+
+struct Cd {
+	int mode;			/* disc mode */
+	char *catalog;			/* Media Catalog Number (5.22.3) */
+	char *cdtextfile;		/* Filename of CDText File */
+	Cdtext *cdtext;			/* CD-TEXT */
+	Rem* rem;
+	int ntrack;			/* number of tracks in album */
+	Track *trackMAXTRACK;		/* array of tracks */
+};
+
+Cd *cd_init(void)
+{
+	Cd *cd = NULL;
+	cd = malloc(sizeof(Cd));
+
+	if(NULL == cd) {
+		fprintf(stderr, "unable to create cd\n");
+	} else {
+		cd->mode = MODE_CD_DA;
+		cd->catalog = NULL;
+		cd->cdtextfile = NULL;
+		cd->cdtext = cdtext_init();
+		cd->rem = rem_new();
+		cd->ntrack = 0;
+	}
+
+	return cd;
+}
+
+void track_delete(struct Track* track)
+{
+	if (track != NULL)
+	{
+		cdtext_delete(track_get_cdtext(track));
+
+		rem_free(track_get_rem(track));
+
+		free(track->isrc);
+
+		free(track->zero_pre.name);
+
+		free(track->zero_post.name);
+
+		free(track->file.name);
+
+		free(track);
+	}
+}
+
+void cd_delete(struct Cd* cd)
+{
+	int i = 0;
+
+	if (cd != NULL)
+	{
+		free(cd->catalog);
+
+		free(cd->cdtextfile);
+
+		for (i = 0; i < cd->ntrack; i++)
+			track_delete(cd->tracki);
+
+		cdtext_delete(cd_get_cdtext(cd));
+
+		rem_free(cd_get_rem(cd));
+
+		free(cd);
+	}
+}
+
+Track *track_init(void)
+{
+	Track *track = NULL;
+	track = malloc(sizeof(Track));
+
+	if (NULL == track) {
+		fprintf(stderr, "unable to create track\n");
+	} else {
+		track->zero_pre.type = DATA_ZERO;
+		track->zero_pre.name = NULL;
+		track->zero_pre.start = 0;
+		track->zero_pre.length = 0;
+
+		track->file.type = DATA_AUDIO;
+		track->file.name = NULL;
+		track->file.start = 0;
+		track->file.length = 0;
+
+		track->zero_post.type = DATA_ZERO;
+		track->zero_post.name = NULL;
+		track->zero_post.start = 0;
+		track->zero_post.length = 0;
+
+		track->mode = MODE_AUDIO;
+		track->sub_mode = SUB_MODE_RW;
+		track->flags = FLAG_NONE;
+		track->isrc = NULL;
+		track->cdtext = cdtext_init();
+		track->rem = rem_new();
+		track->nindex = 0;
+	}
+
+	return track;
+}
+
+/*
+ * cd structure functions
+ */
+void cd_set_mode(Cd *cd, int mode)
+{
+	cd->mode = mode;
+}
+
+int cd_get_mode(Cd *cd)
+{
+	return cd->mode;
+}
+
+void cd_set_catalog(Cd *cd, char *catalog)
+{
+	if (cd->catalog)
+		free(cd->catalog);
+
+	cd->catalog = strdup(catalog);
+}
+
+void cd_set_cdtextfile(Cd *cd, char *cdtextfile)
+{
+	if (cd->cdtextfile)
+		free(cd->cdtextfile);
+
+	cd->cdtextfile = strdup(cdtextfile);
+}
+
+char *cd_get_cdtextfile(Cd *cd)
+{
+	return cd->cdtextfile;
+}
+
+Cdtext *cd_get_cdtext(Cd *cd)
+{
+	if (cd != NULL)
+		return cd->cdtext;
+	else
+		return NULL;
+}
+
+Rem*
+cd_get_rem(	Cd* cd)
+{
+	if (cd != NULL)
+		return cd->rem;
+	else
+		return NULL;
+}
+
+Track *cd_add_track(Cd *cd)
+{
+	if (MAXTRACK - 1 > cd->ntrack)
+		cd->ntrack++;
+	else
+		fprintf(stderr, "too many tracks\n");
+
+	/* this will reinit last track if there were too many */
+	cd->trackcd->ntrack - 1 = track_init();
+
+	return cd->trackcd->ntrack - 1;
+}
+
+
+int cd_get_ntrack(Cd *cd)
+{
+	return cd->ntrack;
+}
+
+Track *cd_get_track(Cd *cd, int i)
+{
+	if ((0 < i) && (i <= cd->ntrack) && (cd != NULL))
+		return cd->tracki - 1;
+	else
+		return NULL;
+}
+
+/*
+ * track structure functions
+ */
+
+void track_set_filename(Track *track, char *filename)
+{
+	if (track->file.name)
+		free(track->file.name);
+
+	track->file.name = strdup(filename);
+}
+
+char *track_get_filename(Track *track)
+{
+	return track->file.name;
+}
+
+void track_set_start(Track *track, long start)
+{
+	track->file.start = start;
+}
+
+long track_get_start(Track *track)
+{
+	return track->file.start;
+}
+
+void track_set_length(Track *track, long length)
+{
+	track->file.length = length;
+}
+
+long track_get_length(Track *track)
+{
+	return track->file.length;
+}
+
+void track_set_mode(Track *track, int mode)
+{
+	track->mode = mode;
+}
+
+int track_get_mode(Track *track)
+{
+	return track->mode;
+}
+
+void track_set_sub_mode(Track *track, int sub_mode)
+{
+	track->sub_mode = sub_mode;
+}
+
+int track_get_sub_mode(Track *track)
+{
+	return track->sub_mode;
+}
+
+void track_set_flag(Track *track, int flag)
+{
+	track->flags |= flag;
+}
+
+void track_clear_flag(Track *track, int flag)
+{
+	track->flags &= ~flag;
+}
+
+int track_is_set_flag(Track *track, int flag)
+{
+	return track->flags & flag;
+}
+
+void track_set_zero_pre(Track *track, long length)
+{
+	track->zero_pre.length = length;
+}
+
+long track_get_zero_pre(Track *track)
+{
+	return track->zero_pre.length;
+}
+
+void track_set_zero_post(Track *track, long length)
+{
+	track->zero_post.length = length;
+}
+
+long track_get_zero_post(Track *track)
+{
+	return track->zero_post.length;
+}
+void track_set_isrc(Track *track, char *isrc)
+{
+	if (track->isrc)
+		free(track->isrc);
+
+	track->isrc = strdup(isrc);
+}
+
+char *track_get_isrc(Track *track)
+{
+	return track->isrc;
+}
+
+Cdtext *track_get_cdtext(Track *track)
+{
+	if (track != NULL)
+		return track->cdtext;
+	else
+		return NULL;
+}
+
+Rem*
+track_get_rem(	Track* track)
+{
+	if (track != NULL)
+		return track->rem;
+	else
+		return NULL;
+}
+
+void track_add_index(Track *track, long ind)
+{
+	if (MAXTRACK - 1 > track->nindex)
+		track->nindex++;
+	else
+		fprintf(stderr, "too many indexes\n");
+
+	/* this will overwrite last index if there were too many */
+	track->indextrack->nindex - 1 = ind;
+}
+
+void track_remove_indices(Track *track)
+{
+	track->nindex = 0;
+}
+
+int track_get_nindex(Track *track)
+{
+	return track->nindex;
+}
+
+long track_get_index(Track *track, int i)
+{
+	if ((0 <= i) && (i < track->nindex))
+		return track->indexi;
+
+	return -1;
+}
+
+/*
+ * dump cd information
+ */
+static void cd_track_dump(Track *track)
+{
+	int i;
+
+	printf("zero_pre: %ld\n", track->zero_pre.length);
+	printf("filename: %s\n", track->file.name);
+	printf("start: %ld\n", track->file.start);
+	printf("length: %ld\n", track->file.length);
+	printf("zero_post: %ld\n", track->zero_post.length);
+	printf("mode: %d\n", track->mode);
+	printf("sub_mode: %d\n", track->sub_mode);
+	printf("flags: 0x%x\n", track->flags);
+	printf("isrc: %s\n", track->isrc);
+	printf("indexes: %d\n", track->nindex);
+
+	for (i = 0; i < track->nindex; ++i)
+		printf("index %d: %ld\n", i, track->indexi);
+
+	if (NULL != track->cdtext) {
+		printf("cdtext:\n");
+		cdtext_dump(track->cdtext, 1);
+	}
+
+	if (track->rem != NULL)
+	{
+		fprintf(stdout, "rem:\n");
+		rem_dump(track->rem);
+	}
+}
+
+void cd_dump(Cd *cd)
+{
+	int i;
+
+	printf("Disc Info\n");
+	printf("mode: %d\n", cd->mode);
+	printf("catalog: %s\n", cd->catalog);
+	printf("cdtextfile: %s\n", cd->cdtextfile);
+	if (NULL != cd->cdtext) {
+		printf("cdtext:\n");
+		cdtext_dump(cd->cdtext, 0);
+	}
+
+	if (cd->rem != NULL)
+	{
+		fprintf(stdout, "rem:\n");
+		rem_dump(cd->rem);
+	}
+
+	for (i = 0; i < cd->ntrack; ++i) {
+		printf("Track %d Info\n", i + 1);
+		cd_track_dump(cd->tracki);
+	}
+}
+

mpfc-2.0.tar.bz2/libcue/src/libcue/cd.h Added

@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2004, 2005, 2006, 2007, Svend Sorensen
+ * Copyright (c) 2009, 2010 Jochen Keil
+ * For license terms, see the file COPYING in this distribution.
+ */
+
+/* references: MMC-3 draft revsion - 10g */
+
+#ifndef CD_H
+#define CD_H
+
+#include "cdtext.h"
+#include "rem.h"
+
+#define MAXTRACK	99	/* Red Book track limit */
+#define MAXINDEX	99	/* Red Book index limit */
+
+/*
+ * disc modes
+ * DATA FORM OF MAIN DATA (5.29.2.8)
+ */
+enum DiscMode {
+	MODE_CD_DA,		/* CD-DA */
+	MODE_CD_ROM,		/* CD-ROM mode 1 */
+	MODE_CD_ROM_XA		/* CD-ROM XA and CD-I */
+};
+
+/*
+ * track modes
+ * 5.29.2.8 DATA FORM OF MAIN DATA
+ * Table 350 - Data Block Type Codes
+ */
+enum TrackMode {
+	MODE_AUDIO,		/* 2352 byte block length */
+	MODE_MODE1,		/* 2048 byte block length */
+	MODE_MODE1_RAW,		/* 2352 byte block length */
+	MODE_MODE2,		/* 2336 byte block length */
+	MODE_MODE2_FORM1,	/* 2048 byte block length */
+	MODE_MODE2_FORM2,	/* 2324 byte block length */
+	MODE_MODE2_FORM_MIX,	/* 2332 byte block length */
+	MODE_MODE2_RAW		/* 2352 byte block length */
+};
+
+/*
+ * sub-channel mode
+ * 5.29.2.13 Data Form of Sub-channel
+ * NOTE: not sure if this applies to cue files
+ */
+enum TrackSubMode {
+	SUB_MODE_RW,		/* RAW Data */
+	SUB_MODE_RW_RAW		/* PACK DATA (written R-W */
+};
+
+/*
+ * track flags
+ * Q Sub-channel Control Field (4.2.3.3, 5.29.2.2)
+ */
+enum TrackFlag {
+	FLAG_NONE		= 0x00,	/* no flags set */
+	FLAG_PRE_EMPHASIS	= 0x01,	/* audio recorded with pre-emphasis */
+	FLAG_COPY_PERMITTED	= 0x02,	/* digital copy permitted */
+	FLAG_DATA		= 0x04,	/* data track */
+	FLAG_FOUR_CHANNEL	= 0x08,	/* 4 audio channels */
+	FLAG_SCMS		= 0x10,	/* SCMS (not Q Sub-ch.) (5.29.2.7) */
+	FLAG_ANY		= 0xff	/* any flags set */
+};
+
+enum DataType {
+	DATA_AUDIO,
+	DATA_DATA,
+	DATA_FIFO,
+	DATA_ZERO
+};
+
+/* ADTs */
+typedef struct Cd Cd;
+typedef struct Track Track;
+
+/* return pointer to CD structure */
+Cd *cd_init(void);
+
+Track *track_init(void);
+
+void track_delete(struct Track* track);
+
+void cd_delete(struct Cd* cd);
+
+void cd_dump(Cd *cd);
+
+/*
+ * Cd functions
+ */
+
+void cd_set_mode(Cd *cd, int mode);
+int cd_get_mode(Cd *cd);
+
+void cd_set_catalog(Cd *cd, char *catalog);
+char *cd_get_catalog(Cd *cd);
+
+void cd_set_cdtextfile(Cd *cd, char *cdtextfile);
+char *cd_get_cdtextfile(Cd *cd);
+
+/*
+ * return pointer to cd's Cdtext
+ */
+Cdtext *cd_get_cdtext(Cd *cd);
+
+Rem* cd_get_rem(Cd* cd);
+
+/*
+ * add a new track to cd, increment number of tracks
+ * and return pointer to new track
+ */
+Track *cd_add_track(Cd *cd);
+
+/*
+ * return number of tracks in cd
+ */
+int cd_get_ntrack(Cd *cd);
+
+Track *cd_get_track(Cd *cd, int i);
+
+/*
+ * Track functions
+ */
+
+/* filename of data file */
+void track_set_filename(Track *track, char *filename);
+char *track_get_filename(Track *track);
+
+/* track start is starting position in data file */
+void track_set_start(Track *track, long start);
+long track_get_start(Track *track);
+
+/* track length is length of data file to use */
+void track_set_length(Track *track, long length);
+long track_get_length(Track *track);
+
+/* see enum TrackMode */
+void track_set_mode(Track *track, int mode);
+int track_get_mode(Track *track);
+
+/* see enum TrackSubMode */
+void track_set_sub_mode(Track *track, int sub_mode);
+int track_get_sub_mode(Track *track);
+
+/* see enum TrackFlag */
+void track_set_flag(Track *track, int flag);
+void track_clear_flag(Track *track, int flag);
+int track_is_set_flag(Track *track, int flag);
+
+/* zero data pregap */
+void track_set_zero_pre(Track *track, long length);
+long track_get_zero_pre(Track *track);
+
+/* zero data postgap */
+void track_set_zero_post(Track *track, long length);
+long track_get_zero_post(Track *track);
+
+void track_set_isrc(Track *track, char *isrc);
+char *track_get_isrc(Track *track);
+
+Cdtext *track_get_cdtext(Track *track);
+
+Rem* track_get_rem(Track* track);
+
+void track_add_index(Track *track, long index);
+int track_get_nindex(Track *track);
+long track_get_index(Track *track, int i);
+void track_remove_indices(Track *track);
+
+#endif

mpfc-2.0.tar.bz2/libcue/src/libcue/cdtext.c Added

@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2004, 2005, 2006, 2007, Svend Sorensen
+ * Copyright (c) 2009, 2010 Jochen Keil
+ * For license terms, see the file COPYING in this distribution.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "cdtext.h"
+
+struct Cdtext {
+	int pti;
+	int format;
+	char *value;
+};
+
+Cdtext *cdtext_init(void)
+{
+	Cdtext *new_cdtext = NULL;
+
+	Cdtext cdtext = {
+		{PTI_TITLE,		FORMAT_CHAR,	NULL},
+		{PTI_PERFORMER,		FORMAT_CHAR,	NULL},
+		{PTI_SONGWRITER,	FORMAT_CHAR,	NULL},
+		{PTI_COMPOSER,		FORMAT_CHAR,	NULL},
+		{PTI_ARRANGER,		FORMAT_CHAR,	NULL},
+		{PTI_MESSAGE,		FORMAT_CHAR,	NULL},
+		{PTI_DISC_ID,		FORMAT_BINARY,	NULL},
+		{PTI_GENRE,		FORMAT_BINARY,	NULL},
+		{PTI_TOC_INFO1,		FORMAT_BINARY,	NULL},
+		{PTI_TOC_INFO2,		FORMAT_BINARY,	NULL},
+		{PTI_RESERVED1,		FORMAT_CHAR,	NULL},
+		{PTI_RESERVED2,		FORMAT_CHAR,	NULL},
+		{PTI_RESERVED3,		FORMAT_CHAR,	NULL},
+		{PTI_RESERVED4,		FORMAT_CHAR,	NULL},
+		{PTI_UPC_ISRC,		FORMAT_CHAR,	NULL},
+		{PTI_SIZE_INFO,		FORMAT_BINARY,	NULL},
+		{PTI_END,		FORMAT_CHAR,	NULL}
+	};
+
+	new_cdtext = (Cdtext *) calloc (sizeof (cdtext) / sizeof (Cdtext), sizeof (Cdtext));
+	if (NULL == new_cdtext)
+		fprintf (stderr, "problem allocating memory\n");
+	else
+		memcpy (new_cdtext, cdtext, sizeof(cdtext));
+
+	return new_cdtext;
+}
+
+void cdtext_delete(Cdtext *cdtext)
+{
+	int i;
+
+	if (NULL != cdtext) {
+		for (i = 0; PTI_END != cdtexti.pti; i++)
+		{
+			free (cdtexti.value);
+		}
+		free (cdtext);
+	}
+}
+
+/* return 0 if there is no cdtext, returns non-zero otherwise */
+int cdtext_is_empty(Cdtext *cdtext)
+{
+	for (; PTI_END != cdtext->pti; cdtext++)
+		if (NULL != cdtext->value)
+			return -1;
+
+	return 0;
+}
+
+/* sets cdtext's pti entry to field */
+void cdtext_set(int pti, char *value, Cdtext *cdtext)
+{
+	if (NULL != value)	/* don't pass NULL to strdup */
+		for (; PTI_END != cdtext->pti; cdtext++)
+			if (pti == cdtext->pti) {
+				free (cdtext->value);
+				cdtext->value = strdup (value);
+			}
+}
+
+/* returns value for pti, NULL if pti is not found */
+char *cdtext_get(int pti, Cdtext *cdtext)
+{
+	for (; PTI_END != cdtext->pti; cdtext++)
+		if (pti == cdtext->pti)
+			return cdtext->value;
+
+	return NULL;
+}
+
+const char *cdtext_get_key(int pti, int istrack)
+{
+	const char *key = NULL;
+
+	switch (pti) {
+	case PTI_TITLE:
+		key = "TITLE";
+		break;
+	case PTI_PERFORMER:
+		key = "PERFORMER";
+		break;
+	case PTI_SONGWRITER:
+		key = "SONGWRITER";
+		break;
+	case PTI_COMPOSER:
+		key = "COMPOSER";
+		break;
+	case PTI_ARRANGER:
+		key = "ARRANGER";
+		break;
+	case PTI_MESSAGE:
+		key = "MESSAGE";
+		break;
+	case PTI_DISC_ID:
+		key = "DISC_ID";
+		break;
+	case PTI_GENRE:
+		key = "GENRE";
+		break;
+	case PTI_TOC_INFO1:
+		key = "TOC_INFO1";
+		break;
+	case PTI_TOC_INFO2:
+		key = "TOC_INFO1";
+		break;
+	case PTI_RESERVED1:
+		/* reserved */
+		break;
+	case PTI_RESERVED2:
+		/* reserved */
+		break;
+	case PTI_RESERVED3:
+		/* reserved */
+		break;
+	case PTI_RESERVED4:
+		/* reserved */
+		break;
+	case PTI_UPC_ISRC:
+		if (0 == istrack)
+			key = "UPC_EAN";
+		else
+			key = "ISRC";
+		break;
+	case PTI_SIZE_INFO:
+		key = "SIZE_INFO";
+		break;
+	}
+
+	return key;
+}
+
+void cdtext_dump(Cdtext *cdtext, int istrack)
+{
+	int pti;
+	char *value = NULL;
+
+	for (pti = 0; PTI_END != pti; pti++) {
+		if (NULL != (value = cdtext_get(pti, cdtext))) {
+			printf("%s: ", cdtext_get_key(pti, istrack));
+			printf("%s\n", value);
+		}
+	}
+}

mpfc-2.0.tar.bz2/libcue/src/libcue/cdtext.h Added

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2004, 2005, 2006, 2007, Svend Sorensen
+ * Copyright (c) 2009, 2010 Jochen Keil
+ * For license terms, see the file COPYING in this distribution.
+ */
+
+/* references: MMC-3 draft revsion - 10g */
+
+#ifndef CDTEXT_H
+#define CDTEXT_H
+
+#include <stdio.h>
+
+/* cdtext pack type indicators */
+enum Pti {
+	PTI_TITLE,	/* title of album or track titles */
+	PTI_PERFORMER,	/* name(s) of the performer(s) */
+	PTI_SONGWRITER,	/* name(s) of the songwriter(s) */
+	PTI_COMPOSER,	/* name(s) of the composer(s) */
+	PTI_ARRANGER,	/* name(s) of the arranger(s) */
+	PTI_MESSAGE,	/* message(s) from the content provider and/or artist */
+	PTI_DISC_ID,	/* (binary) disc identification information */
+	PTI_GENRE,	/* (binary) genre identification and genre information */
+	PTI_TOC_INFO1,	/* (binary) table of contents information */
+	PTI_TOC_INFO2,	/* (binary) second table of contents information */
+	PTI_RESERVED1,	/* reserved */
+	PTI_RESERVED2,	/* reserved */
+	PTI_RESERVED3,	/* reserved */
+	PTI_RESERVED4,	/* reserved for content provider only */
+	PTI_UPC_ISRC,	/* UPC/EAN code of the album and ISRC code of each track */
+	PTI_SIZE_INFO,	/* (binary) size information of the block */
+	PTI_END		/* terminating PTI (for stepping through PTIs) */
+};
+
+enum PtiFormat {
+	FORMAT_CHAR,		/* single or double byte character string */
+	FORMAT_BINARY		/* binary data */
+};
+
+typedef struct Cdtext Cdtext;
+
+/* return a pointer to a new Cdtext */
+Cdtext *cdtext_init(void);
+
+/* release a Cdtext */
+void cdtext_delete(Cdtext *cdtext);
+
+/* returns non-zero if there are no CD-TEXT fields set, zero otherwise */
+int cdtext_is_empty(Cdtext *cdtext);
+
+/* set CD-TEXT field to value for PTI pti */
+void cdtext_set(int pti, char *value, Cdtext *cdtext);
+
+/* returns pointer to CD-TEXT value for PTI pti */
+char *cdtext_get(int pti, Cdtext *cdtext);
+
+/*
+ * returns appropriate string for PTI pti
+ * if istrack is zero, UPC/EAN string will be returned for PTI_UPC_ISRC
+ * othwise ISRC string will be returned
+ */
+const char *cdtext_get_key(int pti, int istrack);
+
+/*
+ * dump all cdtext info
+ * in human readable format (for debugging)
+ */
+void cdtext_dump(Cdtext *cdtext, int istrack);
+
+#endif

mpfc-2.0.tar.bz2/libcue/src/libcue/config.h Added

mpfc-2.0.tar.bz2/libcue/src/libcue/cue_parser.c Added

@@ -0,0 +1,1886 @@
+/* A Bison parser, made by GNU Bison 3.0.2.  */
+
+/* Bison implementation for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "3.0.2"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
+
+
+
+/* Copy the first part of user declarations.  */
+#line 1 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:339  */
+
+/*
+ * Copyright (c) 2004, 2005, 2006, 2007, Svend Sorensen
+ * Copyright (c) 2009, 2010 Jochen Keil
+ * Copyright (c) 2012, 2013 Sergey Galanov
+ * For license terms, see the file COPYING in this distribution.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "config.h"
+
+#include "cd.h"
+#include "time.h"
+
+#ifdef YY_BUF_SIZE
+#undef YY_BUF_SIZE
+#endif
+#define YY_BUF_SIZE 16384
+
+#define YYDEBUG 1
+
+char fnamebufPARSER_BUFFER;
+
+/* debugging */
+//int yydebug = 1;
+
+extern int yylineno;
+extern FILE* yyin;
+
+const char *yyfilename;
+
+static Cd *cd = NULL;
+static Track *track = NULL;
+static Track *prev_track = NULL;
+static Cdtext *cdtext = NULL;
+static Rem *rem = NULL;
+static char *prev_filename = NULL;	/* last file in or before last track */
+static char *cur_filename = NULL;	/* last file in the last track */
+static char *new_filename = NULL;	/* last file in this track */
+
+/* lexer interface */
+typedef struct yy_buffer_state* YY_BUFFER_STATE;
+
+int yylex(void);
+void yyerror(const char*);
+YY_BUFFER_STATE yy_scan_string(const char*);
+YY_BUFFER_STATE yy_create_buffer(FILE*, int);
+void yy_switch_to_buffer(YY_BUFFER_STATE);
+void yy_delete_buffer(YY_BUFFER_STATE);
+
+/* parser interface */
+int yyparse(void);
+Cd *cue_parse_file(FILE *fp, const char *filename);
+Cd *cue_parse_string(const char*);
+
+#line 125 "cue_parser.c" /* yacc.c:339  */
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* In a future release of Bison, this section will be replaced
+   by #include "y.tab.h".  */
+#ifndef YY_YY_CUE_PARSER_H_INCLUDED
+# define YY_YY_CUE_PARSER_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    NUMBER = 258,
+    STRING = 259,
+    CATALOG = 260,
+    CDTEXTFILE = 261,
+    FFILE = 262,
+    BINARY = 263,
+    MOTOROLA = 264,
+    AIFF = 265,
+    WAVE = 266,
+    MP3 = 267,
+    FLAC = 268,
+    APE = 269,
+    TRACK = 270,
+    AUDIO = 271,
+    MODE1_2048 = 272,
+    MODE1_2352 = 273,
+    MODE2_2336 = 274,
+    MODE2_2048 = 275,
+    MODE2_2342 = 276,
+    MODE2_2332 = 277,
+    MODE2_2352 = 278,
+    TRACK_ISRC = 279,
+    FLAGS = 280,
+    PRE = 281,
+    DCP = 282,
+    FOUR_CH = 283,
+    SCMS = 284,
+    PREGAP = 285,
+    INDEX = 286,
+    POSTGAP = 287,
+    BOM = 288,
+    TITLE = 289,
+    PERFORMER = 290,
+    SONGWRITER = 291,
+    COMPOSER = 292,
+    ARRANGER = 293,
+    MESSAGE = 294,
+    DISC_ID = 295,
+    GENRE = 296,
+    TOC_INFO1 = 297,
+    TOC_INFO2 = 298,
+    UPC_EAN = 299,
+    ISRC = 300,
+    SIZE_INFO = 301,
+    DATE = 302,
+    COMMENT = 303,
+    RGENRE = 304,
+    REPLAYGAIN_ALBUM_GAIN = 305,
+    REPLAYGAIN_ALBUM_PEAK = 306,
+    REPLAYGAIN_TRACK_GAIN = 307,
+    REPLAYGAIN_TRACK_PEAK = 308
+  };
+#endif
+/* Tokens.  */
+#define NUMBER 258
+#define STRING 259
+#define CATALOG 260
+#define CDTEXTFILE 261
+#define FFILE 262
+#define BINARY 263
+#define MOTOROLA 264
+#define AIFF 265
+#define WAVE 266
+#define MP3 267
+#define FLAC 268
+#define APE 269
+#define TRACK 270
+#define AUDIO 271
+#define MODE1_2048 272
+#define MODE1_2352 273
+#define MODE2_2336 274
+#define MODE2_2048 275
+#define MODE2_2342 276
+#define MODE2_2332 277
+#define MODE2_2352 278
+#define TRACK_ISRC 279
+#define FLAGS 280
+#define PRE 281
+#define DCP 282
+#define FOUR_CH 283
+#define SCMS 284
+#define PREGAP 285
+#define INDEX 286
+#define POSTGAP 287
+#define BOM 288
+#define TITLE 289
+#define PERFORMER 290
+#define SONGWRITER 291
+#define COMPOSER 292
+#define ARRANGER 293
+#define MESSAGE 294
+#define DISC_ID 295
+#define GENRE 296
+#define TOC_INFO1 297
+#define TOC_INFO2 298
+#define UPC_EAN 299
+#define ISRC 300
+#define SIZE_INFO 301
+#define DATE 302
+#define COMMENT 303
+#define RGENRE 304
+#define REPLAYGAIN_ALBUM_GAIN 305
+#define REPLAYGAIN_ALBUM_PEAK 306
+#define REPLAYGAIN_TRACK_GAIN 307
+#define REPLAYGAIN_TRACK_PEAK 308
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
+{
+#line 62 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:355  */
+
+	long ival;
+	char *sval;
+
+#line 276 "cue_parser.c" /* yacc.c:355  */
+};
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE yylval;
+
+int yyparse (void);
+
+#endif /* !YY_YY_CUE_PARSER_H_INCLUDED  */
+
+/* Copy the second part of user declarations.  */
+
+#line 291 "cue_parser.c" /* yacc.c:358  */
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#else
+typedef signed char yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(E) ((void) (E))
+#else
+# define YYUSE(E) /* empty */
+#endif
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define YY_INITIAL_VALUE(Value) Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+       && ! ((defined YYMALLOC || defined malloc) \
+             && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined EXIT_SUCCESS
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined EXIT_SUCCESS
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+# define YYCOPY_NEEDED 1
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
+
+#endif
+
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)yyi = (Src)yyi;            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  4
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   161
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  56
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  22
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  76
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  108
+
+/* YYTRANSLATEYYX -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   308
+
+#define YYTRANSLATE(YYX)                                                \
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslateYYX : YYUNDEFTOK)
+
+/* YYTRANSLATETOKEN-NUM -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
+static const yytype_uint8 yytranslate =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+      54,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    55,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53
+};
+
+#if YYDEBUG
+  /* YYRLINEYYN -- Source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline =
+{
+       0,   142,   142,   146,   146,   149,   156,   158,   162,   163,
+     164,   165,   166,   167,   171,   181,   182,   186,   190,   191,
+     192,   193,   194,   195,   196,   197,   201,   223,   229,   230,
+     231,   232,   233,   234,   235,   236,   240,   241,   245,   246,
+     247,   248,   249,   250,   284,   285,   286,   289,   291,   295,
+     296,   297,   298,   302,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,   315,   316,   317,   318,   322,   323,   327,
+     331,   332,   333,   334,   335,   336,   337
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || 0
+/* YYTNAMESYMBOL-NUM -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname =
+{
+  "$end", "error", "$undefined", "NUMBER", "STRING", "CATALOG",
+  "CDTEXTFILE", "FFILE", "BINARY", "MOTOROLA", "AIFF", "WAVE", "MP3",
+  "FLAC", "APE", "TRACK", "AUDIO", "MODE1_2048", "MODE1_2352",
+  "MODE2_2336", "MODE2_2048", "MODE2_2342", "MODE2_2332", "MODE2_2352",
+  "TRACK_ISRC", "FLAGS", "PRE", "DCP", "FOUR_CH", "SCMS", "PREGAP",
+  "INDEX", "POSTGAP", "BOM", "TITLE", "PERFORMER", "SONGWRITER",
+  "COMPOSER", "ARRANGER", "MESSAGE", "DISC_ID", "GENRE", "TOC_INFO1",
+  "TOC_INFO2", "UPC_EAN", "ISRC", "SIZE_INFO", "DATE", "COMMENT", "RGENRE",
+  "REPLAYGAIN_ALBUM_GAIN", "REPLAYGAIN_ALBUM_PEAK",
+  "REPLAYGAIN_TRACK_GAIN", "REPLAYGAIN_TRACK_PEAK", "'\\n'", "':'",
+  "$accept", "cuefile", "maybe_bom", "new_cd", "global_statements",
+  "global_statement", "track_data", "track_list", "track", "file_format",
+  "new_track", "track_def", "track_mode", "track_statements",
+  "track_statement", "track_flags", "track_flag", "cdtext", "cdtext_item",
+  "time", "rem", "rem_item", YY_NULLPTR
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUMNUM -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_uint16 yytoknum =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,    10,    58
+};
+# endif
+
+#define YYPACT_NINF -64
+
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-64)))
+
+#define YYTABLE_NINF -27
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int8 yypact =
+{
+     -31,   -64,     4,   -64,   -64,   -64,   106,   -49,     2,     6,
+       7,   -64,   -64,   -64,   -64,   -64,   -64,   -64,   -64,   -64,
+     -64,   -64,   -64,   -64,   -64,   -64,   -64,   -64,   -64,   -64,
+     -64,   -64,   -64,    -7,   -64,    -3,   -64,     9,   -64,    10,
+     -64,   -27,   -26,     8,   -64,    20,    53,   -25,   -21,   -64,
+     -64,   -64,   -64,   -64,   -64,   -64,   -64,   -64,   -64,     1,
+      45,     3,    52,   -64,    55,    56,    55,   -64,     0,   -64,
+     -64,   -64,   -64,   -64,   -64,   -64,   -64,   -64,   -64,   -64,
+     -64,   -64,   -64,    15,   -64,    16,   107,    17,    19,    55,
+      21,   -64,   -64,   -64,   -64,   -64,   -64,   -64,   -64,   -64,
+      68,   -64,    22,   -64,    24,   -64,    71,   -64
+};
+
+  /* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
+static const yytype_uint8 yydefact =
+{
+       4,     3,     0,     5,     1,     6,     0,     0,     0,     0,
+       0,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    70,    71,    72,    73,    74,    75,
+      76,     7,    12,     2,    15,     0,    10,     0,    11,     0,
+      13,     0,     0,     0,    16,     0,     0,     0,     0,     8,
+       9,    25,    18,    19,    20,    21,    22,    23,    24,     0,
+       0,     0,     0,    47,     0,     0,     0,    45,     0,    36,
+      38,    39,    53,    69,    14,    28,    29,    30,    31,    32,
+      33,    34,    35,     0,    46,     0,     0,    67,     0,     0,
+       0,    37,    27,    41,    49,    50,    51,    52,    40,    48,
+       0,    42,     0,    44,     0,    43,     0,    68
+};
+
+  /* YYPGOTONTERM-NUM.  */
+static const yytype_int8 yypgoto =
+{
+     -64,   -64,   -64,   -64,   -64,   -64,    74,   -64,    48,   -64,
+     -64,   -64,   -64,   -64,    14,   -64,   -64,    80,   -64,   -63,
+     102,   -64
+};
+
+  /* YYDEFGOTONTERM-NUM.  */
+static const yytype_int8 yydefgoto =
+{
+      -1,     2,     3,     5,     6,    31,    67,    33,    34,    59,
+      35,    46,    83,    68,    69,    86,    99,    70,    37,    88,
+      71,    39
+};
+
+  /* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+static const yytype_int8 yytable =
+{
+     -17,    61,     1,    90,     4,    40,    41,    10,   -26,    51,
+      42,    43,    45,    47,    48,   -17,    52,    53,    54,    55,
+      56,    57,    58,    60,    62,    63,   102,    49,    50,    72,
+      64,    65,    66,    73,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    61,    74,    85,    84,    87,    89,
+      10,    75,    76,    77,    78,    79,    80,    81,    82,    92,
+      93,   104,   100,   101,   107,   103,   105,    62,    63,   106,
+      32,    44,    91,    64,    65,    66,    36,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    30,     7,    38,     0,
+       0,     8,     9,    10,     0,     0,     0,     0,     0,     0,
+       0,   -26,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    94,    95,    96,    97,     0,     0,     0,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+       0,    98
+};
+
+static const yytype_int8 yycheck =
+{
+       0,     1,    33,    66,     0,    54,     4,     7,    15,     1,
+       4,     4,    15,     4,     4,    15,     8,     9,    10,    11,
+      12,    13,    14,     3,    24,    25,    89,    54,    54,    54,
+      30,    31,    32,    54,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,     1,    54,     4,    54,     3,     3,
+       7,    16,    17,    18,    19,    20,    21,    22,    23,    54,
+      54,     3,    55,    54,     3,    54,    54,    24,    25,    55,
+       6,    33,    68,    30,    31,    32,     6,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,     1,     6,    -1,
+      -1,     5,     6,     7,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    15,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    26,    27,    28,    29,    -1,    -1,    -1,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+      -1,    54
+};
+
+  /* YYSTOSSTATE-NUM -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos =
+{
+       0,    33,    57,    58,     0,    59,    60,     1,     5,     6,
+       7,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      53,    61,    62,    63,    64,    66,    73,    74,    76,    77,
+      54,     4,     4,     4,    64,    15,    67,     4,     4,    54,
+      54,     1,     8,     9,    10,    11,    12,    13,    14,    65,
+       3,     1,    24,    25,    30,    31,    32,    62,    69,    70,
+      73,    76,    54,    54,    54,    16,    17,    18,    19,    20,
+      21,    22,    23,    68,    54,     4,    71,     3,    75,     3,
+      75,    70,    54,    54,    26,    27,    28,    29,    54,    72,
+      55,    54,    75,    54,     3,    54,    55,     3
+};
+
+  /* YYR1YYN -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1 =
+{
+       0,    56,    57,    58,    58,    59,    60,    60,    61,    61,
+      61,    61,    61,    61,    62,    63,    63,    64,    65,    65,
+      65,    65,    65,    65,    65,    65,    66,    67,    68,    68,
+      68,    68,    68,    68,    68,    68,    69,    69,    70,    70,
+      70,    70,    70,    70,    70,    70,    70,    71,    71,    72,
+      72,    72,    72,    73,    74,    74,    74,    74,    74,    74,
+      74,    74,    74,    74,    74,    74,    74,    75,    75,    76,
+      77,    77,    77,    77,    77,    77,    77
+};
+
+  /* YYR2YYN -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2 =
+{
+       0,     2,     4,     1,     0,     0,     0,     2,     3,     3,
+       1,     1,     1,     2,     4,     1,     2,     3,     1,     1,
+       1,     1,     1,     1,     1,     1,     0,     4,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     1,     1,
+       3,     3,     3,     4,     3,     1,     2,     0,     2,     1,
+       1,     1,     1,     3,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     5,     3,
+       1,     1,     1,     1,     1,     1,     1
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
+
+
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
+
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+{
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknumyytype, *yyvaluep);
+# endif
+  YYUSE (yytype);
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+{
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytnameyytype);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+static void
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
+{
+  unsigned long int yylno = yyrlineyyrule;
+  int yynrhs = yyr2yyrule;
+  int yyi;
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+             yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystosyysspyyi + 1 - yynrhs,
+                       &(yyvsp(yyi + 1) - (yynrhs))
+                                              );
+      YYFPRINTF (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+yystrlen (const char *yystr)
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystryylen; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyresyyn = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyresyyn = '\0';
+            return yyn;
+          }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytnameyytoken);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyargYYERROR_VERBOSE_ARGS_MAXIMUM;
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact*yyssp;
+      yyargyycount++ = yytnameyytoken;
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheckyyx + yyn == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytableyyx + yyn))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyargyycount++ = yytnameyyx;
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytnameyyx);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
+
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
+    }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat1 == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyargyyi++);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
+}
+#endif /* YYERROR_VERBOSE */
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+{
+  YYUSE (yyvaluep);
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+}
+
+
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+int
+yyparse (void)
+{
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssaYYINITDEPTH;
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsaYYINITDEPTH;
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf128;
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+        goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+        yystacksize = YYMAXDEPTH;
+
+      {
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+        YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypactyystate;
+  if (yypact_value_is_default (yyn))
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = yylex ();
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheckyyn != yytoken)
+    goto yydefault;
+  yyn = yytableyyn;
+  if (yyn <= 0)
+    {
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefactyystate;
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2yyn;
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     '$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp1-yylen;
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 5:
+#line 149 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1646  */
+    {
+		cd = cd_init();
+		cdtext = cd_get_cdtext(cd);
+		rem = cd_get_rem(cd);
+	}
+#line 1470 "cue_parser.c" /* yacc.c:1646  */
+    break;
+
+  case 8:
+#line 162 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1646  */
+    { cd_set_catalog(cd, (yyvsp-1.sval)); }
+#line 1476 "cue_parser.c" /* yacc.c:1646  */
+    break;
+
+  case 9:
+#line 163 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1646  */
+    { cd_set_cdtextfile(cd, (yyvsp-1.sval)); }
+#line 1482 "cue_parser.c" /* yacc.c:1646  */
+    break;
+
+  case 14:
+#line 171 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1646  */
+    {
+		if (NULL != new_filename) {
+			yyerror("too many files specified\n");
+		}
+		new_filename = strncpy(fnamebuf, (yyvsp-2.sval), sizeof(fnamebuf));
+		new_filenamestrlen(new_filename) = '\0';
+	}
+#line 1494 "cue_parser.c" /* yacc.c:1646  */
+    break;
+
+  case 26:
+#line 201 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1646  */
+    {
+		/* save previous track, to later set length */
+		prev_track = track;
+
+		track = cd_add_track(cd);
+		cdtext = track_get_cdtext(track);
+		rem = track_get_rem(track);
+
+		cur_filename = new_filename;
+		if (NULL != cur_filename)
+			prev_filename = cur_filename;
+
+		if (NULL == prev_filename)
+			yyerror("no file specified for track");
+		else
+			track_set_filename(track, prev_filename);
+
+		new_filename = NULL;
+	}
+#line 1518 "cue_parser.c" /* yacc.c:1646  */
+    break;
+
+  case 27:
+#line 223 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1646  */
+    {
+		track_set_mode(track, (yyvsp-1.ival));
+	}
+#line 1526 "cue_parser.c" /* yacc.c:1646  */
+    break;
+
+  case 41:
+#line 248 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1646  */
+    { track_set_isrc(track, (yyvsp-1.sval)); }
+#line 1532 "cue_parser.c" /* yacc.c:1646  */
+    break;
+
+  case 42:
+#line 249 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1646  */
+    { track_set_zero_pre(track, (yyvsp-1.ival)); }
+#line 1538 "cue_parser.c" /* yacc.c:1646  */
+    break;
+
+  case 43:
+#line 250 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1646  */
+    {
+		int i = track_get_nindex(track);
+		long prev_length;
+
+		/* Handle non-compliant cuesheets, i.e. multi-file sheets where index 0
+		 * is at the end of the previous track file
+		 * In such cases we have a FILE occurence between index 0 and index 1.
+		 * Just discard that index 0 */
+		if (NULL != new_filename && 1 == i) {
+			/* Set correct file name */
+			track_set_filename(track, new_filename);
+			new_filename = NULL;
+
+			/* Discard indices */
+			track_remove_indices(track);
+			i = 0;
+		}
+
+		if (0 == i) {
+			/* first index */
+			track_set_start(track, (yyvsp-1.ival));
+
+			if (NULL != prev_track && NULL == cur_filename) {
+				/* track shares file with previous track */
+				prev_length = (yyvsp-1.ival) - track_get_start(prev_track);
+				track_set_length(prev_track, prev_length);
+			}
+		}
+
+		for (; i <= (yyvsp-2.ival); i++)
+			track_add_index(track, \
+			track_get_zero_pre(track) + (yyvsp-1.ival) \
+			- track_get_start(track));
+	}
+#line 1577 "cue_parser.c" /* yacc.c:1646  */
+    break;
+
+  case 44:
+#line 284 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1646  */
+    { track_set_zero_post(track, (yyvsp-1.ival)); }
+#line 1583 "cue_parser.c" /* yacc.c:1646  */
+    break;
+
+  case 48:
+#line 291 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1646  */
+    { track_set_flag(track, (yyvsp0.ival)); }
+#line 1589 "cue_parser.c" /* yacc.c:1646  */
+    break;
+
+  case 53:
+#line 302 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1646  */
+    { cdtext_set ((yyvsp-2.ival), (yyvsp-1.sval), cdtext); }
+#line 1595 "cue_parser.c" /* yacc.c:1646  */
+    break;
+
+  case 68:
+#line 323 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1646  */
+    { (yyval.ival) = time_msf_to_frame((yyvsp-4.ival), (yyvsp-2.ival), (yyvsp0.ival)); }
+#line 1601 "cue_parser.c" /* yacc.c:1646  */
+    break;
+
+  case 69:
+#line 327 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1646  */
+    { rem_set((yyvsp-2.ival), (yyvsp-1.sval), rem); }
+#line 1607 "cue_parser.c" /* yacc.c:1646  */
+    break;
+
+
+#line 1611 "cue_parser.c" /* yacc.c:1646  */
+      default: break;
+    }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1yyn, &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+  /* Now 'shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1yyn;
+
+  yystate = yypgotoyyn - YYNTOKENS + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheckyystate == *yyssp)
+    yystate = yytableyystate;
+  else
+    yystate = yydefgotoyyn - YYNTOKENS;
+
+  goto yynewstate;
+
+
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
+yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
+      {
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
+      }
+# undef YYSYNTAX_ERROR
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
+
+      if (yychar <= YYEOF)
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
+      else
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypactyystate;
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheckyyn == YYTERROR)
+            {
+              yyn = yytableyyn;
+              if (0 < yyn)
+                break;
+            }
+        }
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+        YYABORT;
+
+
+      yydestruct ("Error: popping",
+                  yystosyystate, yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystosyyn, yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined yyoverflow || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+                  yystos*yyssp, yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  return yyresult;
+}
+#line 339 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1906  */
+
+
+/* lexer interface */
+
+void yyerror (const char *s)
+{
+	fprintf(stderr, "%d: %s (in %s)\n", yylineno, s, yyfilename);
+}
+
+Cd *cue_parse_file(FILE *fp, const char *filename)
+{
+	YY_BUFFER_STATE buffer = NULL;
+
+	yyin = fp;
+	yyfilename = filename;
+	yylineno = 1;
+
+	buffer = yy_create_buffer(yyin, YY_BUF_SIZE);
+
+	yy_switch_to_buffer(buffer);
+
+	if (0 == yyparse())
+	{
+		yy_delete_buffer(buffer);
+		return cd;
+	}
+
+	yy_delete_buffer(buffer);
+	return NULL;
+}
+
+Cd *cue_parse_string(const char* string)
+{
+	YY_BUFFER_STATE buffer = NULL;
+
+	buffer = yy_scan_string(string);
+	yylineno = 1;
+
+	if (0 == yyparse())
+	{
+		yy_delete_buffer(buffer);
+		return cd;
+	}
+
+	yy_delete_buffer(buffer);
+
+	return NULL;
+}

mpfc-2.0.tar.bz2/libcue/src/libcue/cue_parser.h Added

@@ -0,0 +1,175 @@
+/* A Bison parser, made by GNU Bison 3.0.2.  */
+
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+#ifndef YY_YY_CUE_PARSER_H_INCLUDED
+# define YY_YY_CUE_PARSER_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    NUMBER = 258,
+    STRING = 259,
+    CATALOG = 260,
+    CDTEXTFILE = 261,
+    FFILE = 262,
+    BINARY = 263,
+    MOTOROLA = 264,
+    AIFF = 265,
+    WAVE = 266,
+    MP3 = 267,
+    FLAC = 268,
+    APE = 269,
+    TRACK = 270,
+    AUDIO = 271,
+    MODE1_2048 = 272,
+    MODE1_2352 = 273,
+    MODE2_2336 = 274,
+    MODE2_2048 = 275,
+    MODE2_2342 = 276,
+    MODE2_2332 = 277,
+    MODE2_2352 = 278,
+    TRACK_ISRC = 279,
+    FLAGS = 280,
+    PRE = 281,
+    DCP = 282,
+    FOUR_CH = 283,
+    SCMS = 284,
+    PREGAP = 285,
+    INDEX = 286,
+    POSTGAP = 287,
+    BOM = 288,
+    TITLE = 289,
+    PERFORMER = 290,
+    SONGWRITER = 291,
+    COMPOSER = 292,
+    ARRANGER = 293,
+    MESSAGE = 294,
+    DISC_ID = 295,
+    GENRE = 296,
+    TOC_INFO1 = 297,
+    TOC_INFO2 = 298,
+    UPC_EAN = 299,
+    ISRC = 300,
+    SIZE_INFO = 301,
+    DATE = 302,
+    COMMENT = 303,
+    RGENRE = 304,
+    REPLAYGAIN_ALBUM_GAIN = 305,
+    REPLAYGAIN_ALBUM_PEAK = 306,
+    REPLAYGAIN_TRACK_GAIN = 307,
+    REPLAYGAIN_TRACK_PEAK = 308
+  };
+#endif
+/* Tokens.  */
+#define NUMBER 258
+#define STRING 259
+#define CATALOG 260
+#define CDTEXTFILE 261
+#define FFILE 262
+#define BINARY 263
+#define MOTOROLA 264
+#define AIFF 265
+#define WAVE 266
+#define MP3 267
+#define FLAC 268
+#define APE 269
+#define TRACK 270
+#define AUDIO 271
+#define MODE1_2048 272
+#define MODE1_2352 273
+#define MODE2_2336 274
+#define MODE2_2048 275
+#define MODE2_2342 276
+#define MODE2_2332 277
+#define MODE2_2352 278
+#define TRACK_ISRC 279
+#define FLAGS 280
+#define PRE 281
+#define DCP 282
+#define FOUR_CH 283
+#define SCMS 284
+#define PREGAP 285
+#define INDEX 286
+#define POSTGAP 287
+#define BOM 288
+#define TITLE 289
+#define PERFORMER 290
+#define SONGWRITER 291
+#define COMPOSER 292
+#define ARRANGER 293
+#define MESSAGE 294
+#define DISC_ID 295
+#define GENRE 296
+#define TOC_INFO1 297
+#define TOC_INFO2 298
+#define UPC_EAN 299
+#define ISRC 300
+#define SIZE_INFO 301
+#define DATE 302
+#define COMMENT 303
+#define RGENRE 304
+#define REPLAYGAIN_ALBUM_GAIN 305
+#define REPLAYGAIN_ALBUM_PEAK 306
+#define REPLAYGAIN_TRACK_GAIN 307
+#define REPLAYGAIN_TRACK_PEAK 308
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
+{
+#line 62 "../../../../mpfc/libcue/src/libcue/cue_parser.y" /* yacc.c:1909  */
+
+	long ival;
+	char *sval;
+
+#line 165 "cue_parser.h" /* yacc.c:1909  */
+};
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE yylval;
+
+int yyparse (void);
+
+#endif /* !YY_YY_CUE_PARSER_H_INCLUDED  */

mpfc-2.0.tar.bz2/libcue/src/libcue/cue_parser.y Added

@@ -0,0 +1,386 @@
+%{
+/*
+ * Copyright (c) 2004, 2005, 2006, 2007, Svend Sorensen
+ * Copyright (c) 2009, 2010 Jochen Keil
+ * Copyright (c) 2012, 2013 Sergey Galanov
+ * For license terms, see the file COPYING in this distribution.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "config.h"
+
+#include "cd.h"
+#include "time.h"
+
+#ifdef YY_BUF_SIZE
+#undef YY_BUF_SIZE
+#endif
+#define YY_BUF_SIZE 16384
+
+#define YYDEBUG 1
+
+char fnamebufPARSER_BUFFER;
+
+/* debugging */
+//int yydebug = 1;
+
+extern int yylineno;
+extern FILE* yyin;
+
+const char *yyfilename;
+
+static Cd *cd = NULL;
+static Track *track = NULL;
+static Track *prev_track = NULL;
+static Cdtext *cdtext = NULL;
+static Rem *rem = NULL;
+static char *prev_filename = NULL;	/* last file in or before last track */
+static char *cur_filename = NULL;	/* last file in the last track */
+static char *new_filename = NULL;	/* last file in this track */
+
+/* lexer interface */
+typedef struct yy_buffer_state* YY_BUFFER_STATE;
+
+int yylex(void);
+void yyerror(const char*);
+YY_BUFFER_STATE yy_scan_string(const char*);
+YY_BUFFER_STATE yy_create_buffer(FILE*, int);
+void yy_switch_to_buffer(YY_BUFFER_STATE);
+void yy_delete_buffer(YY_BUFFER_STATE);
+
+/* parser interface */
+int yyparse(void);
+Cd *cue_parse_file(FILE *fp, const char *filename);
+Cd *cue_parse_string(const char*);
+%}
+
+%start cuefile
+
+%union {
+	long ival;
+	char *sval;
+}
+
+%token <ival> NUMBER
+%token <sval> STRING
+
+/* global (header) */
+%token CATALOG
+%token CDTEXTFILE
+
+%token FFILE
+%token BINARY
+%token MOTOROLA
+%token AIFF
+%token WAVE
+%token MP3
+%token FLAC
+%token APE
+
+/* track */
+%token TRACK
+
+%token <ival> AUDIO
+%token <ival> MODE1_2048
+%token <ival> MODE1_2352
+%token <ival> MODE2_2336
+%token <ival> MODE2_2048
+%token <ival> MODE2_2342
+%token <ival> MODE2_2332
+%token <ival> MODE2_2352
+
+/* ISRC is with CD_TEXT */
+%token TRACK_ISRC
+
+%token FLAGS
+%token <ival> PRE
+%token <ival> DCP
+%token <ival> FOUR_CH
+%token <ival> SCMS
+
+%token PREGAP
+%token INDEX
+%token POSTGAP
+
+%token BOM
+
+/* CD-TEXT */
+%token <ival> TITLE
+%token <ival> PERFORMER
+%token <ival> SONGWRITER
+%token <ival> COMPOSER
+%token <ival> ARRANGER
+%token <ival> MESSAGE
+%token <ival> DISC_ID
+%token <ival> GENRE
+%token <ival> TOC_INFO1
+%token <ival> TOC_INFO2
+%token <ival> UPC_EAN
+%token <ival> ISRC
+%token <ival> SIZE_INFO
+
+%type <ival> track_mode
+%type <ival> track_flag
+%type <ival> time
+%type <ival> cdtext_item
+
+/* REM */
+%type <ival> rem_item
+%token <ival> DATE
+%token <ival> COMMENT
+%token <ival> RGENRE
+%token <ival> REPLAYGAIN_ALBUM_GAIN
+%token <ival> REPLAYGAIN_ALBUM_PEAK
+%token <ival> REPLAYGAIN_TRACK_GAIN
+%token <ival> REPLAYGAIN_TRACK_PEAK
+%%
+
+cuefile
+	: maybe_bom new_cd global_statements track_list
+	;
+
+maybe_bom
+	: BOM | /* empty */;
+
+new_cd
+	: /* empty */ {
+		cd = cd_init();
+		cdtext = cd_get_cdtext(cd);
+		rem = cd_get_rem(cd);
+	}
+	;
+
+global_statements
+	: /* empty */
+	| global_statements global_statement
+	;
+
+global_statement
+	: CATALOG STRING '\n' { cd_set_catalog(cd, $2); }
+	| CDTEXTFILE STRING '\n' { cd_set_cdtextfile(cd, $2); }
+	| cdtext
+	| rem
+	| track_data
+	| error '\n'
+	;
+
+track_data
+	: FFILE STRING file_format '\n' {
+		if (NULL != new_filename) {
+			yyerror("too many files specified\n");
+		}
+		new_filename = strncpy(fnamebuf, $2, sizeof(fnamebuf));
+		new_filenamestrlen(new_filename) = '\0';
+	}
+	;
+
+track_list
+	: track
+	| track_list track
+	;
+
+track
+	: new_track track_def track_statements
+	;
+
+file_format
+	: BINARY
+	| MOTOROLA
+	| AIFF
+	| WAVE
+	| MP3
+	| FLAC
+	| APE
+	| error
+	;
+
+new_track
+	: /*empty */ {
+		/* save previous track, to later set length */
+		prev_track = track;
+
+		track = cd_add_track(cd);
+		cdtext = track_get_cdtext(track);
+		rem = track_get_rem(track);
+
+		cur_filename = new_filename;
+		if (NULL != cur_filename)
+			prev_filename = cur_filename;
+
+		if (NULL == prev_filename)
+			yyerror("no file specified for track");
+		else
+			track_set_filename(track, prev_filename);
+
+		new_filename = NULL;
+	}
+	;
+
+track_def
+	: TRACK NUMBER track_mode '\n' {
+		track_set_mode(track, $3);
+	}
+	;
+
+track_mode
+	: AUDIO
+	| MODE1_2048
+	| MODE1_2352
+	| MODE2_2336
+	| MODE2_2048
+	| MODE2_2342
+	| MODE2_2332
+	| MODE2_2352
+	;
+
+track_statements
+	: track_statement
+	| track_statements track_statement
+	;
+
+track_statement
+	: cdtext
+	| rem
+	| FLAGS track_flags '\n'
+	| TRACK_ISRC STRING '\n' { track_set_isrc(track, $2); }
+	| PREGAP time '\n' { track_set_zero_pre(track, $2); }
+	| INDEX NUMBER time '\n' {
+		int i = track_get_nindex(track);
+		long prev_length;
+
+		/* Handle non-compliant cuesheets, i.e. multi-file sheets where index 0
+		 * is at the end of the previous track file
+		 * In such cases we have a FILE occurence between index 0 and index 1.
+		 * Just discard that index 0 */
+		if (NULL != new_filename && 1 == i) {
+			/* Set correct file name */
+			track_set_filename(track, new_filename);
+			new_filename = NULL;
+
+			/* Discard indices */
+			track_remove_indices(track);
+			i = 0;
+		}
+
+		if (0 == i) {
+			/* first index */
+			track_set_start(track, $3);
+
+			if (NULL != prev_track && NULL == cur_filename) {
+				/* track shares file with previous track */
+				prev_length = $3 - track_get_start(prev_track);
+				track_set_length(prev_track, prev_length);
+			}
+		}
+
+		for (; i <= $2; i++)
+			track_add_index(track, \
+			track_get_zero_pre(track) + $3 \
+			- track_get_start(track));
+	}
+	| POSTGAP time '\n' { track_set_zero_post(track, $2); }
+	| track_data
+	| error '\n'
+	;
+
+track_flags
+	: /* empty */
+	| track_flags track_flag { track_set_flag(track, $2); }
+	;
+
+track_flag
+	: PRE
+	| DCP
+	| FOUR_CH
+	| SCMS
+	;
+
+cdtext
+	: cdtext_item STRING '\n' { cdtext_set ($1, $2, cdtext); }
+	;
+
+cdtext_item
+	: TITLE
+	| PERFORMER
+	| SONGWRITER
+	| COMPOSER
+	| ARRANGER
+	| MESSAGE
+	| DISC_ID
+	| GENRE
+	| TOC_INFO1
+	| TOC_INFO2
+	| UPC_EAN
+	| ISRC
+	| SIZE_INFO
+	;
+
+time
+	: NUMBER
+	| NUMBER ':' NUMBER ':' NUMBER { $$ = time_msf_to_frame($1, $3, $5); }
+	;
+
+rem
+	: rem_item STRING '\n' { rem_set($1, $2, rem); }
+	;
+
+rem_item
+	: DATE
+	| COMMENT
+	| RGENRE
+	| REPLAYGAIN_ALBUM_GAIN
+	| REPLAYGAIN_ALBUM_PEAK
+	| REPLAYGAIN_TRACK_GAIN
+	| REPLAYGAIN_TRACK_PEAK
+	;
+%%
+
+/* lexer interface */
+
+void yyerror (const char *s)
+{
+	fprintf(stderr, "%d: %s (in %s)\n", yylineno, s, yyfilename);
+}
+
+Cd *cue_parse_file(FILE *fp, const char *filename)
+{
+	YY_BUFFER_STATE buffer = NULL;
+
+	yyin = fp;
+	yyfilename = filename;
+	yylineno = 1;
+
+	buffer = yy_create_buffer(yyin, YY_BUF_SIZE);
+
+	yy_switch_to_buffer(buffer);
+
+	if (0 == yyparse())
+	{
+		yy_delete_buffer(buffer);
+		return cd;
+	}
+
+	yy_delete_buffer(buffer);
+	return NULL;
+}
+
+Cd *cue_parse_string(const char* string)
+{
+	YY_BUFFER_STATE buffer = NULL;
+
+	buffer = yy_scan_string(string);
+	yylineno = 1;
+
+	if (0 == yyparse())
+	{
+		yy_delete_buffer(buffer);
+		return cd;
+	}
+
+	yy_delete_buffer(buffer);
+
+	return NULL;
+}

mpfc-2.0.tar.bz2/libcue/src/libcue/cue_scanner.c Added

@@ -0,0 +1,2601 @@
+
+#line 3 "cue_scanner.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 37
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE yyrestart(yyin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t yyleng;
+
+extern FILE *yyin, *yyout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
+     *       access to the local variable yy_act. Since yyless() is a macro, it would break
+     *       existing scanners that call yyless() from OUTSIDE yylex. 
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-yylineno scanner, because yy_act is
+     *       normally declared as a register variable-- so it is not worth it.
+     */
+    #define  YY_LESS_LINENO(n) \
+            do { \
+                int yyl;\
+                for ( yyl = n; yyl < yyleng; ++yyl )\
+                    if ( yytextyyl == '\n' )\
+                        --yylineno;\
+            }while(0)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	yy_size_t yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via yyrestart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)(yy_buffer_stack_top) \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)(yy_buffer_stack_top)
+
+/* yy_hold_char holds the character lost when yytext is formed. */
+static char yy_hold_char;
+static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t yyleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void yyrestart (FILE *input_file  );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
+void yy_delete_buffer (YY_BUFFER_STATE b  );
+void yy_flush_buffer (YY_BUFFER_STATE b  );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state (void );
+
+static void yyensure_buffer_stack (void );
+static void yy_load_buffer_state (void );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
+
+void *yyalloc (yy_size_t  );
+void *yyrealloc (void *,yy_size_t  );
+void yyfree (void *  );
+
+#define yy_new_buffer yy_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+#define yywrap() 1
+#define YY_SKIP_YYWRAP
+
+typedef unsigned char YY_CHAR;
+
+FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int yylineno;
+
+int yylineno = 1;
+
+extern char *yytext;
+#define yytext_ptr yytext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up yytext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	yyleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 68
+#define YY_END_OF_BUFFER 69
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept731 =
+    {   0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   69,   67,   62,   66,   67,   67,   63,   63,
+       64,   67,   67,   67,   67,   67,   67,   67,   67,   67,
+       67,   67,   67,   67,   67,   67,   62,   65,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    4,
+        5,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    5,   57,   56,   58,   57,   57,   57,   57,   59,
+       60,   68,   68,   61,   62,    0,    2,    0,    0,    1,
+
+        0,   63,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   62,   65,    3,    3,    2,    3,
+        3,    1,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    4,    4,    2,    4,
+        4,    1,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,   56,    0,    0,    0,
+        0,   59,   60,    0,   61,    2,    1,   29,    0,   15,
+        0,    0,    0,    0,    0,    0,   28,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,   13,    0,    0,   27,
+       48,    0,    0,    0,    0,    0,    0,    0,    0,   16,
+        2,    1,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    2,    1,    4,    4,    4,
+
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        0,    0,    0,    0,   11,    0,    0,    0,    0,    0,
+        0,    0,    8,   14,    0,    0,    0,   47,    0,    0,
+        0,    0,    0,    0,   30,    0,    0,    0,    0,    0,
+        0,   12,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    0,   49,
+        0,    0,    0,   18,    0,    0,    0,    0,    0,   26,
+       41,   32,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   34,    0,   17,    0,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    0,   51,    0,    0,    9,    0,    0,
+
+        0,    0,   45,    0,    0,    0,    0,    0,    0,   31,
+        0,    0,    0,    0,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    0,
+        0,    0,    6,    0,    0,   40,   39,    0,    0,    0,
+        0,   33,    0,    0,    0,   44,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,   50,    0,   38,    0,
+
+       37,    0,    0,    0,    0,   10,    0,    0,    0,    0,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    0,    0,    0,    0,    0,    0,
+        0,    0,   35,   46,    0,   42,   43,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    0,    7,   19,   20,   22,   24,   21,   23,   25,
+       36,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   52,   53,   54,   55,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec256 =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    1,    5,    1,    1,    1,    1,    6,    1,
+        1,    1,    1,    1,    1,    1,    7,    8,    9,   10,
+       11,   12,   13,   14,   15,   16,   15,   17,    1,    1,
+        1,    1,    1,    1,   18,   19,   20,   21,   22,   23,
+       24,   25,   26,    1,   27,   28,   29,   30,   31,   32,
+        1,   33,   34,   35,   36,   37,   38,   39,   40,   41,
+        1,   42,    1,    1,   43,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,   44,    1,    1,    1,
+       45,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,   46,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta47 =
+    {   0,
+        1,    2,    3,    3,    1,    1,    1,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int16_t yy_base745 =
+    {   0,
+        0,   45,   49,   94,   98,  143,  146,  178,  149,  152,
+      947,  946,  948,  951,  155,  951,  153,  154,    0,  927,
+      951,  136,  920,  143,  145,  147,  923,  153,  154,  170,
+      922,  158,  174,  911,  924,  897,  206,  951,    0,  210,
+      214,  249,  920,    0,  193,  913,  173,  201,  162,  916,
+      163,  200,  202,  915,  208,  210,  904,  917,  890,    0,
+      951,  241,  234,  276,  913,    0,  241,  906,  248,  222,
+      221,  909,  220,  249,  271,  908,  274,  270,  897,  910,
+      883,  951,  951,  249,  951,  895,  907,  902,  901,    0,
+      266,  951,  919,  951,  293,  267,  951,  270,  272,  951,
+
+      276,    0,  896,  897,  897,  885,  896,  886,  880,  879,
+      884,  880,  877,  882,  891,  878,  886,  873,  871,  142,
+      893,  870,  868,  879,  871,  870,  857,  867,  861,  875,
+      876,  873,  855,  846,  304,  951,    0,  317,    0,  321,
+      325,    0,  330,    0,  865,  866,  866,  854,  865,  855,
+      849,  848,  853,  849,  846,  851,  860,  847,  855,  842,
+      840,  278,  862,  839,  837,  848,  840,  839,  826,  836,
+      830,  844,  845,  842,  824,  815,    0,  312,    0,  334,
+      337,    0,  341,    0,  834,  835,  835,  823,  834,  824,
+      818,  817,  822,  818,  815,  820,  829,  816,  824,  811,
+
+      809,  314,  831,  808,  806,  817,  809,  808,  795,  805,
+      799,  813,  814,  811,  793,  784,  344,  799,  792,  796,
+      793,    0,  348,  821,  951,  346,  324,  951,  800,  951,
+      804,  795,  802,  801,  796,  785,  951,  796,  793,  333,
+      781,  791,  792,  777,  788,  778,  951,  785,  772,  782,
+      951,  771,  782,  779,  774,  758,  780,  756,  776,  951,
+      366,  358,    0,  774,    0,  778,  769,  776,  775,  770,
+      759,    0,  770,  767,  353,  755,  765,  766,  751,  762,
+      752,    0,  759,  746,  756,    0,  745,  756,  753,  748,
+      732,  754,  730,  750,    0,  377,  352,    0,  748,    0,
+
+      752,  743,  750,  749,  744,  733,    0,  744,  741,  354,
+      729,  739,  740,  725,  736,  726,    0,  733,  720,  730,
+        0,  719,  730,  727,  722,  706,  728,  704,  724,    0,
+      716,  722,  710,  714,  951,  711,  709,  706,  710,  698,
+      705,  692,  951,  951,  700,  711,  693,  382,  713,  301,
+      697,  698,  704,  709,  951,  683,  687,  702,  697,  695,
+      699,  951,    0,  690,  688,  685,  689,  677,  684,  671,
+        0,    0,  679,  690,  672,  383,  692,  380,  676,  677,
+      683,  688,    0,  662,  666,  681,  676,  674,  678,    0,
+        0,  669,  667,  664,  668,  656,  663,  650,    0,    0,
+
+      658,  669,  651,  389,  671,  386,  655,  656,  662,  667,
+        0,  641,  645,  660,  655,  653,  657,    0,  656,  951,
+      655,  658,  651,  951,  634,  642,  637,  637,  644,  951,
+      951,  951,  397,  645,  661,  660,  635,  632,  646,  631,
+      636,  628,  951,  630,  951,  641,  634,    0,  617,  625,
+      620,  620,  627,    0,    0,    0,  628,  644,  643,  618,
+      615,  629,  614,  619,  611,    0,  613,    0,  624,  617,
+        0,  600,  608,  603,  603,  610,    0,    0,    0,  401,
+      611,  627,  626,  601,  598,  612,  597,  602,  594,    0,
+      596,    0,  607,  594,  951,  583,  600,  951,  597,  597,
+
+      597,  597,  951,  595,  606,  605,  586,  584,  580,  951,
+      581,  584,  586,  578,  585,    0,  582,  582,  582,  582,
+      580,  591,  590,  571,  569,  565,    0,  566,  569,  571,
+      563,  570,    0,  567,  567,  567,  567,    0,  565,  576,
+      575,  556,  554,  550,    0,  551,  554,  556,  548,  542,
+      552,  542,  951,  548,  540,  951,  951,  396,  401,  554,
+      549,  951,  547,  534,  537,  951,  534,    0,  540,  532,
+        0,    0,  402,  403,  546,  541,    0,  539,  526,  529,
+        0,  526,    0,  532,  524,    0,    0,  407,  409,  538,
+      533,    0,  531,  518,  521,    0,  951,  533,  951,  522,
+
+      951,  537,  535,  535,  410,  951,  513,  514,  522,  388,
+        0,  515,    0,  530,  528,  528,  413,    0,  506,  507,
+      515,  418,    0,  508,    0,  523,  521,  521,  418,    0,
+      499,  500,  508,  423,  503,  506,  511,  516,  509,  424,
+      514,  513,  951,  951,  489,  951,  951,  499,  504,  509,
+      502,  425,  507,  506,    0,    0,  482,    0,    0,  492,
+      497,  502,  495,  426,  500,  499,    0,    0,  475,    0,
+        0,  477,  951,  951,  951,  951,  951,  951,  951,  951,
+      951,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  463,
+
+      188,  477,  471,  484,  484,  460,  475,  455,  445,  428,
+      405,  413,  417,  429,  424,  426,  421,  416,  398,  366,
+      357,  335,  315,  268,  228,  951,  951,  951,  951,  951,
+      449,  453,  457,  461,  465,  226,  469,  473,  477,  481,
+      485,  489,  493,  497
+    } ;
+
+static yyconst flex_int16_t yy_def745 =
+    {   0,
+      730,    1,  730,    3,  730,    5,  731,  731,  732,  732,
+      733,  733,  730,  730,  730,  730,  734,  735,  736,  736,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  737,  738,
+      739,  737,   42,  737,  737,  737,  737,  737,  737,  737,
+      737,  737,  737,  737,  737,  737,  737,  737,  737,  740,
+      730,  741,  742,  740,   64,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  730,  730,  730,  730,  730,  730,  730,  730,  743,
+      730,  730,  744,  730,  730,  734,  730,  734,  735,  730,
+
+      735,  736,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  737,  738,  737,  738,
+      739,  737,  739,   42,  737,  737,  737,  737,  737,  737,
+      737,  737,  737,  737,  737,  737,  737,  737,  737,  737,
+      737,  737,  737,  737,  737,  737,  737,  737,  737,  737,
+      737,  737,  737,  737,  737,  737,  740,  741,  740,  741,
+      742,  740,  742,   64,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  730,  730,  730,  730,
+      730,  743,  730,  744,  730,  734,  735,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      738,  739,  737,  737,  737,  737,  737,  737,  737,  737,
+      737,  737,  737,  737,  737,  737,  737,  737,  737,  737,
+      737,  737,  737,  737,  737,  737,  737,  737,  737,  737,
+      737,  737,  737,  737,  737,  741,  742,  740,  740,  740,
+
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  737,  737,  737,  737,  737,  737,  737,  737,
+      737,  737,  737,  737,  737,  737,  737,  737,  737,  737,
+      737,  737,  737,  737,  737,  737,  737,  737,  737,  737,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  737,  737,  737,  737,
+      737,  737,  737,  737,  737,  737,  737,  737,  737,  737,
+      737,  737,  737,  737,  737,  737,  737,  737,  737,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  730,  730,  730,  730,  730,  730,  730,
+
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  737,  737,  737,  737,  737,  737,
+      737,  737,  737,  737,  737,  737,  737,  737,  737,  737,
+      737,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  737,  737,  737,  737,
+      737,  737,  737,  737,  737,  737,  737,  737,  737,  737,
+      737,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  730,  730,  730,  730,
+
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      737,  737,  737,  737,  737,  737,  737,  737,  737,  737,
+      737,  737,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  737,  737,  737,
+      737,  737,  737,  737,  737,  737,  737,  737,  737,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  737,  737,  737,  737,  737,  737,  737,  737,  737,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  730,
+
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,    0,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730
+    } ;
+
+static yyconst flex_int16_t yy_nxt998 =
+    {   0,
+       14,   15,   16,   15,   17,   18,   14,   19,   19,   19,
+       19,   20,   19,   19,   19,   19,   21,   22,   23,   24,
+       25,   14,   26,   27,   14,   28,   14,   14,   29,   14,
+       14,   30,   31,   32,   33,   34,   14,   35,   14,   14,
+       14,   14,   14,   14,   14,   36,   37,   38,   37,   39,
+       15,   16,   15,   40,   41,   39,   42,   42,   42,   42,
+       43,   42,   42,   42,   42,   44,   45,   46,   47,   48,
+       39,   49,   50,   39,   51,   39,   39,   52,   39,   39,
+       53,   54,   55,   56,   57,   39,   58,   39,   39,   39,
+       39,   39,   39,   39,   59,   37,   38,   37,   60,   15,
+
+       61,   15,   62,   63,   60,   64,   64,   64,   64,   65,
+       64,   64,   64,   64,   66,   67,   68,   69,   70,   60,
+       71,   72,   60,   73,   60,   60,   74,   60,   60,   75,
+       76,   77,   78,   79,   60,   80,   60,   60,   60,   60,
+       60,   60,   60,   81,   37,   82,   37,   84,   85,   84,
+       91,   92,   91,   91,   92,   91,   95,   97,   95,  100,
+      109,  104,  245,  110,  112,   86,   87,  105,  106,   88,
+      113,  107,  114,  111,  115,  119,  246,  126,   89,   84,
+       85,   84,  117,  127,  120,  121,  118,  156,  128,  157,
+      151,  122,  159,  152,   98,  101,  160,   86,   87,  129,
+
+      123,   88,  124,  153,  130,  702,  131,  135,  136,  135,
+       89,   96,   96,   96,  139,   99,   99,   99,  146,  142,
+      154,  161,  703,  164,  147,  148,  155,  168,  149,  102,
+      162,  163,  165,  169,  166,  171,   99,   99,  170,  182,
+      172,  194,  173,   96,   96,  179,  196,  195,  197,  199,
+      217,  140,  217,  200,  729,  143,  144,  144,  144,  144,
+      144,  144,  144,  144,  144,  191,  186,  223,  192,  223,
+      201,   97,  187,  188,  226,  183,  189,  100,  193,  202,
+      203,  227,  180,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  204,  208,   95,  211,   95,  728,  280,  209,
+
+      212,  205,  213,  206,  210,  135,  136,  135,   98,  435,
+      436,   98,  281,  101,   96,   96,  179,  101,   96,   96,
+       96,  139,   96,   96,   96,  261,   99,   99,   99,  100,
+      142,   99,   99,   99,  315,  262,   96,   96,  296,   99,
+       99,  727,  182,   99,   99,  217,  297,  217,  316,  223,
+       97,  223,  344,  180,   99,   99,  345,  182,  140,   99,
+       99,   99,  140,  142,  726,  101,  143,   96,   96,   96,
+      139,  143,  372,  400,  725,  180,  373,  401,  183,   96,
+       96,  179,  183,  433,  433,  433,  433,   98,  458,  459,
+      480,  724,  433,  183,  482,  483,  646,  647,  433,  143,
+
+      433,  503,  480,  602,  433,  538,  603,  140,  604,  614,
+      616,  605,  615,  617,  626,  723,  628,  627,  180,  629,
+      640,  641,  642,  652,  653,  654,  658,  659,  664,  665,
+      666,  670,  671,  677,  686,  695,  714,  678,  687,  696,
+      716,  722,  721,  720,  715,  719,  718,  713,  717,   83,
+       83,   83,   83,   90,   90,   90,   90,   93,   93,   93,
+       93,   96,   96,   96,   96,   99,   99,   99,   99,  137,
+      712,  711,  137,  138,  138,  138,  138,  141,  141,  141,
+      141,  177,  177,  710,  177,  178,  178,  178,  178,  181,
+      181,  181,  181,  222,  709,  708,  222,  224,  224,  224,
+
+      224,  707,  706,  705,  704,  701,  700,  699,  698,  697,
+      694,  693,  692,  691,  690,  689,  688,  685,  684,  683,
+      682,  681,  680,  679,  676,  675,  674,  673,  672,  669,
+      668,  667,  663,  662,  661,  660,  657,  656,  655,  651,
+      650,  649,  648,  645,  644,  643,  639,  638,  637,  636,
+      635,  634,  633,  632,  631,  630,  625,  624,  623,  622,
+      621,  620,  619,  618,  613,  612,  611,  610,  609,  608,
+      607,  606,  601,  600,  599,  598,  597,  596,  595,  594,
+      593,  592,  591,  590,  589,  588,  587,  586,  585,  584,
+      583,  582,  581,  580,  579,  578,  577,  576,  575,  574,
+
+      573,  572,  571,  570,  569,  568,  567,  566,  565,  564,
+      563,  562,  561,  560,  559,  558,  557,  556,  555,  554,
+      553,  552,  551,  550,  549,  548,  547,  546,  545,  544,
+      543,  542,  541,  540,  539,  537,  536,  535,  534,  533,
+      532,  531,  530,  529,  528,  527,  526,  525,  524,  523,
+      522,  521,  520,  519,  518,  517,  516,  515,  514,  513,
+      512,  511,  510,  509,  508,  507,  506,  505,  504,  502,
+      501,  500,  499,  498,  497,  496,  495,  494,  493,  492,
+      491,  490,  489,  488,  487,  486,  485,  484,  481,  479,
+      478,  477,  476,  475,  474,  473,  472,  471,  470,  469,
+
+      468,  467,  466,  465,  464,  463,  462,  461,  460,  457,
+      456,  455,  454,  453,  452,  451,  450,  449,  448,  447,
+      446,  445,  444,  443,  442,  441,  440,  439,  438,  437,
+      434,  432,  431,  430,  429,  428,  427,  426,  425,  424,
+      423,  422,  421,  420,  419,  418,  417,  416,  415,  414,
+      413,  412,  411,  410,  409,  408,  407,  406,  405,  404,
+      403,  402,  399,  398,  397,  396,  395,  394,  393,  392,
+      391,  390,  389,  388,  387,  386,  385,  384,  383,  382,
+      381,  380,  379,  378,  377,  376,  375,  374,  371,  370,
+      369,  368,  367,  366,  365,  364,  363,  362,  361,  360,
+
+      359,  358,  357,  356,  355,  354,  353,  352,  351,  350,
+      349,  348,  347,  346,  343,  342,  341,  340,  339,  338,
+      337,  336,  335,  225,  334,  333,  332,  331,  330,  329,
+      328,  327,  326,  325,  324,  323,  322,  321,  320,  319,
+      318,  317,  314,  313,  312,  311,  310,  309,  308,  307,
+      306,  305,  304,  303,  302,  301,  300,  299,  298,  295,
+      294,  293,  292,  291,  290,  289,  288,  287,  286,  285,
+      284,  283,  282,  279,  278,  277,  276,  275,  274,  273,
+      272,  271,  270,  269,  268,  267,  266,  265,  264,  263,
+      260,  259,  258,  257,  256,  255,  254,  253,  252,  251,
+
+      250,  249,  248,  247,  244,  243,  242,  241,  240,  239,
+      238,  237,  236,  235,  234,  233,  232,  231,  230,  229,
+      228,  225,  221,  220,  219,  218,  216,  215,  214,  207,
+      198,  190,  185,  176,  175,  174,  167,  158,  150,  145,
+      134,  133,  132,  125,  116,  108,  103,  730,   94,   94,
+       13,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730
+
+    } ;
+
+static yyconst flex_int16_t yy_chk998 =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    2,    2,    2,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    4,    4,    4,    5,    5,
+
+        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+        5,    5,    5,    5,    6,    6,    6,    7,    7,    7,
+        9,    9,    9,   10,   10,   10,   15,   17,   15,   18,
+       24,   22,  120,   24,   25,    7,    7,   22,   22,    7,
+       25,   22,   26,   24,   26,   29,  120,   32,    7,    8,
+        8,    8,   28,   32,   29,   29,   28,   49,   32,   49,
+       47,   30,   51,   47,   17,   18,   51,    8,    8,   33,
+
+       30,    8,   30,   47,   33,  701,   33,   37,   37,   37,
+        8,   40,   40,   40,   40,   41,   41,   41,   45,   41,
+       48,   52,  701,   53,   45,   45,   48,   55,   45,  736,
+       52,   52,   53,   55,   53,   56,   63,   63,   55,   63,
+       56,   70,   56,   62,   62,   62,   71,   70,   71,   73,
+       84,   40,   84,   73,  725,   41,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   69,   67,   91,   69,   91,
+       74,   96,   67,   67,   98,   63,   67,   99,   69,   74,
+       74,  101,   62,   64,   64,   64,   64,   64,   64,   64,
+       64,   64,   75,   77,   95,   78,   95,  724,  162,   77,
+
+       78,   75,   78,   75,   77,  135,  135,  135,   96,  350,
+      350,   98,  162,   99,  178,  178,  178,  101,  138,  138,
+      138,  138,  140,  140,  140,  140,  141,  141,  141,  227,
+      141,  143,  143,  143,  202,  143,  180,  180,  180,  181,
+      181,  723,  181,  183,  183,  217,  183,  217,  202,  223,
+      226,  223,  240,  178,  297,  297,  240,  297,  138,  262,
+      262,  262,  140,  262,  722,  227,  141,  261,  261,  261,
+      261,  143,  275,  310,  721,  180,  275,  310,  181,  296,
+      296,  296,  183,  348,  376,  348,  376,  226,  378,  378,
+      404,  720,  404,  297,  406,  406,  610,  610,  433,  262,
+
+      433,  433,  480,  558,  480,  480,  558,  261,  559,  573,
+      574,  559,  573,  574,  588,  719,  589,  588,  296,  589,
+      605,  605,  605,  617,  617,  617,  622,  622,  629,  629,
+      629,  634,  634,  640,  652,  664,  712,  640,  652,  664,
+      713,  718,  717,  716,  712,  715,  714,  711,  713,  731,
+      731,  731,  731,  732,  732,  732,  732,  733,  733,  733,
+      733,  734,  734,  734,  734,  735,  735,  735,  735,  737,
+      710,  709,  737,  738,  738,  738,  738,  739,  739,  739,
+      739,  740,  740,  708,  740,  741,  741,  741,  741,  742,
+      742,  742,  742,  743,  707,  706,  743,  744,  744,  744,
+
+      744,  705,  704,  703,  702,  700,  672,  669,  666,  665,
+      663,  662,  661,  660,  657,  654,  653,  651,  650,  649,
+      648,  645,  642,  641,  639,  638,  637,  636,  635,  633,
+      632,  631,  628,  627,  626,  624,  621,  620,  619,  616,
+      615,  614,  612,  609,  608,  607,  604,  603,  602,  600,
+      598,  595,  594,  593,  591,  590,  585,  584,  582,  580,
+      579,  578,  576,  575,  570,  569,  567,  565,  564,  563,
+      561,  560,  555,  554,  552,  551,  550,  549,  548,  547,
+      546,  544,  543,  542,  541,  540,  539,  537,  536,  535,
+      534,  532,  531,  530,  529,  528,  526,  525,  524,  523,
+
+      522,  521,  520,  519,  518,  517,  515,  514,  513,  512,
+      511,  509,  508,  507,  506,  505,  504,  502,  501,  500,
+      499,  497,  496,  494,  493,  491,  489,  488,  487,  486,
+      485,  484,  483,  482,  481,  476,  475,  474,  473,  472,
+      470,  469,  467,  465,  464,  463,  462,  461,  460,  459,
+      458,  457,  453,  452,  451,  450,  449,  447,  446,  444,
+      442,  441,  440,  439,  438,  437,  436,  435,  434,  429,
+      428,  427,  426,  425,  423,  422,  421,  419,  417,  416,
+      415,  414,  413,  412,  410,  409,  408,  407,  405,  403,
+      402,  401,  398,  397,  396,  395,  394,  393,  392,  389,
+
+      388,  387,  386,  385,  384,  382,  381,  380,  379,  377,
+      375,  374,  373,  370,  369,  368,  367,  366,  365,  364,
+      361,  360,  359,  358,  357,  356,  354,  353,  352,  351,
+      349,  347,  346,  345,  342,  341,  340,  339,  338,  337,
+      336,  334,  333,  332,  331,  329,  328,  327,  326,  325,
+      324,  323,  322,  320,  319,  318,  316,  315,  314,  313,
+      312,  311,  309,  308,  306,  305,  304,  303,  302,  301,
+      299,  294,  293,  292,  291,  290,  289,  288,  287,  285,
+      284,  283,  281,  280,  279,  278,  277,  276,  274,  273,
+      271,  270,  269,  268,  267,  266,  264,  259,  258,  257,
+
+      256,  255,  254,  253,  252,  250,  249,  248,  246,  245,
+      244,  243,  242,  241,  239,  238,  236,  235,  234,  233,
+      232,  231,  229,  224,  221,  220,  219,  218,  216,  215,
+      214,  213,  212,  211,  210,  209,  208,  207,  206,  205,
+      204,  203,  201,  200,  199,  198,  197,  196,  195,  194,
+      193,  192,  191,  190,  189,  188,  187,  186,  185,  176,
+      175,  174,  173,  172,  171,  170,  169,  168,  167,  166,
+      165,  164,  163,  161,  160,  159,  158,  157,  156,  155,
+      154,  153,  152,  151,  150,  149,  148,  147,  146,  145,
+      134,  133,  132,  131,  130,  129,  128,  127,  126,  125,
+
+      124,  123,  122,  121,  119,  118,  117,  116,  115,  114,
+      113,  112,  111,  110,  109,  108,  107,  106,  105,  104,
+      103,   93,   89,   88,   87,   86,   81,   80,   79,   76,
+       72,   68,   65,   59,   58,   57,   54,   50,   46,   43,
+       36,   35,   34,   31,   27,   23,   20,   13,   12,   11,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730,  730,  730,  730,
+      730,  730,  730,  730,  730,  730,  730
+
+    } ;
+
+/* Table of booleans, true if rule could match eol. */
+static yyconst flex_int32_t yy_rule_can_match_eol69 =
+    {   0,
+1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+    0, 1, 0, 0, 0, 1, 1, 0, 0,     };
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *yytext;
+#line 1 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+#line 2 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+/*
+ * Copyright (c) 2004, 2005, 2006, 2007, Svend Sorensen
+ * Copyright (c) 2009, 2010 Jochen Keil
+ * Copyright (c) 2012, 2013 Sergey Galanov
+ * For license terms, see the file COPYING in this distribution.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+
+#include "cd.h"
+#include "cue_parser.h"
+
+char bufferPARSER_BUFFER;
+
+int yylex(void);
+extern const char *yyfilename;
+#define YY_NO_INPUT 1
+
+
+
+
+
+#line 963 "cue_scanner.c"
+
+#define INITIAL 0
+#define NAME 1
+#define NAME_TILL_EOL 2
+#define REM 3
+#define RPG 4
+#define SKIP 5
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int yylex_destroy (void );
+
+int yyget_debug (void );
+
+void yyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE yyget_extra (void );
+
+void yyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *yyget_in (void );
+
+void yyset_in  (FILE * in_str  );
+
+FILE *yyget_out (void );
+
+void yyset_out  (FILE * out_str  );
+
+yy_size_t yyget_leng (void );
+
+char *yyget_text (void );
+
+int yyget_lineno (void );
+
+void yyset_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int yywrap (void );
+#else
+extern int yywrap (void );
+#endif
+#endif
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+			bufn = (char) c; \
+		if ( c == '\n' ) \
+			bufn++ = (char) c; \
+		if ( c == EOF && ferror( yyin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(yyin); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int yylex (void);
+
+#define YY_DECL int yylex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after yytext and yyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	if ( yyleng > 0 ) \
+		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
+				(yytextyyleng - 1 == '\n'); \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+#line 37 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+
+
+#line 1154 "cue_scanner.c"
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! yyin )
+			yyin = stdin;
+
+		if ( ! yyout )
+			yyout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			yyensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				yy_create_buffer(yyin,YY_BUF_SIZE );
+		}
+
+		yy_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of yytext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+		yy_current_state += YY_AT_BOL();
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ecYY_SC_TO_UI(*yy_cp);
+			if ( yy_acceptyy_current_state )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
+			while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
+				{
+				yy_current_state = (int) yy_defyy_current_state;
+				if ( yy_current_state >= 731 )
+					yy_c = yy_meta(unsigned int) yy_c;
+				}
+			yy_current_state = yy_nxtyy_baseyy_current_state + (unsigned int) yy_c;
+			++yy_cp;
+			}
+		while ( yy_baseyy_current_state != 951 );
+
+yy_find_action:
+		yy_act = yy_acceptyy_current_state;
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			yy_act = yy_acceptyy_current_state;
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eolyy_act )
+			{
+			int yyl;
+			for ( yyl = 0; yyl < yyleng; ++yyl )
+				if ( yytextyyl == '\n' )
+					   
+    yylineno++;
+;
+			}
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
+case 1:
+/* rule 1 can match eol */
+#line 40 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+case 2:
+/* rule 2 can match eol */
+YY_RULE_SETUP
+#line 40 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{
+		yylval.sval = strncpy(	buffer,
+					++yytext,
+					(yyleng > sizeof(buffer) ? sizeof(buffer) : yyleng));
+		yylval.svalyyleng - 2 = '\0';
+		BEGIN(INITIAL);
+		return STRING;
+		}
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 49 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{
+		yylval.sval = strncpy(	buffer,
+					yytext,
+					(yyleng > sizeof(buffer) ? sizeof(buffer) : yyleng));
+		yylval.svalyyleng = '\0';
+		BEGIN(INITIAL);
+		return STRING;
+		}
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 58 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{
+		yylval.sval = strncpy(	buffer,
+					yytext,
+					(yyleng > sizeof(buffer) ? sizeof(buffer) : yyleng));
+		yylval.svalyyleng = '\0';
+		BEGIN(INITIAL);
+		return STRING;
+		}
+	YY_BREAK
+case 5:
+/* rule 5 can match eol */
+YY_RULE_SETUP
+#line 66 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(INITIAL); return '\n'; }
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 68 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); return CATALOG; }
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 69 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); return CDTEXTFILE; }
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 71 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); return FFILE; }
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 72 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return BINARY; }
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+#line 73 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return MOTOROLA; }
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 74 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return AIFF; }
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 75 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return WAVE; }
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+#line 76 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return MP3; }
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 77 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return FLAC; }
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 78 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return APE; }
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+#line 80 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return BOM; }
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+#line 82 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return TRACK; }
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 83 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ yylval.ival = MODE_AUDIO; return AUDIO; }
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
+#line 84 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ yylval.ival = MODE_MODE1; return MODE1_2048; }
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
+#line 85 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ yylval.ival = MODE_MODE1_RAW; return MODE1_2352; }
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 86 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ yylval.ival = MODE_MODE2; return MODE2_2336; }
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 87 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ yylval.ival = MODE_MODE2_FORM1; return MODE2_2048; }
+	YY_BREAK
+case 23:
+YY_RULE_SETUP
+#line 88 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ yylval.ival = MODE_MODE2_FORM2; return MODE2_2342; }
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+#line 89 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ yylval.ival = MODE_MODE2_FORM_MIX; return MODE2_2332; }
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
+#line 90 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ yylval.ival = MODE_MODE2_RAW; return MODE2_2352; }
+	YY_BREAK
+case 26:
+YY_RULE_SETUP
+#line 92 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return FLAGS; }
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
+#line 93 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ yylval.ival = FLAG_PRE_EMPHASIS; return PRE; }
+	YY_BREAK
+case 28:
+YY_RULE_SETUP
+#line 94 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ yylval.ival = FLAG_COPY_PERMITTED; return DCP; }
+	YY_BREAK
+case 29:
+YY_RULE_SETUP
+#line 95 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ yylval.ival = FLAG_FOUR_CHANNEL; return FOUR_CH; }
+	YY_BREAK
+case 30:
+YY_RULE_SETUP
+#line 96 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ yylval.ival = FLAG_SCMS; return SCMS; }
+	YY_BREAK
+case 31:
+YY_RULE_SETUP
+#line 98 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return PREGAP; }
+	YY_BREAK
+case 32:
+YY_RULE_SETUP
+#line 99 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return INDEX; }
+	YY_BREAK
+case 33:
+YY_RULE_SETUP
+#line 100 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return POSTGAP; }
+	YY_BREAK
+case 34:
+YY_RULE_SETUP
+#line 102 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); yylval.ival = PTI_TITLE;  return TITLE; }
+	YY_BREAK
+case 35:
+YY_RULE_SETUP
+#line 103 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); yylval.ival = PTI_PERFORMER;  return PERFORMER; }
+	YY_BREAK
+case 36:
+YY_RULE_SETUP
+#line 104 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); yylval.ival = PTI_SONGWRITER;  return SONGWRITER; }
+	YY_BREAK
+case 37:
+YY_RULE_SETUP
+#line 105 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); yylval.ival = PTI_COMPOSER;  return COMPOSER; }
+	YY_BREAK
+case 38:
+YY_RULE_SETUP
+#line 106 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); yylval.ival = PTI_ARRANGER;  return ARRANGER; }
+	YY_BREAK
+case 39:
+YY_RULE_SETUP
+#line 107 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); yylval.ival = PTI_MESSAGE;  return MESSAGE; }
+	YY_BREAK
+case 40:
+YY_RULE_SETUP
+#line 108 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); yylval.ival = PTI_DISC_ID;  return DISC_ID; }
+	YY_BREAK
+case 41:
+YY_RULE_SETUP
+#line 109 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); yylval.ival = PTI_GENRE;  return GENRE; }
+	YY_BREAK
+case 42:
+YY_RULE_SETUP
+#line 110 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); yylval.ival = PTI_TOC_INFO1;  return TOC_INFO1; }
+	YY_BREAK
+case 43:
+YY_RULE_SETUP
+#line 111 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); yylval.ival = PTI_TOC_INFO2;  return TOC_INFO2; }
+	YY_BREAK
+case 44:
+YY_RULE_SETUP
+#line 112 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); yylval.ival = PTI_UPC_ISRC;  return UPC_EAN; }
+	YY_BREAK
+case 45:
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 4;
+YY_DO_BEFORE_ACTION; /* set up yytext again */
+YY_RULE_SETUP
+#line 113 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); yylval.ival = PTI_UPC_ISRC;  return ISRC; }
+	YY_BREAK
+case 46:
+YY_RULE_SETUP
+#line 114 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); yylval.ival = PTI_SIZE_INFO;  return SIZE_INFO; }
+	YY_BREAK
+case 47:
+YY_RULE_SETUP
+#line 116 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME); return TRACK_ISRC; }
+	YY_BREAK
+case 48:
+YY_RULE_SETUP
+#line 118 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(REM); /* exclusive rules for special exceptions */ }
+	YY_BREAK
+case 49:
+YY_RULE_SETUP
+#line 120 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME_TILL_EOL); yylval.ival = REM_DATE; return DATE; }
+	YY_BREAK
+case 50:
+YY_RULE_SETUP
+#line 121 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME_TILL_EOL); yylval.ival = REM_COMMENT; return COMMENT; }
+	YY_BREAK
+case 51:
+YY_RULE_SETUP
+#line 122 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(NAME_TILL_EOL); yylval.ival = REM_GENRE; return RGENRE; }
+	YY_BREAK
+case 52:
+YY_RULE_SETUP
+#line 123 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(RPG); yylval.ival = REM_REPLAYGAIN_ALBUM_GAIN;
+							return REPLAYGAIN_ALBUM_GAIN; }
+	YY_BREAK
+case 53:
+YY_RULE_SETUP
+#line 125 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(RPG); yylval.ival = REM_REPLAYGAIN_ALBUM_PEAK;
+							return REPLAYGAIN_ALBUM_PEAK; }
+	YY_BREAK
+case 54:
+YY_RULE_SETUP
+#line 127 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(RPG); yylval.ival = REM_REPLAYGAIN_TRACK_GAIN;
+							return REPLAYGAIN_TRACK_GAIN; }
+	YY_BREAK
+case 55:
+YY_RULE_SETUP
+#line 129 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(RPG); yylval.ival = REM_REPLAYGAIN_TRACK_PEAK;
+							return REPLAYGAIN_TRACK_PEAK; }
+	YY_BREAK
+case 56:
+YY_RULE_SETUP
+#line 132 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(REM); }
+	YY_BREAK
+case 57:
+YY_RULE_SETUP
+#line 133 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(REM); }
+	YY_BREAK
+case 58:
+/* rule 58 can match eol */
+YY_RULE_SETUP
+#line 134 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(INITIAL); }
+	YY_BREAK
+case 59:
+YY_RULE_SETUP
+#line 136 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{
+		yylval.sval = strncpy(	buffer,
+					yytext,
+					(yyleng > sizeof(buffer) ? sizeof(buffer) : yyleng));
+		yylval.svalyyleng = '\0';
+		BEGIN(SKIP);
+		return STRING;
+		}
+	YY_BREAK
+case 60:
+YY_RULE_SETUP
+#line 145 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(RPG); }
+	YY_BREAK
+case 61:
+/* rule 61 can match eol */
+YY_RULE_SETUP
+#line 147 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ BEGIN(INITIAL); return '\n'; }
+	YY_BREAK
+case 62:
+YY_RULE_SETUP
+#line 149 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ /* ignore whitespace */ }
+	YY_BREAK
+case 63:
+YY_RULE_SETUP
+#line 151 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ yylval.ival = atoi(yytext); return NUMBER; }
+	YY_BREAK
+case 64:
+YY_RULE_SETUP
+#line 152 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return yytext0; }
+	YY_BREAK
+case 65:
+/* rule 65 can match eol */
+YY_RULE_SETUP
+#line 154 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ /* blank line */ }
+	YY_BREAK
+case 66:
+/* rule 66 can match eol */
+YY_RULE_SETUP
+#line 155 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ return '\n'; }
+	YY_BREAK
+case 67:
+YY_RULE_SETUP
+#line 156 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+{ fprintf(stderr, "bad character '%c' (in %s at %d)\n", yytext0, yyfilename, yylineno); }
+	YY_BREAK
+case 68:
+YY_RULE_SETUP
+#line 158 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+ECHO;
+	YY_BREAK
+#line 1627 "cue_scanner.c"
+case YY_STATE_EOF(INITIAL):
+case YY_STATE_EOF(NAME):
+case YY_STATE_EOF(NAME_TILL_EOL):
+case YY_STATE_EOF(REM):
+case YY_STATE_EOF(RPG):
+case YY_STATE_EOF(SKIP):
+	yyterminate();
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed yyin at a new source and called
+			 * yylex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( yywrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * yytext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars);
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of yylex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) + 1 )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_bufyy_c_buf_p_offset;
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_bufnumber_to_move),
+			(yy_n_chars), num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			yyrestart(yyin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) + 1 = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf0;
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+	yy_current_state += YY_AT_BOL();
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ecYY_SC_TO_UI(*yy_cp) : 1);
+		if ( yy_acceptyy_current_state )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
+		while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
+			{
+			yy_current_state = (int) yy_defyy_current_state;
+			if ( yy_current_state >= 731 )
+				yy_c = yy_meta(unsigned int) yy_c;
+			}
+		yy_current_state = yy_nxtyy_baseyy_current_state + (unsigned int) yy_c;
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
+
+	register YY_CHAR yy_c = 1;
+	if ( yy_acceptyy_current_state )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
+	while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
+		{
+		yy_current_state = (int) yy_defyy_current_state;
+		if ( yy_current_state >= 731 )
+			yy_c = yy_meta(unsigned int) yy_c;
+		}
+	yy_current_state = yy_nxtyy_baseyy_current_state + (unsigned int) yy_c;
+	yy_is_jam = (yy_current_state == 730);
+
+		return yy_is_jam ? 0 : yy_current_state;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					yyrestart(yyin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( yywrap( ) )
+						return EOF;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve yytext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_at_bol )
+		   
+    yylineno++;
+;
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void yyrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        yyensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            yy_create_buffer(yyin,YY_BUF_SIZE );
+	}
+
+	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	yy_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		yypop_buffer_state();
+	 *		yypush_buffer_state(new_buffer);
+     */
+	yyensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	yy_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (yywrap()) processing, but the only time this flag
+	 * is looked at is after yywrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void yy_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	yy_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ * 
+ */
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		yyfree((void *) b->yy_ch_buf  );
+
+	yyfree((void *) b  );
+}
+
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a yyrestart() or at EOF.
+ */
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	yy_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf0 = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf1 = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf0;
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		yy_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	yyensure_buffer_stack();
+
+	/* This block is copied from yy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from yy_switch_to_buffer. */
+	yy_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void yypop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	yy_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		yy_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (void)
+{
+	yy_size_t num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     basesize-2 != YY_END_OF_BUFFER_CHAR ||
+	     basesize-1 != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	yy_switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
+{
+    
+	return yy_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	int i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) yyalloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		bufi = yybytesi;
+
+	buf_yybytes_len = buf_yybytes_len+1 = YY_END_OF_BUFFER_CHAR;
+
+	b = yy_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		yytextyyleng = (yy_hold_char); \
+		(yy_c_buf_p) = yytext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		yyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int yyget_lineno  (void)
+{
+        
+    return yylineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *yyget_in  (void)
+{
+        return yyin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *yyget_out  (void)
+{
+        return yyout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+yy_size_t yyget_leng  (void)
+{
+        return yyleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *yyget_text  (void)
+{
+        return yytext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void yyset_lineno (int  line_number )
+{
+    
+    yylineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE *  in_str )
+{
+        yyin = in_str ;
+}
+
+void yyset_out (FILE *  out_str )
+{
+        yyout = out_str ;
+}
+
+int yyget_debug  (void)
+{
+        return yy_flex_debug;
+}
+
+void yyset_debug (int  bdebug )
+{
+        yy_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from yylex_destroy(), so don't allocate here.
+     */
+
+    /* We do not touch yylineno unless the option is enabled. */
+    yylineno =  1;
+    
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    yyin = stdin;
+    yyout = stdout;
+#else
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * yylex_init()
+     */
+    return 0;
+}
+
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		yy_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		yypop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	yyfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * yylex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1i = s2i;
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; sn; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *yyalloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *yyrealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void yyfree (void * ptr )
+{
+	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 158 "../../../../mpfc/libcue/src/libcue/cue_scanner.l"
+
+
+

mpfc-2.0.tar.bz2/libcue/src/libcue/cue_scanner.l Added

@@ -0,0 +1,158 @@
+%{
+/*
+ * Copyright (c) 2004, 2005, 2006, 2007, Svend Sorensen
+ * Copyright (c) 2009, 2010 Jochen Keil
+ * Copyright (c) 2012, 2013 Sergey Galanov
+ * For license terms, see the file COPYING in this distribution.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+
+#include "cd.h"
+#include "cue_parser.h"
+
+char bufferPARSER_BUFFER;
+
+int yylex(void);
+extern const char *yyfilename;
+%}
+
+ws		 \t\r
+nonws		^ \t\r\n
+
+%option yylineno
+%option noyywrap
+%option noinput
+%option nounput
+
+%s NAME
+%s NAME_TILL_EOL
+%x REM
+%x RPG
+%x SKIP
+
+%%
+
+\'(^\'|\\\')*\'	|
+\"(^\"|\\\")*\"	{
+		yylval.sval = strncpy(	buffer,
+					++yytext,
+					(yyleng > sizeof(buffer) ? sizeof(buffer) : yyleng));
+		yylval.svalyyleng - 2 = '\0';
+		BEGIN(INITIAL);
+		return STRING;
+		}
+
+<NAME>{nonws}+	{
+		yylval.sval = strncpy(	buffer,
+					yytext,
+					(yyleng > sizeof(buffer) ? sizeof(buffer) : yyleng));
+		yylval.svalyyleng = '\0';
+		BEGIN(INITIAL);
+		return STRING;
+		}
+
+<NAME_TILL_EOL>{nonws}^\r\n*	{
+		yylval.sval = strncpy(	buffer,
+					yytext,
+					(yyleng > sizeof(buffer) ? sizeof(buffer) : yyleng));
+		yylval.svalyyleng = '\0';
+		BEGIN(INITIAL);
+		return STRING;
+		}
+<NAME_TILL_EOL>\n { BEGIN(INITIAL); return '\n'; }
+
+CATALOG		{ BEGIN(NAME); return CATALOG; }
+CDTEXTFILE	{ BEGIN(NAME); return CDTEXTFILE; }
+
+FILE		{ BEGIN(NAME); return FFILE; }
+BINARY		{ return BINARY; }
+MOTOROLA	{ return MOTOROLA; }
+AIFF		{ return AIFF; }
+WAVE		{ return WAVE; }
+MP3			{ return MP3; }
+FLAC		{ return FLAC; }
+APE			{ return APE; }
+
+\xEF\xBB\xBF { return BOM; }
+
+TRACK		{ return TRACK; }
+AUDIO		{ yylval.ival = MODE_AUDIO; return AUDIO; }
+MODE1\/2048	{ yylval.ival = MODE_MODE1; return MODE1_2048; }
+MODE1\/2352	{ yylval.ival = MODE_MODE1_RAW; return MODE1_2352; }
+MODE2\/2336	{ yylval.ival = MODE_MODE2; return MODE2_2336; }
+MODE2\/2048	{ yylval.ival = MODE_MODE2_FORM1; return MODE2_2048; }
+MODE2\/2342	{ yylval.ival = MODE_MODE2_FORM2; return MODE2_2342; }
+MODE2\/2332	{ yylval.ival = MODE_MODE2_FORM_MIX; return MODE2_2332; }
+MODE2\/2352	{ yylval.ival = MODE_MODE2_RAW; return MODE2_2352; }
+
+FLAGS		{ return FLAGS; }
+PRE		{ yylval.ival = FLAG_PRE_EMPHASIS; return PRE; }
+DCP		{ yylval.ival = FLAG_COPY_PERMITTED; return DCP; }
+4CH		{ yylval.ival = FLAG_FOUR_CHANNEL; return FOUR_CH; }
+SCMS		{ yylval.ival = FLAG_SCMS; return SCMS; }
+
+PREGAP		{ return PREGAP; }
+INDEX		{ return INDEX; }
+POSTGAP		{ return POSTGAP; }
+
+TITLE		{ BEGIN(NAME); yylval.ival = PTI_TITLE;  return TITLE; }
+PERFORMER	{ BEGIN(NAME); yylval.ival = PTI_PERFORMER;  return PERFORMER; }
+SONGWRITER	{ BEGIN(NAME); yylval.ival = PTI_SONGWRITER;  return SONGWRITER; }
+COMPOSER	{ BEGIN(NAME); yylval.ival = PTI_COMPOSER;  return COMPOSER; }
+ARRANGER	{ BEGIN(NAME); yylval.ival = PTI_ARRANGER;  return ARRANGER; }
+MESSAGE		{ BEGIN(NAME); yylval.ival = PTI_MESSAGE;  return MESSAGE; }
+DISC_ID		{ BEGIN(NAME); yylval.ival = PTI_DISC_ID;  return DISC_ID; }
+GENRE		{ BEGIN(NAME); yylval.ival = PTI_GENRE;  return GENRE; }
+TOC_INFO1	{ BEGIN(NAME); yylval.ival = PTI_TOC_INFO1;  return TOC_INFO1; }
+TOC_INFO2	{ BEGIN(NAME); yylval.ival = PTI_TOC_INFO2;  return TOC_INFO2; }
+UPC_EAN		{ BEGIN(NAME); yylval.ival = PTI_UPC_ISRC;  return UPC_EAN; }
+ISRC/{ws}+\"	{ BEGIN(NAME); yylval.ival = PTI_UPC_ISRC;  return ISRC; }
+SIZE_INFO	{ BEGIN(NAME); yylval.ival = PTI_SIZE_INFO;  return SIZE_INFO; }
+
+ISRC		{ BEGIN(NAME); return TRACK_ISRC; }
+
+REM		{ BEGIN(REM); /* exclusive rules for special exceptions */ }
+
+<REM>DATE			{ BEGIN(NAME_TILL_EOL); yylval.ival = REM_DATE; return DATE; }
+<REM>COMMENT		{ BEGIN(NAME_TILL_EOL); yylval.ival = REM_COMMENT; return COMMENT; }
+<REM>GENRE			{ BEGIN(NAME_TILL_EOL); yylval.ival = REM_GENRE; return RGENRE; }
+<REM>REPLAYGAIN_ALBUM_GAIN 	{ BEGIN(RPG); yylval.ival = REM_REPLAYGAIN_ALBUM_GAIN;
+							return REPLAYGAIN_ALBUM_GAIN; }
+<REM>REPLAYGAIN_ALBUM_PEAK	{ BEGIN(RPG); yylval.ival = REM_REPLAYGAIN_ALBUM_PEAK;
+							return REPLAYGAIN_ALBUM_PEAK; }
+<REM>REPLAYGAIN_TRACK_GAIN	{ BEGIN(RPG); yylval.ival = REM_REPLAYGAIN_TRACK_GAIN;
+							return REPLAYGAIN_TRACK_GAIN; }
+<REM>REPLAYGAIN_TRACK_PEAK	{ BEGIN(RPG); yylval.ival = REM_REPLAYGAIN_TRACK_PEAK;
+							return REPLAYGAIN_TRACK_PEAK; }
+
+<REM>{ws}+	{ BEGIN(REM); }
+<REM>.		{ BEGIN(REM); }
+<REM>\n		{ BEGIN(INITIAL); }
+
+<RPG>{nonws}+	{
+		yylval.sval = strncpy(	buffer,
+					yytext,
+					(yyleng > sizeof(buffer) ? sizeof(buffer) : yyleng));
+		yylval.svalyyleng = '\0';
+		BEGIN(SKIP);
+		return STRING;
+		}
+
+<RPG>{ws}+	{ BEGIN(RPG); }
+
+<SKIP>.*\n	{ BEGIN(INITIAL); return '\n'; }
+
+{ws}+		{ /* ignore whitespace */ }
+
+:digit:+	{ yylval.ival = atoi(yytext); return NUMBER; }
+:		{ return yytext0; }
+
+^{ws}*\n	{ /* blank line */ }
+\n		{ return '\n'; }
+.		{ fprintf(stderr, "bad character '%c' (in %s at %d)\n", yytext0, yyfilename, yylineno); }
+
+%%

mpfc-2.0.tar.bz2/libcue/src/libcue/libcue.h Added

mpfc-2.0.tar.bz2/libcue/src/libcue/rem.c Added

@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2009, 2010 Jochen Keil
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Jochen Keil ''AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Jochen Keil BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "rem.h"
+
+struct Rem {
+	unsigned int cmt;
+	char *value;
+};
+
+Rem*
+rem_new(	void)
+{
+	Rem* new_rem = NULL;
+
+	Rem rem = {
+		{REM_DATE,			NULL},
+		{REM_COMMENT,		NULL},
+		{REM_GENRE,			NULL},
+		{REM_REPLAYGAIN_ALBUM_GAIN,	NULL},
+		{REM_REPLAYGAIN_ALBUM_PEAK,	NULL},
+		{REM_REPLAYGAIN_TRACK_GAIN,	NULL},
+		{REM_REPLAYGAIN_TRACK_PEAK,	NULL},
+		{REM_END,			NULL}
+	};
+
+	/* sizeof(rem) = number of elements in rem * sizeof(Rem) */
+	new_rem = (Rem*)calloc(sizeof(rem) / sizeof(Rem), sizeof(Rem));
+	if (new_rem == NULL)
+		fprintf(stderr, "rem_new(): problem allocating memory\n");
+	else
+		memcpy(new_rem, rem, sizeof(rem));
+
+	return new_rem;
+}
+
+void
+rem_free(	Rem* rem)
+{
+	if (rem == NULL)
+		return;
+
+	Rem* ptr = rem;
+
+	do
+	{
+		free(ptr->value);
+	}
+	while ((++ptr)->cmt != REM_END);
+
+	free(rem);
+}
+
+int
+rem_is_emtpy(	Rem* rem)
+{
+	if (rem == NULL)
+		return 1;
+
+	do
+	{
+		if (rem->value != NULL)
+			return 0;
+	} while ((++rem)->cmt != REM_END);
+
+	return 1;
+}
+
+void
+rem_set(	unsigned int cmt,
+		char* value,
+		Rem* rem)
+{
+	if (rem == NULL || value == NULL)
+		return;
+
+	do
+	{
+		if (rem->cmt == cmt)
+		{
+			free(rem->value);
+			rem->value = strdup(value);
+			return;
+		}
+	} while ((++rem)->cmt != REM_END);
+}
+
+char*
+rem_get(	unsigned int cmt,
+		Rem* rem)
+{
+	if (rem == NULL)
+		return NULL;
+
+	do
+	{
+		if (rem->cmt == cmt)
+		{
+			if (rem->value != NULL)
+				return rem->value;
+			else
+				return NULL;
+		}
+	} while ((++rem)->cmt != REM_END);
+
+	return NULL;
+}
+
+void
+rem_dump(	Rem* rem)
+{
+	if (rem == NULL)
+		return;
+
+	do
+	{
+		fprintf(stdout, "REM %u: %s\n", rem->cmt, rem->value);
+	} while ((++rem)->cmt != REM_END);
+}

mpfc-2.0.tar.bz2/libcue/src/libcue/rem.h Added

@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2009, 2010 Jochen Keil
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Jochen Keil ''AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Jochen Keil BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef REM_H
+#define REM_H
+
+#include <stdio.h>
+
+enum Cmt {
+	REM_DATE,	/* date of cd/track */
+	REM_COMMENT,
+	REM_GENRE,
+	REM_REPLAYGAIN_ALBUM_GAIN,
+	REM_REPLAYGAIN_ALBUM_PEAK,
+	REM_REPLAYGAIN_TRACK_GAIN,
+	REM_REPLAYGAIN_TRACK_PEAK,
+	REM_END		/* terminating REM (for stepping through REMs) */
+};
+
+typedef struct Rem Rem;
+
+/**
+ * return new allocated rem struct
+ */
+Rem*
+rem_new(	void);
+
+/**
+ * free rem struct
+ */
+void
+rem_free(	Rem*);
+
+/**
+ * return true if allocated rem struct is empty
+ */
+int
+rem_is_emtpy(	Rem*);
+
+/**
+ * set value of rem comment
+ * @param unsigned int: enum of rem comment
+ */
+void
+rem_set(	unsigned int,
+		char*,
+		Rem*);
+
+/**
+ * return pointer to value for rem comment
+ * @param unsigned int: enum of rem comment
+ */
+char*
+rem_get(	unsigned int,
+		Rem*);
+
+/**
+ * dump all rem comments in human readable form
+ * @param bool: if track: true; else false
+ */
+void
+rem_dump(	Rem*);
+
+#endif

mpfc-2.0.tar.bz2/libcue/src/libcue/time.c Added

@@ -0,0 +1,45 @@
+/*
+ * time.c -- time functions
+ *
+ * Copyright (C) 2004, 2005, 2006, 2007 Svend Sorensen
+ * For license terms, see the file COPYING in this distribution.
+ */
+
+#include "time.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+long time_msf_to_frame(int m, int s, int f)
+{
+	return (m * 60 + s) * 75 + f;
+}
+
+void msf_frame_to_msf(long frame, int *m, int *s, int *f)
+{
+        *f = frame % 75;	/* 0 <= frames <= 74 */
+        frame /= 75;
+        *s = frame % 60;	/* 0 <= seconds <= 59 */
+        frame /= 60;
+        *m = frame;		/* 0 <= minutes */
+}
+
+void time_frame_to_msf(long frame, int *m, int *s, int *f)
+{
+	*f = frame % 75;           /* 0 <= frames <= 74 */
+	frame /= 75;
+	*s = frame % 60;          /* 0 <= seconds <= 59 */
+	frame /= 60;
+	*m = frame;               /* 0 <= minutes */
+}
+
+/* print frame in mm:ss:ff format */
+char *time_frame_to_mmssff(long f)
+{
+	static char msf9;
+	int minutes, seconds, frames;
+
+	msf_frame_to_msf(f, &minutes, &seconds, &frames);
+	sprintf(msf, "%02d:%02d:%02d", minutes, seconds, frames);
+
+	return msf;
+}

mpfc-2.0.tar.bz2/libcue/src/libcue/time.h Added

mpfc-1.3.8.1.tar.bz2/libmpfc/Makefile.am -> mpfc-2.0.tar.bz2/libmpfc/Makefile.am Changed

@@ -2,20 +2,16 @@
 
 libmpfchdrdir = $(includedir)/mpfc
 libmpfchdr_HEADERS = ../mpfc-config.h ../src/types.h ../src/cfg.h \
-					 ../src/charset.h \
-					 ../src/file.h file_http.h file_reg.h \
-					 ../src/genre_list.h ../src/myid3.h ../src/csp.h \
-					 ../src/ep.h ../src/inp.h ../src/outp.h ../src/pmng.h \
-					 ../src/util.h ../src/song_info.h ../src/mystring.h \
-					 ../src/vfs.h ../src/logger.h ../src/plugin.h \
-					 ../src/genp.h ../src/command.h ../src/main_types.h
+					 ../src/pmng.h ../src/util.h ../src/song_info.h ../src/mystring.h \
+					 ../src/logger.h ../src/plugin.h \
+					 ../src/genp.h ../src/command.h ../src/main_types.h \
+					 ../src/plp.h
 
-libmpfc_la_SOURCES = cfg.c charset.c file.c file_http.c file_reg.c \
-					 genre_list.c id3.c plugin_charset.c plugin_effect.c \
-					 plugin_input.c plugin_output.c plugin_mng.c util.c \
-					 song_info.c string.c vfs.c logger.c cfg_rcfile.c \
-					 plugin.c plugin_general.c command.c \
+libmpfc_la_SOURCES = cfg.c plugin_mng.c util.c \
+					 song_info.c string.c logger.c cfg_rcfile.c \
+					 plugin.c plugin_general.c plugin_plist.c command.c \
 					 $(libmpfchdr_HEADERS)
 libmpfc_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@ @DL_LIBS@
-INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
+libmpfc_la_LDFLAGS = -version-info 2:0
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/libmpfcwnd @GSTREAMER_CFLAGS@ @TAGLIB_CFLAGS@ @CURSES_CFLAGS@
 localedir = $(datadir)/locale

mpfc-1.3.8.1.tar.bz2/libmpfc/Makefile.in -> mpfc-2.0.tar.bz2/libmpfc/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,10 +80,28 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = libmpfc
-DIST_COMMON = $(libmpfchdr_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(libmpfchdr_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -67,41 +129,94 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libmpfchdrdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libmpfc_la_DEPENDENCIES =
 am__objects_1 =
-am_libmpfc_la_OBJECTS = cfg.lo charset.lo file.lo file_http.lo \
-	file_reg.lo genre_list.lo id3.lo plugin_charset.lo \
-	plugin_effect.lo plugin_input.lo plugin_output.lo \
-	plugin_mng.lo util.lo song_info.lo string.lo vfs.lo logger.lo \
-	cfg_rcfile.lo plugin.lo plugin_general.lo command.lo \
-	$(am__objects_1)
+am_libmpfc_la_OBJECTS = cfg.lo plugin_mng.lo util.lo song_info.lo \
+	string.lo logger.lo cfg_rcfile.lo plugin.lo plugin_general.lo \
+	plugin_plist.lo command.lo $(am__objects_1)
 libmpfc_la_OBJECTS = $(am_libmpfc_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmpfc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libmpfc_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libmpfc_la_SOURCES)
 DIST_SOURCES = $(libmpfc_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(libmpfchdr_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -112,10 +227,10 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
 COMMON_LIBS = @COMMON_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURSES_CFLAGS = @CURSES_CFLAGS@
 CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
@@ -128,28 +243,26 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC2 = @GLIBC2@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GPM_LIBS = @GPM_LIBS@
 GREP = @GREP@
+GSTREAMER_AUDIO_CFLAGS = @GSTREAMER_AUDIO_CFLAGS@
+GSTREAMER_AUDIO_LIBS = @GSTREAMER_AUDIO_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -159,30 +272,31 @@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSON_CFLAGS = @JSON_CFLAGS@
+JSON_LIBS = @JSON_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
 LIBOBJS = @LIBOBJS@
 LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTLIBC = @LTLIBC@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIBS = @MATH_LIBS@
@@ -194,10 +308,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -206,6 +318,10 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLIST_PLUGINS = @PLIST_PLUGINS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -215,15 +331,16 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
+TAGLIB_LIBS = @TAGLIB_LIBS@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
 WOE32DLL = @WOE32DLL@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -279,23 +396,19 @@
 lib_LTLIBRARIES = libmpfc.la
 libmpfchdrdir = $(includedir)/mpfc
 libmpfchdr_HEADERS = ../mpfc-config.h ../src/types.h ../src/cfg.h \
-					 ../src/charset.h \
-					 ../src/file.h file_http.h file_reg.h \
-					 ../src/genre_list.h ../src/myid3.h ../src/csp.h \
-					 ../src/ep.h ../src/inp.h ../src/outp.h ../src/pmng.h \
-					 ../src/util.h ../src/song_info.h ../src/mystring.h \
-					 ../src/vfs.h ../src/logger.h ../src/plugin.h \
-					 ../src/genp.h ../src/command.h ../src/main_types.h
-
-libmpfc_la_SOURCES = cfg.c charset.c file.c file_http.c file_reg.c \
-					 genre_list.c id3.c plugin_charset.c plugin_effect.c \
-					 plugin_input.c plugin_output.c plugin_mng.c util.c \
-					 song_info.c string.c vfs.c logger.c cfg_rcfile.c \
-					 plugin.c plugin_general.c command.c \
+					 ../src/pmng.h ../src/util.h ../src/song_info.h ../src/mystring.h \
+					 ../src/logger.h ../src/plugin.h \
+					 ../src/genp.h ../src/command.h ../src/main_types.h \
+					 ../src/plp.h
+
+libmpfc_la_SOURCES = cfg.c plugin_mng.c util.c \
+					 song_info.c string.c logger.c cfg_rcfile.c \
+					 plugin.c plugin_general.c plugin_plist.c command.c \
 					 $(libmpfchdr_HEADERS)
 
 libmpfc_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@ @DL_LIBS@
-INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
+libmpfc_la_LDFLAGS = -version-info 2:0
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/libmpfcwnd @GSTREAMER_CFLAGS@ @TAGLIB_CFLAGS@ @CURSES_CFLAGS@
 all: all-am
 
 .SUFFIXES:
@@ -309,9 +422,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libmpfc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libmpfc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu libmpfc/Makefile
+	  $(AUTOMAKE) --foreign libmpfc/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -330,9 +443,9 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -340,6 +453,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -355,14 +470,17 @@
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libmpfc.la: $(libmpfc_la_OBJECTS) $(libmpfc_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libmpfc_la_OBJECTS) $(libmpfc_la_LIBADD) $(LIBS)
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libmpfc.la: $(libmpfc_la_OBJECTS) $(libmpfc_la_DEPENDENCIES) $(EXTRA_libmpfc_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmpfc_la_LINK) -rpath $(libdir) $(libmpfc_la_OBJECTS) $(libmpfc_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -372,46 +490,36 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_rcfile.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/charset.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_http.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_reg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genre_list.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_charset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_effect.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_general.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_input.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_mng.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_output.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_plist.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/song_info.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfs.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -420,8 +528,11 @@
 	-rm -rf .libs _libs
 install-libmpfchdrHEADERS: $(libmpfchdr_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libmpfchdrdir)" || $(MKDIR_P) "$(DESTDIR)$(libmpfchdrdir)"
 	@list='$(libmpfchdr_HEADERS)'; test -n "$(libmpfchdrdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libmpfchdrdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libmpfchdrdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -435,30 +546,17 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(libmpfchdr_HEADERS)'; test -n "$(libmpfchdrdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libmpfchdrdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libmpfchdrdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+	dir='$(DESTDIR)$(libmpfchdrdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -470,15 +568,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -487,6 +581,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -538,10 +647,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -626,20 +740,21 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-libmpfchdrHEADERS install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-libLTLIBRARIES uninstall-libmpfchdrHEADERS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES \
+	install-libmpfchdrHEADERS install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-libmpfchdrHEADERS
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

mpfc-1.3.8.1.tar.bz2/libmpfc/cfg.c -> mpfc-2.0.tar.bz2/libmpfc/cfg.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Configuration handling functions implementation.
- * $Id: cfg.c 242 2005-12-02 20:50:55Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -25,14 +25,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
-#define __USE_GNU
 #include <string.h>
 #include "types.h"
 #include "cfg.h"
 #include "util.h"
 
 /* Create a new configuration list */
-cfg_node_t *cfg_new_list( cfg_node_t *parent, char *name, 
+cfg_node_t *cfg_new_list( cfg_node_t *parent, const char *name, 
 		cfg_set_default_values_t set_def, dword flags, int hash_size )
 {
 	cfg_node_t *node;
@@ -71,7 +70,7 @@
 } /* End of 'cfg_new_list' function */
 
 /* Create a new variable */
-cfg_node_t *cfg_new_var_full( cfg_node_t *parent, char *name, 
+cfg_node_t *cfg_new_var_full( cfg_node_t *parent, const char *name, 
 		dword flags, char *value, cfg_var_handler_t handler, 
 		void *handler_data )
 {
@@ -84,7 +83,7 @@
 		return NULL;
 
 	/* Set variable data */
-	CFG_VAR(node)->m_value = (value == NULL ? NULL : strdup(value));
+	CFG_VAR(node)->m_value = value;
 	CFG_VAR(node)->m_handler = handler;
 	CFG_VAR(node)->m_handler_data = handler_data;
 
@@ -100,11 +99,11 @@
 
 /* Create a new node and leave node type specific information unset 
  * (don't use this function directly; use previous two instead) */
-cfg_node_t *cfg_new_node( cfg_node_t *parent, char *name, dword flags )
+cfg_node_t *cfg_new_node( cfg_node_t *parent, const char *name, dword flags )
 {
 	cfg_node_t *node;
 	cfg_node_t *real_parent;
-	char *real_name;
+	const char *real_name;
 
 	assert(name);
 
@@ -225,11 +224,11 @@
 } /* End of 'cfg_insert_node' function */
 
 /* Search for the node */
-cfg_node_t *cfg_search_node( cfg_node_t *parent, char *name )
+cfg_node_t *cfg_search_node( cfg_node_t *parent, const char *name )
 {
 	cfg_node_t *real_parent;
 	cfg_node_t *node;
-	char *real_name;
+	const char *real_name;
 
 	assert(parent);
 	assert(name);
@@ -245,11 +244,11 @@
 } /* End of 'cfg_search_node' function */
 
 /* Apply operation to variable value */
-char *cfg_var_apply_op( cfg_node_t *node, char *value, cfg_var_op_t op )
+char *cfg_var_apply_op( cfg_node_t *node, const char *value, cfg_var_op_t op )
 {
 	/* Simply set variable value */
 	if (op == CFG_VAR_OP_SET)
-		return value;
+		return strdup(value);
 	/* Append new value */
 	else if (op == CFG_VAR_OP_ADD)
 	{
@@ -257,7 +256,7 @@
 		if (existing_value != NULL)
 			return util_strcat(existing_value, ";", value, NULL);
 		else
-			return value;
+			return strdup(value);
 	}
 	/* Remove some value */
 	else if (op == CFG_VAR_OP_REM)
@@ -283,11 +282,11 @@
 } /* End of 'cfg_var_apply_op' function */
 
 /* Full version of variable value setting */
-void cfg_set_var_full( cfg_node_t *parent, char *name, char *value, 
+void cfg_set_var_full( cfg_node_t *parent, const char *name, const char *value, 
 		cfg_var_op_t op )
 {
 	cfg_node_t *node;
-	char *orig_value;
+	const char *orig_value;
 	struct cfg_var_op_list_t *opl, *last;
 	
 	/* Search for this node */
@@ -295,24 +294,23 @@
 
 	/* Construct new value */
 	orig_value = value;
-	value = cfg_var_apply_op(node, value, op);
+	char *new_value = cfg_var_apply_op(node, value, op);
 
 	/* Change value */
 	if (node != NULL && CFG_NODE_IS_VAR(node))
 	{
-		if (!cfg_call_var_handler(FALSE, node, value))
+		if (!cfg_call_var_handler(FALSE, node, new_value))
 			return;
 		free(CFG_VAR(node)->m_value);
 		if (value == NULL)
 			CFG_VAR(node)->m_value = NULL;
 		else
-			CFG_VAR(node)->m_value = ((value == orig_value) ? strdup(value) :
-					value);
-		cfg_call_var_handler(TRUE, node, value);
+			CFG_VAR(node)->m_value = new_value;
+		cfg_call_var_handler(TRUE, node, new_value);
 	}
 	/* Create node if not found */
 	else if (node == NULL)
-		node = cfg_new_var(parent, name, 0, value, NULL);
+		node = cfg_new_var(parent, name, 0, new_value, NULL);
 
 	/* Create operations list item */
 	opl = (struct cfg_var_op_list_t *)malloc(sizeof(*opl));
@@ -342,13 +340,13 @@
 } /* End of 'cfg_set_var_full' function */
 
 /* Set variable value */
-void cfg_set_var( cfg_node_t *parent, char *name, char *value )
+void cfg_set_var( cfg_node_t *parent, const char *name, const char *value )
 {
 	cfg_set_var_full(parent, name, value, CFG_VAR_OP_SET);
 } /* End of 'cfg_set_var' function */
 
 /* Set variable integer value */
-void cfg_set_var_int( cfg_node_t *parent, char *name, int val )
+void cfg_set_var_int( cfg_node_t *parent, const char *name, int val )
 {
 	char str32;
 	snprintf(str, sizeof(str), "%d", val);
@@ -356,7 +354,7 @@
 } /* End of 'cfg_set_var_int' function */
 
 /* Set variable pointer value */
-void cfg_set_var_ptr( cfg_node_t *parent, char *name, void *val )
+void cfg_set_var_ptr( cfg_node_t *parent, const char *name, void *val )
 {
 	char str32;
 	snprintf(str, sizeof(str), "%p", val);
@@ -364,7 +362,7 @@
 } /* End of 'cfg_set_var_ptr' function */
 
 /* Set variable integer float */
-void cfg_set_var_float( cfg_node_t *parent, char *name, float val )
+void cfg_set_var_float( cfg_node_t *parent, const char *name, float val )
 {
 	char str32;
 	snprintf(str, sizeof(str), "%f", val);
@@ -372,7 +370,7 @@
 } /* End of 'cfg_set_var_float' function */
 
 /* Get variable value */
-char *cfg_get_var( cfg_node_t *parent, char *name )
+char *cfg_get_var( cfg_node_t *parent, const char *name )
 {
 	cfg_node_t *node;
 
@@ -384,14 +382,14 @@
 } /* End of 'cfg_get_var' function */
 
 /* Get variable integer value */
-int cfg_get_var_int( cfg_node_t *parent, char *name )
+int cfg_get_var_int( cfg_node_t *parent, const char *name )
 {
 	char *str = cfg_get_var(parent, name);
 	return (str == NULL) ? 0 : atoi(str);
 } /* End of 'cfg_get_var_int' function */
 
 /* Get variable pointer value */
-void *cfg_get_var_ptr( cfg_node_t *parent, char *name )
+void *cfg_get_var_ptr( cfg_node_t *parent, const char *name )
 {
 	void *value;
 	char *str = cfg_get_var(parent, name);
@@ -402,15 +400,15 @@
 } /* End of 'cfg_get_var_ptr' function */
 
 /* Get variable float value */
-float cfg_get_var_float( cfg_node_t *parent, char *name )
+float cfg_get_var_float( cfg_node_t *parent, const char *name )
 {
 	char *str = cfg_get_var(parent, name);
 	return (str == NULL) ? 0. : atof(str);
 } /* End of 'cfg_get_var_float' function */
 
 /* Find the real parent of node */
-cfg_node_t *cfg_find_real_parent( cfg_node_t *parent, char *name, 
-		char **real_name )
+cfg_node_t *cfg_find_real_parent( cfg_node_t *parent, const char *name, 
+		const char **real_name )
 {
 	cfg_node_t *real_parent;
 	char *item_name;
@@ -422,7 +420,7 @@
 	/* Walk through parents */
 	for ( real_parent = parent;; )
 	{
-		char *next_name = strchr(name, '.');
+		const char *next_name = strchr(name, '.');
 		cfg_node_t *was_real = real_parent;
 
 		/* If no '.' found - stop (we've found last parent in hierarchy) */
@@ -449,7 +447,7 @@
 } /* End of 'cfg_find_real_parent' function */
 
 /* Search list for a child node (name given is the exact name, without dots) */
-cfg_node_t *cfg_search_list( cfg_node_t *list, char *name )
+cfg_node_t *cfg_search_list( cfg_node_t *list, const char *name )
 {
 	struct cfg_list_hash_item_t *item;
 	int hash;
@@ -491,7 +489,7 @@
 } /* End of 'cfg_call_var_handler' function */
 
 /* Calculate string hash value */
-int cfg_calc_hash( char *str, int table_size )
+int cfg_calc_hash( const char *str, int table_size )
 {
 	int val = 0;
 
@@ -504,7 +502,7 @@
 } /* End of 'cfg_calc_hash' function */
 
 /* Set variable's handler */
-void cfg_set_var_handler( cfg_node_t *parent, char *name, 
+void cfg_set_var_handler( cfg_node_t *parent, const char *name, 
 		cfg_var_handler_t handler, void *handler_data )
 {
 	cfg_node_t *node;
@@ -591,8 +589,7 @@
 			char *new_value = cfg_var_apply_op(dest, opl->m_arg, opl->m_op);
 			if (dv->m_value != NULL)
 				free(dv->m_value);
-			dv->m_value = (new_value == opl->m_arg ? strdup(new_value) : 
-					new_value);
+			dv->m_value = new_value;
 		}
 		cfg_free_node(src, FALSE);
 		return;

mpfc-1.3.8.1.tar.bz2/libmpfc/cfg_rcfile.c -> mpfc-2.0.tar.bz2/libmpfc/cfg_rcfile.c Changed

@@ -3,7 +3,7 @@
  *
  * SG MPFC Library. Configuration files manipulation functions 
  * implementation.
- * $Id: cfg_rcfile.c 229 2005-02-21 18:36:59Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -27,7 +27,6 @@
 #include <string.h>
 #include "types.h"
 #include "cfg.h"
-#include "file.h"
 #include "mystring.h"
 #include "util.h"
 
@@ -48,6 +47,63 @@
 		(*str) ++;
 } /* End of 'cfg_rcfile_skip_ws' function */
 
+static char parse_octal( char **str )
+{
+	unsigned char res = 0;
+	for ( int i = 0; i < 3; ++i )
+	{
+		if (isdigit(**str))
+		{
+			res *= 8;
+			res += (**str) - '0';
+			(*str) ++;
+		}
+		else break;
+	}
+	return (char)res;
+}
+
+static int hex2digit( char c )
+{
+	switch (c)
+	{
+	case '0': return 0;
+	case '1': return 1;
+	case '2': return 2;
+	case '3': return 3;
+	case '4': return 4;
+	case '5': return 5;
+	case '6': return 6;
+	case '7': return 7;
+	case '8': return 8;
+	case '9': return 9;
+	case 'a': case 'A': return 10;
+	case 'b': case 'B': return 11;
+	case 'c': case 'C': return 12;
+	case 'd': case 'D': return 13;
+	case 'e': case 'E': return 14;
+	case 'f': case 'F': return 15;
+	default: return -1;
+	}
+}
+
+static char parse_hex( char **str )
+{
+	unsigned char res = 0;
+	for ( int i = 0; i < 2; ++i )
+	{
+		int d = hex2digit(**str);
+		if (d >= 0)
+		{
+			res *= 16;
+			res += d;
+			(*str) ++;
+		}
+		else break;
+	}
+	return (char)res;
+}
+
 /* Read a string entry from configuration file line */
 char *cfg_rcfile_read_str( char **str, char *token, char (*skipper)(char**) )
 {
@@ -87,32 +143,40 @@
 		ret = (char *)malloc(len + 1);
 		if (ret == NULL)
 			return strdup("");
-		for ( ; (**str) != '\"'; (*str) ++ )
+		for ( ; (**str) && (**str) != '\"'; )
 		{
 			if ((**str) != '\\')
-				reti ++ = **str;
+				reti ++ = *(*str)++;
 			else
 			{
 				(*str) ++;
 				switch (**str)
 				{
 				case 'n':
-					reti ++ = '\n';
+					reti ++ = '\n'; (*str)++;
 					break;
 				case 't':
-					reti ++ = '\t';
+					reti ++ = '\t'; (*str)++;
 					break;
 				case '\"':
-					reti ++ = '\"';
+					reti ++ = '\"'; (*str)++;
 					break;
 				case '\\':
-					reti ++ = '\\';
+					reti ++ = '\\'; (*str)++;
 					break;
 				case 'e':
-					reti ++ = '\033';
+					reti ++ = '\033'; (*str)++;
 					break;
 				default:
-					reti ++ = (**str);
+					if (isdigit(**str))
+						reti ++ = parse_octal(str);
+					else if ((**str) == 'x')
+					{
+						(*str) ++;
+						reti ++ = parse_hex(str);
+					}
+					else
+						reti ++ = *(*str)++;
 					break;
 				}
 			}
@@ -195,24 +259,21 @@
 } /* End of 'cfg_rcfile_var_skipper' function */
 
 /* Full version of reading configuration file function */
-static void _cfg_rcfile_read( cfg_node_t *list, char *name, bool_t nonrec )
+static void _cfg_rcfile_read( cfg_node_t *list, const char *name, bool_t nonrec )
 {
-	file_t *fd;
 	assert(list);
 	assert(name);
 
 	/* Try to open file */
-	fd = file_open(name, "rt", NULL);
+	FILE *fd = fopen(name, "rt");
 	if (fd == NULL)
 		return;
 
 	/* Read */
-	while (!file_eof(fd))
+	while (!feof(fd))
 	{
-		str_t *str;
-		
 		/* Read line */
-		str = file_get_str(fd);
+		str_t *str = util_fgets(fd);
 		if (str == NULL)
 			break;
 
@@ -230,7 +291,7 @@
 	}
 
 	/* Close file */
-	file_close(fd);
+	fclose(fd);
 
 	/* Free stack */
 	if (nonrec)
@@ -241,7 +302,7 @@
 } /* End of '_cfg_rcfile_read' function */
 
 /* Read configuration file */
-void cfg_rcfile_read( cfg_node_t *list, char *name )
+void cfg_rcfile_read( cfg_node_t *list, const char *name )
 {
 	/* Call a low-level version of this function */
 	_cfg_rcfile_read(list, name, TRUE);
@@ -360,8 +421,11 @@
 } /* End of 'cfg_rcfile_parse_line' function */
 
 /* Save a node to file */
-void cfg_rcfile_save_node( FILE *fd, cfg_node_t *node, char *prefix )
+void cfg_rcfile_save_node( FILE *fd, cfg_node_t *node, const char *prefix )
 {
+	if (!node)
+		return;
+
 	/* Save a variable */
 	if (CFG_NODE_IS_VAR(node))
 	{

mpfc-1.3.8.1.tar.bz2/libmpfc/logger.c -> mpfc-2.0.tar.bz2/libmpfc/logger.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Interface for logger functions.
- * $Id: logger.c 262 2006-06-06 10:08:04Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -24,10 +24,82 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include "types.h"
 #include "cfg.h"
 #include "logger.h"
 
+int logger_get_level( logger_t *log );
+
+static void *logger_stderr_thread( void *arg )
+{
+	logger_t *log = (logger_t *)arg;
+
+	for ( ;; )
+	{
+		int retv = rd_with_notify_wait(log->m_stderr_rdwn);
+		if (!retv)
+			break;
+
+		/* Exit notification */
+		if (retv & RDWN_NOTIFY_READY)
+			break;
+
+		/* Read from stderr */
+		char buf1024;
+		int sz = read(RDWN_FD(log->m_stderr_rdwn), buf, sizeof(buf) - 1);
+		if (sz < 0)
+			continue;
+		bufsz = 0;
+
+		/* Add to the log */
+		logger_error(log, 0, "%s", buf);
+	}
+
+	return NULL;
+}
+
+static bool_t logger_redirect_stderr( logger_t *log )
+{
+	/* Create a pipe */
+	if (pipe(log->m_stderr_pipe) < 0)
+	{
+		log->m_stderr_pipe0 = -1;
+		log->m_stderr_pipe1 = -1;
+		return FALSE;
+	}
+
+	/* Replace stderr with the write side of the pipe */
+	if (dup2(log->m_stderr_pipe1, STDERR_FILENO) < 0)
+		goto failed;
+	log->m_stderr_rdwn = rd_with_notify_new(log->m_stderr_pipe0);
+	if (!log->m_stderr_rdwn)
+		goto failed;
+
+	/* Create thread listening on the read side */
+	if (pthread_create(&log->m_stderr_tid, NULL, logger_stderr_thread, log))
+		goto failed;
+
+	return TRUE;
+failed:
+	if (log->m_stderr_rdwn)
+	{
+		rd_with_notify_free(log->m_stderr_rdwn);
+		log->m_stderr_rdwn = NULL;
+	}
+	if (log->m_stderr_pipe0 >= 0)
+	{
+		close(log->m_stderr_pipe0);
+		log->m_stderr_pipe0 = -1;
+	}
+	if (log->m_stderr_pipe1 >= 0)
+	{
+		close(log->m_stderr_pipe1);
+		log->m_stderr_pipe1 = -1;
+	}
+	return FALSE;
+}
+
 /* Initialize logger */
 logger_t *logger_new( cfg_node_t *cfg_list, char *file_name )
 {
@@ -38,6 +110,7 @@
 	if (log == NULL)
 		return NULL;
 	memset(log, 0, sizeof(*log));
+	log->m_stderr_tid = -1;
 	log->m_cfg = cfg_list;
 	log->m_level = logger_get_level(log);
 	cfg_set_var_handler(log->m_cfg, "log-level", logger_on_change_level, log);
@@ -48,6 +121,10 @@
 
 	/* Create logger mutex */
 	pthread_mutex_init(&log->m_mutex, NULL);
+
+	/* We will redirect stuff written to stderr to the log */
+	logger_redirect_stderr(log);
+
 	return log;
 } /* End of 'logger_new' function */
 
@@ -59,6 +136,21 @@
 
 	assert(log);
 
+	/* Close stderr redirection */
+	if (log->m_stderr_tid >= 0)
+	{
+		char msg = 0;
+		assert(log->m_stderr_rdwn);
+		write(RDWN_NOTIFY_WRITE_FD(log->m_stderr_rdwn), &msg, 1);
+		pthread_join(log->m_stderr_tid, NULL);
+	}
+	if (log->m_stderr_rdwn)
+		rd_with_notify_free(log->m_stderr_rdwn);
+	if (log->m_stderr_pipe0 >= 0)
+		close(log->m_stderr_pipe0);
+	if (log->m_stderr_pipe1 >= 0)
+		close(log->m_stderr_pipe1);
+
 	/* Free mutex */
 	pthread_mutex_destroy(&log->m_mutex);

mpfc-1.3.8.1.tar.bz2/libmpfc/plugin.c -> mpfc-2.0.tar.bz2/libmpfc/plugin.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfc/plugin_mng.c -> mpfc-2.0.tar.bz2/libmpfc/plugin_mng.c Changed

mpfc-2.0.tar.bz2/libmpfc/plugin_plist.c Added

@@ -0,0 +1,83 @@
+/******************************************************************
+ * Copyright (C) 2003 - 2011 by SG Software.
+ *
+ * SG MPFC. Playlist plugin management functions.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#include <dlfcn.h>
+#include <stdlib.h>
+#include <string.h>
+#include "types.h"
+#include "plp.h"
+#include "pmng.h"
+#include "util.h"
+
+/* Initialize playlist plugin */
+plugin_t *plp_init( char *name, pmng_t *pmng )
+{
+	plp_data_t pd;
+	plugin_t *p;
+
+	/* Create plugin */
+	memset(&pd, 0, sizeof(pd));
+	p = plugin_init(pmng, name, PLUGIN_TYPE_PLIST, sizeof(plist_plugin_t), 
+			PLUGIN_DATA(&pd));
+	if (p == NULL)
+		return NULL;
+
+	/* Set other fields */
+	pd.m_rank = cfg_get_var_int(p->m_cfg, "rank");
+	PLIST_PLUGIN(p)->m_pd = pd;
+	p->m_pd = PLUGIN_DATA(&PLIST_PLUGIN(p)->m_pd);
+	return p;
+} /* End of 'ep_init' function */
+
+/* Iterate over playlist contents */
+plp_status_t plp_for_each_item( plist_plugin_t *p, char *pl_name, void *ctx, plp_func_t f )
+{
+	if (p != NULL && (p->m_pd.m_for_each_item != NULL))
+		return p->m_pd.m_for_each_item(pl_name, ctx, f);
+	return PLP_STATUS_FAILED;
+} /* End of 'plp_for_each_item' function */
+
+/* Get supported file formats */
+void plp_get_formats( plist_plugin_t *p, char *extensions, char *content_type )
+{
+	if (p != NULL && (p->m_pd.m_get_formats != NULL))
+		p->m_pd.m_get_formats(extensions, content_type);
+	else
+	{
+		if (extensions != NULL)
+			strcpy(extensions, "");
+		if (content_type != NULL)
+			strcpy(content_type, "");
+	}
+} /* End of 'plp_get_formats' function */
+	
+/* Get plugin prefix */
+char *plp_get_prefix( plist_plugin_t *p )
+{
+	if (p != NULL && (p->m_pd.m_get_prefix != NULL))
+		return p->m_pd.m_get_prefix();
+	else
+		return NULL;
+} /* End of 'plp_get_formats' function */
+	
+/* End of 'plugin_plist.c' file */
+

mpfc-1.3.8.1.tar.bz2/libmpfc/song_info.c -> mpfc-2.0.tar.bz2/libmpfc/song_info.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Song info management functions implementation.
- * $Id: song_info.c 229 2005-02-21 18:36:59Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -23,8 +23,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "types.h"
-#include "charset.h"
-#include "genre_list.h"
 #include "pmng.h"
 #include "song_info.h"
 
@@ -48,8 +46,6 @@
 	si->m_comments = strdup("");
 	si->m_own_data = strdup("");
 	si->m_genre = strdup("");
-	si->m_charset = NULL;
-	si->m_glist = NULL;
 	return si;
 } /* End of 'si_new' function */
 
@@ -76,12 +72,7 @@
 	si->m_comments = strdup(info->m_comments);
 	si->m_genre = strdup(info->m_genre);
 	si->m_own_data = strdup(info->m_own_data);
-	if (info->m_charset != NULL)
-		si->m_charset = strdup(info->m_charset);
-	else
-		si->m_charset = NULL;
 	si->m_flags = info->m_flags;
-	si->m_glist = info->m_glist;
 	return si;
 } /* End of 'si_dup' function */
 
@@ -100,13 +91,11 @@
 	free(si->m_comments);
 	free(si->m_own_data);
 	free(si->m_genre);
-	if (si->m_charset != NULL)
-		free(si->m_charset);
 	free(si);
 } /* End of 'si_free' function */
 
 /* Set song name */
-void si_set_name( song_info_t *si, char *name )
+void si_set_name( song_info_t *si, const char *name )
 {
 	if (si == NULL)
 		return;
@@ -118,7 +107,7 @@
 } /* End of 'si_set_name' function */
 
 /* Set artist name */
-void si_set_artist( song_info_t *si, char *artist )
+void si_set_artist( song_info_t *si, const char *artist )
 {
 	if (si == NULL)
 		return;
@@ -130,7 +119,7 @@
 } /* End of 'si_set_artist' function */
 
 /* Set album name */
-void si_set_album( song_info_t *si, char *album )
+void si_set_album( song_info_t *si, const char *album )
 {
 	if (si == NULL)
 		return;
@@ -142,7 +131,7 @@
 } /* End of 'si_set_album' function */
 
 /* Set year */
-void si_set_year( song_info_t *si, char *year )
+void si_set_year( song_info_t *si, const char *year )
 {
 	if (si == NULL)
 		return;
@@ -154,7 +143,7 @@
 } /* End of 'si_set_year' function */
 
 /* Set track */
-void si_set_track( song_info_t *si, char *track )
+void si_set_track( song_info_t *si, const char *track )
 {
 	if (si == NULL)
 		return;
@@ -166,7 +155,7 @@
 } /* End of 'si_set_track' function */
 
 /* Set comments */
-void si_set_comments( song_info_t *si, char *comments )
+void si_set_comments( song_info_t *si, const char *comments )
 {
 	if (si == NULL)
 		return;
@@ -178,48 +167,19 @@
 } /* End of 'si_set_comments' function */
 
 /* Set genre */
-void si_set_genre( song_info_t *si, char *genre )
+void si_set_genre( song_info_t *si, const char *genre )
 {
-	int id;
-	char *s;
-
 	if (si == NULL)
 		return;
 
-	/* Free memory */
 	free(si->m_genre);
-	if (genre == NULL)
-	{
-		si->m_genre = strdup("");
-		return;
-	}
-	
-	/* Genre string is a number */
-	id = glist_str2num(genre);
-	if (id >= 0 && si->m_glist != NULL)
-	{
-		char *name;
-		
-		/* Get this genre name */
-		name = glist_get_name_by_id(si->m_glist, id);
-		if (name != NULL)
-			si->m_genre = strdup(name);
-		else
-			si->m_genre = strdup(genre);
+	si->m_genre = strdup(genre == NULL ? "" : genre);
+	if (genre != NULL)
 		si->m_flags |= SI_INITIALIZED;
-		return;
-	}
-
-	/* If not - set this string as genre and remove its id (if exists) */
-	si->m_genre = strdup(genre);
-	s = strrchr(si->m_genre, '(');
-	if (s != NULL)
-		*s = 0;
-	si->m_flags |= SI_INITIALIZED;
 } /* End of 'si_set_genre' function */
 
 /* Set own data */
-void si_set_own_data( song_info_t *si, char *own_data )
+void si_set_own_data( song_info_t *si, const char *own_data )
 {
 	if (si == NULL)
 		return;
@@ -228,54 +188,5 @@
 	si->m_own_data = strdup(own_data == NULL ? "" : own_data);
 } /* End of 'si_set_own_data' function */
 
-/* Set charset */
-void si_set_charset( song_info_t *si, char *cs )
-{
-	if (si == NULL)
-		return;
-
-	if (si->m_charset != NULL)
-		free(si->m_charset);
-	if (cs == NULL)
-		si->m_charset = NULL;
-	else
-		si->m_charset = strdup(cs);
-} /* End of 'si_set_charset' function */
-
-/* Convert info fields from one charset to another */
-void si_convert_cs( song_info_t *si, char *new_cs, pmng_t *pmng )
-{
-	char *str;
-	
-	if (si == NULL || new_cs == NULL || pmng == NULL)
-		return;
-
-	si_convert_field(si, &si->m_name, new_cs, pmng);
-	si_convert_field(si, &si->m_artist, new_cs, pmng);
-	si_convert_field(si, &si->m_album, new_cs, pmng);
-	si_convert_field(si, &si->m_year, new_cs, pmng);
-	si_convert_field(si, &si->m_track, new_cs, pmng);
-	si_convert_field(si, &si->m_comments, new_cs, pmng);
-	si_set_charset(si, new_cs);
-} /* End of 'si_convert_cs' function */
-
-/* Convert one field */
-void si_convert_field( song_info_t *si, char **field, char *new_cs, 
-							pmng_t *pmng )
-{
-	char *cs;
-	char *str;
-	
-	cs = si->m_charset;
-	if (cs == NULL)
-		cs = cfg_get_var(pmng_get_cfg(pmng), "charset-input");
-	str = cs_convert(*field, cs, new_cs, pmng);
-	if (str != NULL)
-	{
-		free(*field);
-		*field = str;
-	}
-} /* End of 'si_convert_field' function */
-
 /* End of 'song_info.h' file */

mpfc-1.3.8.1.tar.bz2/libmpfc/string.c -> mpfc-2.0.tar.bz2/libmpfc/string.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. String management functions implementation.
- * $Id: string.c 229 2005-02-21 18:36:59Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -24,17 +24,20 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <wchar.h>
 #include "types.h"
 #include "mystring.h"
+#include "util.h"
 
 /* String portion size */
 #define STR_PORTION_SIZE 64
 
 /* Some private functions */
 static void str_allocate( str_t *str, int new_len );
+static int str_move_back( str_t *str, int pos );
 
 /* Create a new string */
-str_t *str_new( char *s )
+str_t *str_new( const char *s )
 {
 	str_t *str;
 	int len;
@@ -52,13 +55,16 @@
 	str->m_data = NULL;
 	str->m_allocated = 0;
 	str->m_portion_size = STR_PORTION_SIZE;
+	str->m_bytes_to_complete = 0;
+	str->m_utf8_seq_len = 0;
+	str->m_width = ((*s) == 0) ? 0 : -1;
 	str_allocate(str, str->m_len);
 	strcpy(str->m_data, s);
 	return str;
 } /* End of 'str_new' function */
 
 /* Duplicate string */
-str_t *str_dup( str_t *s )
+str_t *str_dup( const str_t *s )
 {
 	return str_new(s->m_data);
 } /* End of 'str_dup' function */
@@ -74,8 +80,21 @@
 	free(str);
 } /* End of 'str_free' function */
  
+/* Clear string */
+void str_clear( str_t *str )
+{
+	if (str == NULL)
+		return;
+
+	*str->m_data = 0;
+	str->m_len = 0;
+	str->m_width = -1;
+	str->m_bytes_to_complete = 0;
+	str->m_utf8_seq_len = 0;
+} /* End of 'str_clear' function */
+
 /* Copy string from (char *) */
-str_t *str_copy_cptr( str_t *dest, char *src )
+str_t *str_copy_cptr( str_t *dest, const char *src )
 {
 	int len;
 	
@@ -84,17 +103,20 @@
 
 	str_allocate(dest, dest->m_len = strlen(src));
 	strcpy(dest->m_data, src);
+	dest->m_width = -1;
 	return dest;
 } /* End of 'str_copy_cptr' function */
 
 /* Copy string */
-str_t *str_copy( str_t *dest, str_t *src )
+str_t *str_copy( str_t *dest, const str_t *src )
 {
-	return str_copy_cptr(dest, src->m_data);
+	str_t *new_str = str_copy_cptr(dest, src->m_data);
+	new_str->m_width = src->m_width;
+	return new_str;
 } /* End of 'str_copy' function */
 
 /* Concatenate string with (char *) */
-str_t *str_cat_cptr( str_t *dest, char *src )
+str_t *str_cat_cptr( str_t *dest, const char *src )
 {
 	int len;
 
@@ -104,43 +126,107 @@
 	len = strlen(src);
 	str_allocate(dest, dest->m_len + len);
 	dest->m_len += len;
+	dest->m_width = -1;
 	strcat(dest->m_data, src);
 	return dest;
 } /* End of 'str_cat_cptr' function */
 
 /* Concatenate strings */
-str_t *str_cat( str_t *dest, str_t *src )
+str_t *str_cat( str_t *dest, const str_t *src )
 {
-	return str_cat_cptr(dest, src->m_data);
+	int was_width = dest->m_width;
+	str_t *new_str = str_cat_cptr(dest, src->m_data);
+	if (was_width >= 0 && src->m_width >= 0)
+		new_str->m_width = was_width + src->m_width;
+	return new_str;
 } /* End of 'str_cat' function */
 
+/* Is the string in consistent state? */
+static inline bool_t str_is_consistent( str_t *str )
+{
+	return str->m_bytes_to_complete == 0;
+} /* End of 'str_is_consistent' function */
+
 /* Insert a character to string */
-void str_insert_char( str_t *str, char ch, int index )
+int str_insert_char( str_t *str, char ch, int index )
 {
+	index += str->m_utf8_seq_len;
 	if (str == NULL || index < 0 || index > str->m_len)
-		return;
+		return 0;
 
 	str_allocate(str, str->m_len + 1);
 	memmove(&str->m_dataindex + 1, &str->m_dataindex,
 			str->m_len - index + 1);
 	str->m_dataindex = ch;
 	str->m_len ++;
+
+	/* Easy case: normal ASCII char */
+	if (utf8_is_ascii_byte(ch))
+	{
+		if (str->m_width >= 0)
+			++str->m_width;
+		return 1;
+	}
+	else
+	{
+		/* Analyze utf8 completeness */
+		if (str_is_consistent(str))
+		{
+			/* If we receive a non-ascii byte, enter the incomplete state */
+			str->m_bytes_to_complete = utf8_decode_num_bytes(ch) - 1;
+		}
+		else
+		{
+			--str->m_bytes_to_complete;
+		}
+		++str->m_utf8_seq_len;
+
+		if (str_is_consistent(str))
+		{
+			str->m_utf8_seq_len = 0;
+
+			wchar_t c = str_wchar_at(str, str_move_back(str, index + 1), NULL);
+			int w = wcwidth(c);
+			if (w < 0)
+				w = 0;
+
+			if (str->m_width >= 0)
+				str->m_width += w;
+
+			return w;
+		}
+
+		/* In inconsistent state */
+		return -1;
+	}
 } /* End of 'str_insert_char' function */
 
 /* Delete a character from string */
-char str_delete_char( str_t *str, int index )
+bool_t str_delete_char( str_t *str, int index, bool_t before )
 {
-	char ch;
-	
-	if (str == NULL || index < 0 || index >= str->m_len)
-		return 0;
+	/* Find byte positions to delete */
+	int bp = index;
+	int sp = 0; /* dummy */
+	str_skip_positions(str, &bp, &sp, before ? -1 : 1);
+	if (bp == index)
+		return FALSE;
+	if (bp < index)
+	{
+		int t = bp;
+		bp = index;
+		index = t;
+	}
 
-	ch = str->m_dataindex;
-	memmove(&str->m_dataindex, &str->m_dataindex + 1,
-			str->m_len - index);
-	str_allocate(str, str->m_len - 1);
-	str->m_len --;
-	return ch;
+	memmove(&str->m_dataindex, &str->m_databp,
+			str->m_len - bp + 1);
+
+	if (str->m_width >= 0)
+		--str->m_width;
+
+	int new_len = str->m_len - (bp - index);
+	str_allocate(str, new_len);
+	str->m_len = new_len;
+	return TRUE;
 } /* End of 'str_delete_char' function */
 
 /* Replace all characters 'from' to 'to' */
@@ -157,7 +243,7 @@
 } /* End of 'str_replace_char' function */
 
 /* Insert a (char *) */
-str_t *str_insert_cptr( str_t *dest, char *src, int index )
+str_t *str_insert_cptr( str_t *dest, const char *src, int index )
 {
 	int len;
 	
@@ -170,17 +256,22 @@
 			dest->m_len - index + 1);
 	memcpy(&dest->m_dataindex, src, len);
 	dest->m_len += len;
+	dest->m_width = -1;
 	return dest;
 } /* End of 'str_insert_cptr' function */
 
 /* Insert a string */
-str_t *str_insert_str( str_t *dest, str_t *src, int index )
+str_t *str_insert_str( str_t *dest, const str_t *src, int index )
 {
-	return str_insert_cptr(dest, src->m_data, index);
+	int was_width = dest->m_width;
+	str_t *new_str = str_insert_cptr(dest, src->m_data, index);
+	if (was_width >= 0 && src->m_width >= 0)
+		new_str->m_width = was_width + src->m_width;
+	return new_str;
 } /* End of 'str_insert_str' function */
 
 /* Formatted print */
-int str_printf( str_t *str, char *fmt, ... )
+int str_printf( str_t *str, const char *fmt, ... )
 {
 	int n, size = 100;
 	va_list ap;
@@ -188,6 +279,7 @@
 	if (str == NULL)
 		return 0;
 
+	str->m_width = -1;
 	str_allocate(str, size);
 	for ( ;; )
 	{
@@ -215,7 +307,7 @@
 } /* End of 'str_allocate' function */
 
 /* Extract a substring */
-str_t *str_substring( str_t *str, int start, int end )
+str_t *str_substring( const str_t *str, int start, int end )
 {
 	str_t *new_str;
 
@@ -234,6 +326,9 @@
 	new_str->m_data = NULL;
 	new_str->m_allocated = 0;
 	new_str->m_portion_size = STR_PORTION_SIZE;
+	new_str->m_bytes_to_complete = 0;
+	new_str->m_utf8_seq_len = 0;
+	new_str->m_width = -1;
 	str_allocate(new_str, new_str->m_len);
 	memcpy(new_str->m_data, &str->m_datastart, new_str->m_len);
 	new_str->m_datanew_str->m_len = 0;
@@ -241,7 +336,7 @@
 } /* End of 'str_substring' function */
 
 /* Extract a substring from (char *) */
-str_t *str_substring_cptr( char *str, int start, int end )
+str_t *str_substring_cptr( const char *str, int start, int end )
 {
 	str_t *new_str;
 
@@ -260,6 +355,9 @@
 	new_str->m_data = NULL;
 	new_str->m_allocated = 0;
 	new_str->m_portion_size = STR_PORTION_SIZE;
+	new_str->m_bytes_to_complete = 0;
+	new_str->m_utf8_seq_len = 0;
+	new_str->m_width = -1;
 	str_allocate(new_str, new_str->m_len);
 	memcpy(new_str->m_data, &strstart, new_str->m_len);
 	new_str->m_datanew_str->m_len = 0;
@@ -283,5 +381,111 @@
 	}
 } /* End of 'str_fn_escape_specs' function */
 
+/* Decode multibyte sequence at the given position */
+wchar_t str_wchar_at( str_t *str, unsigned pos, int *nbytes )
+{
+	mbstate_t mbstate;
+	memset(&mbstate, 0, sizeof(mbstate));
+
+	size_t n = str->m_len - pos;
+	wchar_t ch;
+	n = mbrtowc(&ch, str->m_data + pos, n, &mbstate);
+	if (n >= (size_t)(-2))
+	{
+		ch = L'?';
+		n = 1;
+	}
+	else if (n == 0)
+	{
+		ch = 0;
+		n = 1;
+	}
+
+	if (nbytes)
+		(*nbytes) = n;
+	return ch;
+} /* End of 'str_wchar_at' function */
+
+/* Move to start of a previous char */
+static int str_move_back( str_t *str, int pos )
+{
+	while (pos > 0)
+	{
+		--pos;
+		if (utf8_is_start_byte(str->m_datapos))
+			break;
+	}
+	return pos;
+} /* End of 'str_move_back' function */
+
+/* Skip 'delta' displayable positions from byte_pos
+ * sym_pos may be updated by a different delta if wide symbols are encountered */
+void str_skip_positions( str_t *str, int *byte_pos, int *sym_pos, int delta )
+{
+	if (!str)
+		return;
+
+	int bp = *byte_pos;
+	int sp = *sym_pos;
+
+	/* Scan forward */
+	if (delta >= 0)
+	{
+		while (delta > 0 && bp < str->m_len)
+		{
+			int nbytes;
+			wchar_t c = str_wchar_at(str, bp, &nbytes);
+			int w = wcwidth(c);
+			if (w < 0)
+				w = 0;
+
+			delta -= w;
+			sp += w;
+			bp += nbytes;
+		} 
+
+		/* Skip remaining zero-width chars */
+		while (bp < str->m_len)
+		{
+			int nbytes;
+			wchar_t c = str_wchar_at(str, bp, &nbytes);
+			int w = wcwidth(c);
+			if (w > 0)
+				break;
+
+			bp += nbytes;
+		}
+
+		(*byte_pos) = bp;
+		(*sym_pos) = sp;
+	}
+	/* Scan backwards */
+	else if (delta < 0)
+	{
+		while (bp > 0 && delta < 0)
+		{
+			bp = str_move_back(str, bp);
+
+			int nbytes;
+			wchar_t c = str_wchar_at(str, bp, &nbytes);
+			int w = wcwidth(c);
+			if (w < 0)
+				w = 0;
+
+			delta += w;
+			sp -= w;
+		}
+
+		(*byte_pos) = bp;
+		(*sym_pos) = sp;
+	}
+} /* End of 'str_skip_positions' function*/
+
+/* Calculate display width of the string */
+int str_calc_width( str_t *str )
+{
+	return (str->m_width = utf8_width(str->m_data));
+} /* End of 'str_calc_width' function */
+
 /* End of 'string.c' file */

mpfc-1.3.8.1.tar.bz2/libmpfc/util.c -> mpfc-2.0.tar.bz2/libmpfc/util.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Various utility functions implementation.
- * $Id: util.c 307 2011-03-13 11:58:47Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -28,6 +28,8 @@
 #include <pwd.h>
 #include <regex.h>
 #include <time.h>
+#include <wchar.h>
+#include <langinfo.h>
 #include "types.h"
 #include "util.h"
 
@@ -88,11 +90,11 @@
 } /* End of 'util_search_str' function */
 
 /* Get file extension */
-char *util_extension( char *name )
+char *util_extension( const char *name )
 {
 	char *str = strrchr(name, '.');
 	if (str == NULL)
-		return name + strlen(name);
+		return "";
 	else
 		return str + 1;
 } /* End of 'util_get_ext' function */
@@ -112,12 +114,13 @@
 {
 	util_delay(0, 10000000);
 } /* End of 'util_wait' function */
+
 /* Get file name without full path */
-char *util_short_name( char *name )
+char *util_short_name( const char *name )
 {
 	char *str = strrchr(name, '/');
 	if (str == NULL)
-		return name;
+		return (char*)name;
 	else
 		return str + 1;
 } /* End of 'util_get_file_short_name' function */
@@ -153,6 +156,15 @@
 	return fd;
 } /* End of 'util_fopen' function */
 
+/* Wrapper around fgets */
+str_t *util_fgets( FILE *fd )
+{
+	char s1024 = "";
+	if (fgets(s, sizeof(s), fd) == NULL)
+		return NULL;
+	return str_new(s);
+} /* End of 'util_fgets' function */
+
 /* Get short plugin name */
 char *util_get_plugin_short_name( char *dest, char *src )
 {
@@ -249,9 +261,9 @@
 } /* End of 'util_replace_char' function */
 
 /* Get file directory name */
-void util_get_dir_name( char *dir, char *filename )
+void util_get_dir_name( char *dir, const char *filename )
 {
-	char *s = strrchr(filename, '/');
+	const char *s = strrchr(filename, '/');
 
 	if (s == NULL)
 		strcpy(dir, "");
@@ -296,15 +308,14 @@
 } /* End of 'util_get_home_dir' function */
 
 /* Concatenate multiple strings */
-char *util_strcat( char *first, ... )
+char *util_strcat( const char *first, ... )
 {
 	va_list ap;
 	int len = 0, pos = 0;
-	char *ret, *str;
 
 	/* Calculate resulting string length */
 	va_start(ap, first);
-	str = first;
+	const char *str = first;
 	while (str != NULL)
 	{
 		len += strlen(str);
@@ -313,7 +324,7 @@
 	va_end(ap);
 
 	/* Build string */
-	ret = (char *)malloc(len + 1);
+	char *ret = (char *)malloc(len + 1);
 	if (ret == NULL)
 		return strdup("");
 	va_start(ap, first);
@@ -329,10 +340,58 @@
 	return ret;
 } /* End of 'util_strcat' function */
 
-int mbslen( char *str )
+/* Calculate display width of an UTF-8 string */
+int utf8_width(char *str)
+{
+	int w = 0;
+
+	size_t nbytes = strlen(str);
+	mbstate_t mbstate;
+	memset(&mbstate, 0, sizeof(mbstate));
+	while (nbytes > 0)
+	{
+		/* Convert to unicode */
+		wchar_t ch;
+		size_t n = mbrtowc(&ch, str, nbytes, &mbstate);
+		if (n >= (size_t)(-2))
+		{
+			++w;
+			++str;
+			continue;
+		}
+
+		/* Should not happen if locale is correct */
+		if (n == 0)
+			break;
+
+		str += n;
+		nbytes -= n;
+
+		int cw = wcwidth(ch);
+		if (cw > 0)
+			w += cw;
+	}
+	return w;
+} /* End of 'utf8_width' function */
+
+/* Decode UTF-8 sequence length using the first byte */
+int utf8_decode_num_bytes(char c)
+{
+	int n = 0;
+	int mask = 1 << 7;
+	while (mask && (c & mask))
+	{
+		++n;
+		mask >>= 1;
+	}
+	return n;
+} /* End of 'utf8_decode_num_bytes' function */
+
+/* Check that the locale is in UTF-8 mode */
+bool_t util_check_utf8_mode( void )
 {
-	return strlen(str);
-}
+	return (strcmp(nl_langinfo(CODESET), "UTF-8") == 0);
+} /* End of 'util_check_utf8_mode' function */
 
 /* End of 'util.c' file */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/Makefile.am -> mpfc-2.0.tar.bz2/libmpfcwnd/Makefile.am Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/Makefile.in -> mpfc-2.0.tar.bz2/libmpfcwnd/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,10 +80,28 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = libmpfcwnd
-DIST_COMMON = $(libmpfcwndhdr_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(libmpfcwndhdr_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -67,6 +129,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(libmpfcwndhdrdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -81,30 +149,80 @@
 	wnd_multiview_dialog.lo wnd_listbox.lo wnd_repval.lo \
 	$(am__objects_1)
 libmpfcwnd_la_OBJECTS = $(am_libmpfcwnd_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmpfcwnd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libmpfcwnd_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libmpfcwnd_la_SOURCES)
 DIST_SOURCES = $(libmpfcwnd_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(libmpfcwndhdr_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -115,10 +233,10 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
 COMMON_LIBS = @COMMON_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURSES_CFLAGS = @CURSES_CFLAGS@
 CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
@@ -131,28 +249,26 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC2 = @GLIBC2@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GPM_LIBS = @GPM_LIBS@
 GREP = @GREP@
+GSTREAMER_AUDIO_CFLAGS = @GSTREAMER_AUDIO_CFLAGS@
+GSTREAMER_AUDIO_LIBS = @GSTREAMER_AUDIO_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -162,30 +278,31 @@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSON_CFLAGS = @JSON_CFLAGS@
+JSON_LIBS = @JSON_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
 LIBOBJS = @LIBOBJS@
 LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTLIBC = @LTLIBC@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIBS = @MATH_LIBS@
@@ -197,10 +314,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -209,6 +324,10 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLIST_PLUGINS = @PLIST_PLUGINS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -218,15 +337,16 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
+TAGLIB_LIBS = @TAGLIB_LIBS@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
 WOE32DLL = @WOE32DLL@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -300,8 +420,9 @@
 						wnd_repval.c \
 						$(libmpfcwndhdr_HEADERS)
 
-libmpfcwnd_la_LIBADD = @COMMON_LIBS@ @GPM_LIBS@ @PTHREAD_LIBS@ @CURSES_LIBS@ @ICU_LIBS@
-INCLUDES = -I$(top_builddir)/src
+libmpfcwnd_la_LIBADD = @COMMON_LIBS@ @GPM_LIBS@ @PTHREAD_LIBS@ @CURSES_LIBS@ 
+libmpfcwnd_la_LDFLAGS = -version-info 2:0
+AM_CPPFLAGS = -I$(top_srcdir)/src @CURSES_CFLAGS@
 all: all-am
 
 .SUFFIXES:
@@ -315,9 +436,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libmpfcwnd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libmpfcwnd/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu libmpfcwnd/Makefile
+	  $(AUTOMAKE) --foreign libmpfcwnd/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -336,9 +457,9 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -346,6 +467,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -361,14 +484,17 @@
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libmpfcwnd.la: $(libmpfcwnd_la_OBJECTS) $(libmpfcwnd_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libmpfcwnd_la_OBJECTS) $(libmpfcwnd_la_LIBADD) $(LIBS)
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libmpfcwnd.la: $(libmpfcwnd_la_OBJECTS) $(libmpfcwnd_la_DEPENDENCIES) $(EXTRA_libmpfcwnd_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmpfcwnd_la_LINK) -rpath $(libdir) $(libmpfcwnd_la_OBJECTS) $(libmpfcwnd_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -404,25 +530,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wnd_views.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -431,8 +557,11 @@
 	-rm -rf .libs _libs
 install-libmpfcwndhdrHEADERS: $(libmpfcwndhdr_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libmpfcwndhdrdir)" || $(MKDIR_P) "$(DESTDIR)$(libmpfcwndhdrdir)"
 	@list='$(libmpfcwndhdr_HEADERS)'; test -n "$(libmpfcwndhdrdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libmpfcwndhdrdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libmpfcwndhdrdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -446,30 +575,17 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(libmpfcwndhdr_HEADERS)'; test -n "$(libmpfcwndhdrdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libmpfcwndhdrdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libmpfcwndhdrdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+	dir='$(DESTDIR)$(libmpfcwndhdrdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -481,15 +597,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -498,6 +610,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -549,10 +676,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -637,20 +769,20 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-libmpfcwndhdrHEADERS \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-libLTLIBRARIES \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES \
+	install-libmpfcwndhdrHEADERS install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
 	uninstall-libmpfcwndhdrHEADERS

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Window functions implementation.
- * $Id: wnd.c 270 2008-11-23 12:50:11Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -24,11 +24,25 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include <unistd.h>
 #include "types.h"
 #include "cfg.h"
 #include "logger.h"
 #include "wnd.h"
 #include "wnd_root.h"
+#include "util.h"
+
+static const char *wnd_set_title_seq_start = NULL;
+static const char *wnd_set_title_seq_end = NULL;
+
+/* Check that this is an xterm or compatible terminal */
+static bool_t is_xterm( void )
+{
+	const char *term = getenv("TERM");
+	if (!term)
+		return FALSE;
+	return !strncmp(term, "xterm", 5) || !strncmp(term, "rxvt", 4);
+} /* End of 'is_xterm' function */
 
 /* Initialize window system and create root window */
 wnd_t *wnd_init( cfg_node_t *cfg_list, logger_t *log )
@@ -55,6 +69,7 @@
 	cbreak();
 	noecho();
 	nodelay(wnd, TRUE);
+	keypad(wnd, TRUE);
 	force_terminal_bg = cfg_get_var_bool(cfg_list, "force-terminal-bg");
 	if (force_terminal_bg)
 	{
@@ -81,13 +96,9 @@
 	db_data = (struct wnd_display_buf_symbol_t *)malloc(len * sizeof(*db_data));
 	if (db_data == NULL)
 		goto failed;
+	memset(db_data, 0, len * sizeof(*db_data));
 	for ( i = 0; i < len; i ++ )
-	{
-		db_datai.m_char.m_normal_tag = TRUE;
-		db_datai.m_char.m_normal = ' ';
-		db_datai.m_attr = 0;
-		db_datai.m_wnd = NULL;
-	}
+		db_datai.m_char.chars0 = L' ';
 	global->m_display_buf.m_width = COLS;
 	global->m_display_buf.m_height = LINES;
 	global->m_display_buf.m_data = db_data;
@@ -156,6 +167,19 @@
 		goto failed;
 	global->m_mouse_data = mouse_data;
 	
+	/* Initialize escape sequence for setting window title */
+	wnd_set_title_seq_start = cfg_get_var(global->m_root_cfg, "ti.ts");
+	if (!wnd_set_title_seq_start)
+	{
+		if (is_xterm())
+			wnd_set_title_seq_start = "\0332;";
+	}
+	else if (!(*wnd_set_title_seq_start))
+		wnd_set_title_seq_start = NULL;
+	wnd_set_title_seq_end = cfg_get_var(global->m_root_cfg, "ti.fs");
+	if (!wnd_set_title_seq_end)
+		wnd_set_title_seq_end = "\007";
+
 	/* Send display message to this window */
 	wnd_postinit(wnd_root);
 	return wnd_root;
@@ -339,6 +363,7 @@
 	/* Initialize message map */
 	wnd_msg_add_handler(wnd, "display", wnd_default_on_display);
 	wnd_msg_add_handler(wnd, "keydown", wnd_default_on_keydown);
+	wnd_msg_add_handler(wnd, "mouse_ldown", wnd_default_on_mouse);
 	wnd_msg_add_handler(wnd, "action", wnd_default_on_action);
 	wnd_msg_add_handler(wnd, "close", wnd_default_on_close);
 	wnd_msg_add_handler(wnd, "erase_back", wnd_default_on_erase_back);
@@ -449,14 +474,12 @@
 				buf->m_height = LINES;
 				free(buf->m_data);
 				size = buf->m_width * buf->m_height;
-				buf->m_data = (struct wnd_display_buf_symbol_t *)malloc(size * 
-						sizeof(*buf->m_data));
+				size_t sz = size * sizeof(*buf->m_data);
+				buf->m_data = (struct wnd_display_buf_symbol_t *)malloc(sz);
+				memset(buf->m_data, 0, sz);
 				for ( i = 0; i < size; i ++ )
 				{
-					buf->m_datai.m_char.m_normal_tag = TRUE;
-					buf->m_datai.m_char.m_normal = ' ';
-					buf->m_datai.m_attr = 0;
-					buf->m_datai.m_wnd = NULL;
+					buf->m_datai.m_char.chars0 = L' ';
 				}
 				wnd_display_buf_unlock(buf);
 				wnd_repos(wnd_root, 0, 0, COLS, LINES);
@@ -613,16 +636,18 @@
 		
 		/* Print top border */
 		wnd_move(wnd, WND_MOVE_ABSOLUTE, 0, 0);
-		wnd_put_special(wnd, wnd->m_height > 1 ? ACS_ULCORNER : ACS_LTEE);
+		wnd_put_special(wnd, wnd->m_height > 1 ?
+				WND_ACS_CODE(WACS_ULCORNER) : WND_ACS_CODE(WACS_LTEE));
 		for ( i = 1; i < wnd->m_width - 1; i ++ )
-			wnd_put_special(wnd, ACS_HLINE);
-		wnd_put_special(wnd, wnd->m_height > 1 ? ACS_URCORNER : ACS_RTEE);
+			wnd_put_special(wnd, WND_ACS_CODE(WACS_HLINE));
+		wnd_put_special(wnd, wnd->m_height > 1 ?
+				WND_ACS_CODE(WACS_URCORNER) : WND_ACS_CODE(WACS_RTEE));
 		
 		/* Print caption */
 		if (WND_FLAGS(wnd) & WND_FLAG_CAPTION)
 		{
 			/* Determine title position */
-			text_pos = (int)(wnd->m_width - mbslen(wnd->m_title) - 2) / 2;
+			text_pos = (int)(wnd->m_width - utf8_width(wnd->m_title) - 2) / 2;
 			if (text_pos <= 0)
 				text_pos = 1;
 
@@ -640,19 +665,19 @@
 		for ( i = 1; i < wnd->m_height - 1; i ++ )
 		{
 			wnd_move(wnd, WND_MOVE_ABSOLUTE, 0, i);
-			wnd_put_special(wnd, ACS_VLINE);
+			wnd_put_special(wnd, WND_ACS_CODE(WACS_VLINE));
 			wnd_move(wnd, WND_MOVE_ABSOLUTE, wnd->m_width - 1, i);
-			wnd_put_special(wnd, ACS_VLINE);
+			wnd_put_special(wnd, WND_ACS_CODE(WACS_VLINE));
 		}
 
 		/* Print bottom border */
 		if (wnd->m_height > 1)
 		{
 			wnd_move(wnd, WND_MOVE_ABSOLUTE, 0, wnd->m_height - 1);
-			wnd_put_special(wnd, ACS_LLCORNER);
+			wnd_put_special(wnd, WND_ACS_CODE(WACS_LLCORNER));
 			for ( i = 1; i < wnd->m_width - 1; i ++ )
-				wnd_put_special(wnd, ACS_HLINE);
-			wnd_put_special(wnd, ACS_LRCORNER);
+				wnd_put_special(wnd, WND_ACS_CODE(WACS_HLINE));
+			wnd_put_special(wnd, WND_ACS_CODE(WACS_LRCORNER));
 		}
 
 		/* Print maximize and close boxes */
@@ -1062,27 +1087,10 @@
 	wnd_display_buf_lock(buf);
 	for ( pos = buf->m_data;; pos ++ )
 	{
-		if (pos->m_char.m_normal_tag)
-		{
-			dword ch;
-			cchar_t cc;
-
-			/* Set symbol */
-			ch = pos->m_char.m_normal;
-			if (ch < 0x20 || ch == 0x7F)
-				ch = '?';
-			//util_log("waddch %x\n", ch);
-			memset(&cc, 0, sizeof(cc));
-			cc.attr = pos->m_attr;
-			cc.chars0 = ch;
-	//		setcchar(&cc, &ch, pos->m_attr, 0, NULL);
-			add_wch(&cc);
-	//		waddch(WND_CURSES(wnd), pos->m_attr | /*pos->m_char*/ch);
-		}
-		else
-		{
-			waddch(WND_CURSES(wnd), pos->m_attr | pos->m_char.m_special);
-		}
+		if (!pos->m_char.chars0)
+			continue;
+
+		wadd_wch(WND_CURSES(wnd), &pos->m_char);
 
 		/* Move to next symbol */
 		if (x >= buf->m_width - 1)
@@ -1122,6 +1130,18 @@
 	/* Refresh screen */
 	refresh();
 	buf->m_dirty = FALSE;
+
+	if (buf->m_title_dirty && wnd_set_title_seq_start)
+	{
+		char *title = buf->m_title;
+		if (title && *title)
+		{
+			write(1, wnd_set_title_seq_start, strlen(wnd_set_title_seq_start));
+			write(1, title, strlen(title));
+			write(1, wnd_set_title_seq_end, strlen(wnd_set_title_seq_end));
+		}
+	}
+
 	pthread_mutex_unlock(&WND_CURSES_MUTEX(wnd));
 } /* End of 'wnd_sync_screen' function */
 
@@ -1391,8 +1411,23 @@
 	assert(wnd);
 	assert(WND_GLOBAL(wnd));
 
-	WND_DISPLAY_BUF(wnd).m_dirty = TRUE;
-	wnd_msg_send(WND_ROOT(wnd), "update_screen", wnd_msg_update_screen_new());
+	wnd_t *root = WND_ROOT(wnd);
+
+	/* Clear screen */
+	struct wnd_display_buf_t *buf = &WND_DISPLAY_BUF(wnd);
+	wnd_display_buf_lock(buf);
+	buf->m_dirty = TRUE;
+	unsigned size = buf->m_width * buf->m_height;
+	memset(buf->m_data, 0, size * sizeof(*buf->m_data));
+	for ( unsigned i = 0; i < size; i ++ )
+	{
+		buf->m_datai.m_char.chars0 = L' ';
+	}
+	wnd_display_buf_unlock(buf);
+	wnd_global_update_visibility(root);
+
+	wnd_send_repaint(root, TRUE);
+	wnd_msg_send(root, "update_screen", wnd_msg_update_screen_new());
 } /* End of 'wnd_redisplay' function */
 
 /* Update the whole visibility information */
@@ -1520,7 +1555,7 @@
 } /* End of 'wnd_restore_curses' function */
 
 /* Set window title */
-void wnd_set_title( wnd_t *wnd, char *title )
+void wnd_set_title( wnd_t *wnd, const char *title )
 {
 	free(wnd->m_title);
 	wnd->m_title = strdup(title);
@@ -1578,5 +1613,17 @@
 	return wnd;
 } /* End of 'wnd_get_top_level_ancestor' function */
 
+/* Set global title */
+void wnd_set_global_title( wnd_t *wnd, const char *title )
+{
+	char *cur_title = WND_DISPLAY_BUF(wnd).m_title;
+	if (!cur_title || strcmp(title, cur_title))
+	{
+		free(cur_title);
+		WND_DISPLAY_BUF(wnd).m_title = strdup(title);
+		WND_DISPLAY_BUF(wnd).m_title_dirty = TRUE;
+	}
+} /* End of 'wnd_set_global_title' function */
+
 /* End of 'wnd.c' file */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Interface for basic window functions.
- * $Id: wnd.h 270 2008-11-23 12:50:11Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -23,7 +23,6 @@
 #ifndef __SG_MPFC_WND_H__
 #define __SG_MPFC_WND_H__
 
-#define _XOPEN_SOURCE_EXTENDED
 #include <curses.h>
 #include "types.h"
 #include "cfg.h"
@@ -122,19 +121,9 @@
 		/* Screen image */
 		struct wnd_display_buf_symbol_t
 		{
-			/* Character code */
-			struct wnd_display_buf_symbol_char_t
-			{
-				union
-				{
-					dword m_normal;
-					chtype m_special;
-				};
-				bool_t m_normal_tag;
-			} m_char;
-
-			/* Character attribute */
-			int m_attr;
+			/* Character (possibly with combining codes) and attributes */
+			cchar_t m_char;
+
 			/* The window this position belongs to */
 			wnd_t *m_wnd;
 		} *m_data;
@@ -146,6 +135,10 @@
 		 * repainted discarding all the optimization information */
 		bool_t m_dirty;
 
+		/* The terminal title */
+		char *m_title;
+		bool_t m_title_dirty;
+
 		/* Buffer mutex */
 		pthread_mutex_t m_mutex;
 	} m_display_buf;
@@ -244,6 +237,11 @@
 	/* Cursor position (in client coordinates) */
 	int m_cursor_x, m_cursor_y;
 
+	/* Maintain previous position wnd_putc was called at
+	 * so that subsequent combining chars go there */
+	struct wnd_display_buf_symbol_t *m_prev_print_pos;
+	unsigned m_prev_num_codes;
+
 	/* Window position before maximization */
 	struct
 	{
@@ -317,6 +315,9 @@
 #define WND_CLIENT2SCREEN_Y(wnd, y) (WND_OBJ(wnd)->m_screen_y + \
 		WND_OBJ(wnd)->m_client_y + (y))
 
+/* Get unicode out of a WACS_ symbol */
+#define WND_ACS_CODE(w) (w->chars0)
+
 /* The maximal window level */
 #define WND_MAX_LEVEL	16
 
@@ -372,7 +373,7 @@
 void wnd_prev_focus( wnd_t *wnd );
 
 /* Set window title */
-void wnd_set_title( wnd_t *wnd, char *title );
+void wnd_set_title( wnd_t *wnd, const char *title );
 
 /* Initialize color pairs array */
 void wnd_init_pairs( bool_t force_terminal_bg );
@@ -480,6 +481,9 @@
 /* Get window's top-level ancestor */
 wnd_t *wnd_get_top_level_ancestor( wnd_t *wnd );
 
+/* Set global title */
+void wnd_set_global_title( wnd_t *wnd, const char *title );
+
 #endif
 
 /* End of 'wnd.h' file */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_basic.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_basic.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_basic.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_basic.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_button.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_button.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Button functions implementation.
- * $Id: wnd_button.c 229 2005-02-21 18:36:59Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -59,6 +59,12 @@
 	return btn;
 } /* End of 'button_new' function */
 
+/* Destructor */
+static void button_destructor( wnd_t *wnd )
+{
+	label_text_free(&BUTTON_OBJ(wnd)->m_text);
+} /* End of 'button_destructor' function */
+
 /* Button initialization function */
 bool_t button_construct( button_t *btn, wnd_t *parent, char *title, char *id,
 		char letter )
@@ -67,6 +73,8 @@
 
 	assert(btn);
 
+	label_text_parse(&btn->m_text, title);
+
 	/* Initialize window part */
 	if (!dlgitem_construct(DLGITEM_OBJ(btn), parent, title, id, 
 				button_get_desired_size, NULL, letter, 0))
@@ -78,13 +86,14 @@
 	wnd_msg_add_handler(wnd, "mouse_ldown", button_on_mouse);
 	wnd_msg_add_handler(wnd, "quick_change_focus", 
 			button_on_quick_change_focus);
+	wnd_msg_add_handler(wnd, "destructor", button_destructor);
 	return TRUE;
 } /* End of 'button_construct' function */
 
 /* Get button desired size */
 void button_get_desired_size( dlgitem_t *di, int *width, int *height )
 {
-	*width = 2 + dlgitem_label_text_len(WND_OBJ(di), WND_OBJ(di)->m_title);
+	*width = 2 + BUTTON_OBJ(di)->m_text.width;
 	*height = 1;
 } /* End of 'button_get_desired_size' function */
 
@@ -94,7 +103,7 @@
 	wnd_move(wnd, 0, 0, 0);
 	wnd_apply_default_style(wnd);
 	wnd_putchar(wnd, 0, ' ');
-	dlgitem_display_label_text(wnd, wnd->m_title);
+	label_text_display(wnd, &BUTTON_OBJ(wnd)->m_text);
 	wnd_putchar(wnd, 0, ' ');
 	return WND_MSG_RETCODE_OK;
 } /* End of 'button_on_display' function */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_button.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_button.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_checkbox.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_checkbox.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Checkbox functions implementation.
- * $Id: wnd_checkbox.c 307 2011-03-13 11:58:47Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -51,10 +51,18 @@
 	return cb;
 } /* End of 'checkbox_new' function */
 
+/* Destructor */
+static void checkbox_destructor( wnd_t *wnd )
+{
+	label_text_free(&CHECKBOX_OBJ(wnd)->m_text);
+} /* End of 'checkbox_destructor' function */
+
 /* Check box constructor */
 bool_t checkbox_construct( checkbox_t *cb, wnd_t *parent, char *title, 
 		char *id, char letter, bool_t checked )
 {
+	label_text_parse(&cb->m_text, title);
+
 	/* Initialize dialog item part */
 	if (!dlgitem_construct(DLGITEM_OBJ(cb), parent, title, id, 
 				checkbox_get_desired_size, NULL, letter, 0))
@@ -66,6 +74,7 @@
 	wnd_msg_add_handler(WND_OBJ(cb), "mouse_ldown", checkbox_on_mouse);
 	wnd_msg_add_handler(WND_OBJ(cb), "quick_change_focus", 
 			checkbox_on_quick_change_focus);
+	wnd_msg_add_handler(WND_OBJ(cb), "destructor", checkbox_destructor);
 
 	/* Set check box fields */
 	cb->m_checked = checked;
@@ -96,7 +105,7 @@
 	wnd_apply_style(wnd, WND_FOCUS(wnd) == wnd ? "focus-label-style" :
 			"label-style");
 	wnd_putchar(wnd, 0, ' ');
-	dlgitem_display_label_text(wnd, wnd->m_title);
+	label_text_display(wnd, &cb->m_text);
 	wnd_move(wnd, 0, 1, 0);
 	return WND_MSG_RETCODE_OK;
 } /* End of 'checkbox_on_display' function */
@@ -127,7 +136,7 @@
 /* Get size desired by check box */
 void checkbox_get_desired_size( dlgitem_t *di, int *width, int *height )
 {
-	*width = dlgitem_label_text_len(WND_OBJ(di), WND_OBJ(di)->m_title) + 5;
+	*width = CHECKBOX_OBJ(di)->m_text.width + 5;
 	*height = 1;
 } /* End of 'checkbox_get_desired_size' function */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_checkbox.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_checkbox.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_class.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_class.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_class.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_class.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_combobox.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_combobox.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Combo box functions implementation.
- * $Id: wnd_combobox.c 263 2007-09-21 19:41:23Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -28,6 +28,8 @@
 #include "wnd_dlgitem.h"
 #include "wnd_editbox.h"
 #include "wnd_hbox.h"
+#include "wnd_label.h"
+#include "util.h"
 
 /* Create a new combo box */
 combo_t *combo_new( wnd_t *parent, char *id, char *text, char letter, 
@@ -58,7 +60,7 @@
 {
 	hbox_t *hbox = hbox_new(parent, NULL, 0);
 	label_new(WND_OBJ(hbox), title, "", 0);
-	return combo_new(WND_OBJ(hbox), id, text, letter, width - mbslen(title), 
+	return combo_new(WND_OBJ(hbox), id, text, letter, width - utf8_width(title), 
 			height);
 } /* End of 'combo_new_with_label' function */
 
@@ -117,7 +119,7 @@
 	combo->m_cursor = pos;
 	if (combo->m_cursor < 0)
 		combo->m_cursor = 0;
-	else if (combo->m_cursor >= combo->m_list_size)
+	if (combo->m_cursor >= combo->m_list_size)
 		combo->m_cursor = combo->m_list_size - 1;
 
 	/* Scroll the list */
@@ -130,11 +132,7 @@
 
 	/* Synchronize text */
 	if (synchronize_text)
-	{
-		str_copy_cptr(EDITBOX_OBJ(combo)->m_text, 
-				combo->m_listcombo->m_cursor);
-		editbox_move(EDITBOX_OBJ(combo), EDITBOX_LEN(combo));
-	}
+		editbox_set_text(EDITBOX_OBJ(combo), combo->m_cursor >= 0 ? combo->m_listcombo->m_cursor : "");
 	wnd_invalidate(WND_OBJ(combo));
 } /* End of 'combo_move_cursor' function */
 
@@ -181,7 +179,7 @@
 	combo_t *combo = COMBO_OBJ(wnd);
 
 	/* Display list */
-	if (combo->m_expanded)
+	if (combo->m_expanded && combo->m_list_size)
 	{
 		int i, j;
 		wnd_apply_default_style(wnd);
@@ -237,7 +235,7 @@
 void combo_synch_list( combo_t *combo )
 {
 	char *text = EDITBOX_TEXT(combo);
-	int len = mbslen(text);
+	int len = EDITBOX_BYTE_LEN(combo);
 	int pos = 0, i;
 
 	/* Search for the most suitable item */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_combobox.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_combobox.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_def_handlers.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_def_handlers.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Default message handlers implementation.
- * $Id: wnd_def_handlers.c 307 2011-03-13 11:58:47Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -23,6 +23,7 @@
 #include <strings.h>
 #include <assert.h>
 #include <stdlib.h>
+#include <string.h>
 #include "types.h"
 #include "wnd.h"
 #include "wnd_def_handlers.h"
@@ -44,6 +45,27 @@
 	return WND_MSG_RETCODE_STOP;
 } /* End of 'wnd_default_on_keydown' function */
 
+/* Default 'mouse_ldown' message handler */
+wnd_msg_retcode_t wnd_default_on_mouse( wnd_t *wnd, int x, int y, 
+		wnd_mouse_button_t btn, wnd_mouse_event_t type )
+{
+	/* Handle click on the close/maximize box */
+	if (!(WND_FLAGS(wnd) & WND_FLAG_OWN_DECOR) && (WND_FLAGS(wnd) & WND_FLAG_BORDER))
+	{
+		if (y == -1)
+		{
+			if (x == wnd->m_width - 4)
+				if (WND_FLAGS(wnd) & WND_FLAG_MAX_BOX)
+					wnd_toggle_maximize(wnd);
+
+			if (x == wnd->m_width - 3)
+				if (WND_FLAGS(wnd) & WND_FLAG_CLOSE_BOX)
+					wnd_close(wnd);
+		}
+	}
+	return WND_MSG_RETCODE_OK;
+} /* End of 'wnd_default_on_mouse' function */
+
 /* Default 'action' message handler */
 wnd_msg_retcode_t wnd_default_on_action( wnd_t *wnd, char *action )
 {
@@ -160,9 +182,8 @@
 			{
 				if (owning == wnd)
 				{
-					pos->m_char.m_normal = ' ';
-					pos->m_char.m_normal_tag = TRUE;
-					pos->m_attr = 0;
+					memset(&pos->m_char, 0, sizeof(pos->m_char));
+					pos->m_char.chars0 = L' ';
 					break;
 				}
 			}
@@ -224,12 +245,5 @@
 	return WND_MSG_RETCODE_OK;
 } /* End of 'wnd_default_on_parent_repos' function */
 
-/* Default mouse messages handler */
-wnd_msg_retcode_t wnd_default_on_mouse( wnd_t *wnd,
-		int x, int y, wnd_mouse_button_t btn, wnd_mouse_event_t type )
-{
-	return WND_MSG_RETCODE_OK;
-} /* End of 'wnd_default_on_mouse' function */
-
 /* End of 'wnd_def_handlers.c' file */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_def_handlers.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_def_handlers.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Interface for default *message handlers. 
- * $Id: wnd_def_handlers.h 229 2005-02-21 18:36:59Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -34,6 +34,10 @@
 /* Default 'keydown' message handler */
 wnd_msg_retcode_t wnd_default_on_keydown( wnd_t *wnd, wnd_key_t key );
 
+/* Default 'mouse_ldown' message handler */
+wnd_msg_retcode_t wnd_default_on_mouse( wnd_t *wnd, int x, int y, 
+		wnd_mouse_button_t btn, wnd_mouse_event_t type );
+
 /* Default 'action' message handler */
 wnd_msg_retcode_t wnd_default_on_action( wnd_t *wnd, char *action );
 
@@ -47,10 +51,6 @@
 wnd_msg_retcode_t wnd_default_on_parent_repos( wnd_t *wnd,
 		int px, int py, int pw, int ph, int nx, int ny, int nw, int nh );
 
-/* Default mouse messages handler */
-wnd_msg_retcode_t wnd_default_on_mouse( wnd_t *wnd,
-		int x, int y, wnd_mouse_button_t btn, wnd_mouse_event_t type );
-
 /* Default window destructor */
 void wnd_default_destructor( wnd_t *wnd );

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_dialog.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_dialog.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_dialog.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_dialog.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_dlgitem.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_dlgitem.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Common dialog item functions implementation.
- * $Id: wnd_dlgitem.c 268 2008-09-10 23:29:43Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -162,49 +162,6 @@
 	return WND_MSG_RETCODE_OK;
 } /* End of 'dlgitem_on_action' function */
 
-/* Display a label-like text */
-void dlgitem_display_label_text( wnd_t *wnd, char *text )
-{
-	bool_t mark_next = FALSE;
-
-	for ( ; (*text) != 0; text ++ )
-	{
-		if ((*text) == '&')
-			mark_next = TRUE;
-		else
-		{
-			/* Mark current char */
-			if (mark_next)
-			{
-				char *color = wnd_get_style(wnd, "letter-color");
-				wnd_push_state(wnd, WND_STATE_COLOR);
-				if (color != NULL)
-					wnd_set_fg_color(wnd, wnd_string2color(color));
-				wnd_putchar(wnd, 0, *text);
-				wnd_pop_state(wnd);
-				mark_next = FALSE;
-			}
-			else
-				wnd_putchar(wnd, 0, (byte)(*text));
-		}
-	}
-} /* End of 'dlgitem_display_label_text' function */
-
-/* Get length of label-like text */
-int dlgitem_label_text_len( wnd_t *wnd, char *text )
-{
-	int len = 0;
-
-	if (text == NULL)
-		return 0;
-	for ( ; (*text) != 0; text ++ )
-	{
-		if ((*text) != '&')
-			len ++;
-	}
-	return len;
-} /* End of 'dlgitem_label_text_len' function */
-
 /* Initialize dialog item class */
 wnd_class_t *dlgitem_class_init( wnd_global_data_t *global )
 {

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_dlgitem.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_dlgitem.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_editbox.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_editbox.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Edit box functions implementation.
- * $Id: wnd_editbox.c 307 2011-03-13 11:58:47Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -20,9 +20,9 @@
  * MA 02111-1307, USA.
  */
 
-#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
+#include <wctype.h>
 #include "types.h"
 #include "mystring.h"
 #include "wnd.h"
@@ -30,8 +30,7 @@
 #include "wnd_editbox.h"
 #include "wnd_hbox.h"
 #include "wnd_label.h"
-
-extern int mbslen( char *str );
+#include "util.h"
 
 /* Create a new edit box */
 editbox_t *editbox_new( wnd_t *parent, char *id, char *text, char letter,
@@ -87,7 +86,8 @@
 	eb->m_text = str_new(text == NULL ? "" : text);
 	eb->m_width = width;
 	eb->m_editable = TRUE;
-	editbox_move(eb, STR_LEN(eb->m_text));
+	int len = str_width(eb->m_text);
+	editbox_move(eb, len > eb->m_width ? 0 : len);
 	eb->m_text_before_hist = str_new("");
 	return TRUE;
 } /* End of 'editbox_construct' function */
@@ -99,7 +99,7 @@
 	hbox_t *hbox;
 	hbox = hbox_new(parent, NULL, 0);
 	label_new(WND_OBJ(hbox), title, "", 0);
-	return editbox_new(WND_OBJ(hbox), id, text, letter, width - mbslen(title));
+	return editbox_new(WND_OBJ(hbox), id, text, letter, width - utf8_width(title));
 } /* End of 'editbox_new_with_label' function */
 
 /* Destructor */
@@ -130,11 +130,16 @@
 } /* End of 'editbox_get_desired_size' function */
 
 /* Set edit box text */
-void editbox_set_text( editbox_t *eb, char *text )
+void editbox_set_text( editbox_t *eb, const char *text )
 {
 	assert(eb);
 	str_copy_cptr(eb->m_text, text == NULL ? "" : text);
-	editbox_move(eb, /*EDITBOX_LEN(eb)*/0);
+	int len = str_width(eb->m_text);
+	eb->m_cursor = 0;
+	eb->m_cursor_byte = 0;
+	eb->m_scrolled = 0;
+	eb->m_scrolled_byte = 0;
+	editbox_move(eb, len > eb->m_width ? 0 : len);
 	eb->m_modified = TRUE;
 	wnd_msg_send(WND_OBJ(eb), "changed", editbox_changed_new());
 	wnd_invalidate(WND_OBJ(eb));
@@ -144,42 +149,44 @@
 void editbox_addch( editbox_t *eb, char ch )
 {
 	assert(eb);
-	str_insert_char(eb->m_text, ch, eb->m_cursor);
-	editbox_move(eb, eb->m_cursor + 1);
+	int inserted_width = str_insert_char(eb->m_text, ch, eb->m_cursor_byte);
+	if (inserted_width >= 0)
+		/* If == 0, we still want to correct cursor_byte */
+		editbox_move(eb, eb->m_cursor + inserted_width);
 	eb->m_modified = TRUE;
 } /* End of 'editbox_addch' function */
 
 /* Delete character from the current or previous cursor position */
-void editbox_delch( editbox_t *eb, int pos )
+void editbox_delch( editbox_t *eb, bool_t before_cursor )
 {
 	assert(eb);
-	if (str_delete_char(eb->m_text, pos))
-		editbox_move(eb, pos);
+
+	if (before_cursor)
+		if (!editbox_move(eb, eb->m_cursor - 1))
+			return;
+
+	str_delete_char(eb->m_text, eb->m_cursor_byte, FALSE);
 	eb->m_modified = TRUE;
 } /* End of 'editbox_delch' function */
 
 /* Move cursor */
-void editbox_move( editbox_t *eb, int new_pos )
+bool_t editbox_move( editbox_t *eb, int new_pos )
 {
-	int old_cur = eb->m_cursor;
-	int len = EDITBOX_LEN(eb);
-
 	/* Set cursor position */
-	eb->m_cursor = new_pos;
-	if (eb->m_cursor < 0)
-		eb->m_cursor = 0;
-	else if (eb->m_cursor > len)
-		eb->m_cursor = len;
+	int old_cursor = eb->m_cursor;
+	str_skip_positions(eb->m_text, &eb->m_cursor_byte, &eb->m_cursor,
+			new_pos - eb->m_cursor);
 
 	/* Handle scrolling */
-	while (eb->m_cursor < eb->m_scrolled + 1)
-		eb->m_scrolled -= 5;
-	while (eb->m_cursor >= eb->m_scrolled + eb->m_width)
-		eb->m_scrolled ++;
-	if (eb->m_scrolled < 0)
-		eb->m_scrolled = 0;
-	else if (eb->m_scrolled >= EDITBOX_LEN(eb))
-		eb->m_scrolled = EDITBOX_LEN(eb) - 1;
+	int new_scroll = eb->m_scrolled;
+	while (eb->m_cursor < new_scroll + 1)
+		new_scroll -= 5;
+	while (eb->m_cursor >= new_scroll + eb->m_width)
+		new_scroll++;
+	str_skip_positions(eb->m_text, &eb->m_scrolled_byte, &eb->m_scrolled,
+			new_scroll - eb->m_scrolled);
+
+	return (eb->m_cursor != old_cursor);
 } /* End of 'editbox_move' function */
 
 /* 'display' message handler */
@@ -195,7 +202,7 @@
 		wnd_apply_style(wnd, "gray-style");
 	else
 		wnd_apply_default_style(wnd);
-	wnd_printf(wnd, 0, 0, "%s", STR_TO_CPTR(eb->m_text) + eb->m_scrolled);
+	wnd_printf(wnd, 0, 0, "%s", STR_TO_CPTR(eb->m_text) + eb->m_scrolled_byte);
 
 	/* Move cursor */
 	wnd_move(wnd, 0, eb->m_cursor - eb->m_scrolled, 0);
@@ -229,7 +236,7 @@
 	{
 		if (eb->m_editable)
 		{
-			editbox_delch(eb, eb->m_cursor - 1);
+			editbox_delch(eb, TRUE);
 			wnd_msg_send(WND_OBJ(eb), "changed", editbox_changed_new());
 		}
 	}
@@ -238,7 +245,7 @@
 	{
 		if (eb->m_editable)
 		{
-			editbox_delch(eb, eb->m_cursor);
+			editbox_delch(eb, FALSE);
 			wnd_msg_send(WND_OBJ(eb), "changed", editbox_changed_new());
 		}
 	}
@@ -248,7 +255,7 @@
 		if (eb->m_editable)
 		{
 			while (eb->m_cursor != 0)
-				editbox_delch(eb, eb->m_cursor - 1);
+				editbox_delch(eb, TRUE);
 			wnd_msg_send(WND_OBJ(eb), "changed", editbox_changed_new());
 		}
 	}
@@ -257,11 +264,8 @@
 	{
 		if (eb->m_editable)
 		{
-			int count = EDITBOX_LEN(eb) - eb->m_cursor;
-			int was_cursor = eb->m_cursor;
-			for ( ; count > 0; count -- )
-				editbox_delch(eb, was_cursor);
-			editbox_move(eb, was_cursor);
+			while (STR_TO_CPTR(eb->m_text)eb->m_cursor_byte)
+				editbox_delch(eb, FALSE);
 			wnd_msg_send(WND_OBJ(eb), "changed", editbox_changed_new());
 		}
 	}
@@ -284,30 +288,47 @@
 	/* Move cursor one word left */
 	else if (!strcasecmp(action, "word_left"))
 	{
-		int cursor = eb->m_cursor - 1;
-		char *text = EDITBOX_TEXT(eb);
-		while (cursor >= 0 && !isalnum(textcursor))
-			cursor --;
-		while (cursor >= 0 && isalnum(textcursor))
-			cursor --;
-		cursor ++;
-		editbox_move(eb, cursor);
+		bool_t moved = editbox_move(eb, eb->m_cursor - 1);
+		while (moved)
+		{
+			wchar_t c = str_wchar_at(eb->m_text, eb->m_cursor_byte, NULL);
+			if (!iswalnum(c))
+				moved = editbox_move(eb, eb->m_cursor - 1);
+			else break;
+		}
+		while (moved)
+		{
+			wchar_t c = str_wchar_at(eb->m_text, eb->m_cursor_byte, NULL);
+			if (iswalnum(c))
+				moved = editbox_move(eb, eb->m_cursor - 1);
+			else break;
+		}
+		if (moved)
+			editbox_move(eb, eb->m_cursor + 1);
 	}
 	/* Move cursor one word right */
 	else if (!strcasecmp(action, "word_right"))
 	{
-		int cursor = eb->m_cursor + 1, len = EDITBOX_LEN(eb);
-		char *text = EDITBOX_TEXT(eb);
-		while (cursor <= len && !isalnum(textcursor))
-			cursor ++;
-		while (cursor <= len && isalnum(textcursor))
-			cursor ++;
-		editbox_move(eb, cursor);
+		bool_t moved = TRUE;
+		while (moved)
+		{
+			wchar_t c = str_wchar_at(eb->m_text, eb->m_cursor_byte, NULL);
+			if (!iswalnum(c))
+				moved = editbox_move(eb, eb->m_cursor + 1);
+			else break;
+		}
+		while (moved)
+		{
+			wchar_t c = str_wchar_at(eb->m_text, eb->m_cursor_byte, NULL);
+			if (iswalnum(c))
+				moved = editbox_move(eb, eb->m_cursor + 1);
+			else break;
+		}
 	}
 	/* Move cursor to text end */
 	else if (!strcasecmp(action, "move_to_end"))
 	{
-		editbox_move(eb, EDITBOX_LEN(eb));
+		editbox_move(eb, str_width(eb->m_text));
 	}
 	/* History stuff */
 	else if (!strcasecmp(action, "history_prev"))
@@ -432,7 +453,7 @@
 		else if (!up)
 			editbox_set_text(eb, STR_TO_CPTR(eb->m_text_before_hist));
 		eb->m_modified = FALSE;
-		editbox_move(eb, EDITBOX_LEN(eb));
+		editbox_move(eb, str_width(eb->m_text));
 	}
 } /* End of 'editbox_hist_move' function */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_editbox.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_editbox.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Interface for edit box functions.
- * $Id: wnd_editbox.h 229 2005-02-21 18:36:59Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -53,9 +53,11 @@
 
 	/* Cursor position */
 	int m_cursor;
+	int m_cursor_byte;
 
 	/* Scroll value */
 	int m_scrolled;
+	int m_scrolled_byte;
 
 	/* The desired width */
 	int m_width;
@@ -83,8 +85,9 @@
 #define EDITBOX_OBJ(wnd)	((editbox_t *)wnd)
 
 /* Access edit box data */
-#define EDITBOX_TEXT(wnd)	(STR_TO_CPTR(EDITBOX_OBJ(wnd)->m_text))
-#define EDITBOX_LEN(wnd)	(STR_LEN(EDITBOX_OBJ(wnd)->m_text))
+#define EDITBOX_TEXT(wnd)	    (STR_TO_CPTR(EDITBOX_OBJ(wnd)->m_text))
+#define EDITBOX_BYTE_LEN(wnd)	(STR_BYTE_LEN(EDITBOX_OBJ(wnd)->m_text))
+#define EDITBOX_EMPTY(wnd)	    (*EDITBOX_TEXT(wnd) == 0)
 
 /* Create a new edit box */
 editbox_t *editbox_new( wnd_t *parent, char *id, char *text, char letter,
@@ -105,16 +108,16 @@
 void editbox_get_desired_size( dlgitem_t *di, int *width, int *height );
 
 /* Set edit box text */
-void editbox_set_text( editbox_t *eb, char *text );
+void editbox_set_text( editbox_t *eb, const char *text );
 
 /* Add character into the current cursor position */
 void editbox_addch( editbox_t *eb, char ch );
 
 /* Delete character from the current or previous cursor position */
-void editbox_delch( editbox_t *eb, int pos );
+void editbox_delch( editbox_t *eb, bool_t before_cursor );
 
 /* Move cursor */
-void editbox_move( editbox_t *eb, int new_pos );
+bool_t editbox_move( editbox_t *eb, int new_pos );
 
 /* 'display' message handler */
 wnd_msg_retcode_t editbox_on_display( wnd_t *wnd );

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_filebox.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_filebox.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. File box functions implementation.
- * $Id: wnd_filebox.c 263 2007-09-21 19:41:23Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -21,11 +21,13 @@
  */
 
 #include <sys/types.h>
+#include <dirent.h>
 #include <fnmatch.h>
 #include <stdio.h>
 #include <stdlib.h>
-#define __USE_GNU
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 #include "types.h"
 #include "mystring.h"
@@ -33,103 +35,125 @@
 #include "wnd_editbox.h"
 #include "wnd_filebox.h"
 #include "wnd_hbox.h"
+#include "wnd_label.h"
+#include "util.h"
 
-/* Create a new file box */
-filebox_t *filebox_new( wnd_t *parent, char *id, char *text, char letter,
-		int width )
+/* Free names list */
+static void filebox_free_names( filebox_t *fb )
 {
-	filebox_t *fb;
-
-	/* Allocate memory */
-	fb = (filebox_t *)malloc(sizeof(*fb));
-	if (fb == NULL)
-		return NULL;
-	memset(fb, 0, sizeof(*fb));
-	WND_OBJ(fb)->m_class = filebox_class_init(WND_GLOBAL(parent));
+	struct filebox_name_t *item, *next;
 
-	/* Initialize file box */
-	if (!filebox_construct(fb, parent, id, text, letter, width))
+	assert(fb);
+	fb->m_names_valid = FALSE;
+	if (fb->m_names == NULL)
+		return;
+	for ( item = fb->m_names;; )
 	{
-		free(fb);
-		return NULL;
+		next = item->m_next;
+		free(item->m_name);
+		free(item);
+		item = next;
+		if (item == fb->m_names)
+			break;
 	}
-	WND_FLAGS(fb) |= WND_FLAG_INITIALIZED;
-	return fb;
-} /* End of 'filebox_new' function */
+	fb->m_names = NULL;
+} /* End of 'filebox_free_names' function */
 
-/* File box constructor */
-bool_t filebox_construct( filebox_t *fb, wnd_t *parent, char *id, char *text, 
-		char letter, int width )
+/* Handler for glob */
+static void filebox_scandir( filebox_t *fb, char *dirname )
 {
-	wnd_t *wnd = WND_OBJ(fb);
-
-	/* Initialize edit box part */
-	if (!editbox_construct(EDITBOX_OBJ(fb), parent, id, text, letter, width))
-		return FALSE;
-
-	/* Set message map */
-	wnd_msg_add_handler(wnd, "action", filebox_on_action);
-	wnd_msg_add_handler(wnd, "destructor", filebox_destructor);
-	return TRUE;
-} /* End of 'filebox_construct' function */
+	/* Expand tilde */
+	char *real_name = dirname;
+	if (dirname0 == '~' && (dirname1 == 0 || dirname1 == '/'))
+	{
+		char *home = getenv("HOME");
+		if (home)
+			real_name = util_strcat(home, dirname + 1, NULL);
+	}
 
-/* Create an edit box with label */
-filebox_t *filebox_new_with_label( wnd_t *parent, char *title, char *id,
-		char *text, char letter, int width )
-{
-	hbox_t *hbox;
-	hbox = hbox_new(parent, NULL, 0);
-	label_new(WND_OBJ(hbox), title, "", 0);
-	return filebox_new(WND_OBJ(hbox), id, text, letter - mbslen(title), width);
-} /* End of 'filebox_new_with_label' function */
+	struct dirent **namelist;
+	int n = scandir(real_name, &namelist, NULL, alphasort);
+	if (n < 0)
+		goto finally;
 
-/* Destructor */
-void filebox_destructor( wnd_t *wnd )
-{
-	filebox_free_names(FILEBOX_OBJ(wnd));
-} /* End of 'filebox_destructor' function */
+	for ( int i = 0; i < n; ++i )
+	{
+		char *name = namelisti->d_name;
+
+		struct stat st;
+		char *fullname = util_strcat(real_name, "/", name, NULL);
+		int st_ret = stat(fullname, &st);
+		free(fullname);
+		if (st_ret)
+			goto next;
+
+		/* Filter file */
+		if (name0 == '.' ||
+				strncmp(STR_TO_CPTR(fb->m_pattern), name, STR_BYTE_LEN(fb->m_pattern)))
+			goto next;
+		if (fb->m_command_box && !fb->m_not_first)
+		{
+			if (!(st.st_mode & S_IXUSR))
+				goto next;
+		}
+		if ((fb->m_flags & FILEBOX_ONLY_DIRS) && !S_ISDIR(st.st_mode))
+			goto next;
 
-/* 'action' message handler */
-wnd_msg_retcode_t filebox_on_action( wnd_t *wnd, char *action )
-{
-	filebox_t *fb = FILEBOX_OBJ(wnd);
+		/* Escape when in command mode */
+		bool_t escape = FALSE;
+		size_t sz = strlen(name) + 2;
+		if (fb->m_command_box)
+		{
+			escape = TRUE;
+			sz *= 2;
+		}
 
-	/* Do completion */
-	if (!strcasecmp(action, "complete"))
-	{
-		/* Free if something has changed */
-		if (EDITBOX_OBJ(wnd)->m_state_changed)
+		/* Create names list item */
+		struct filebox_name_t *item = (struct filebox_name_t *)malloc(sizeof(*item));
+		item->m_name = (char *)malloc(sz);
+		if (escape)
+			util_escape_fname(item->m_name, name);
+		else
+			strcpy(item->m_name, name);
+		if (S_ISDIR(st.st_mode))
+			strcat(item->m_name, "/");
+
+		/* It's the first name */
+		if (fb->m_names == NULL)
 		{
-			filebox_free_names(fb);
+			item->m_next = item;
+			item->m_prev = item;
+			fb->m_names = item;
+		}
+		else
+		{
+			item->m_next = fb->m_names;
+			item->m_prev = fb->m_names->m_prev;
+			fb->m_names->m_prev->m_next = item;
+			fb->m_names->m_prev = item;
 		}
 
-		/* Insert next name */
-		filebox_insert_next(fb);
-		wnd_msg_send(wnd, "changed", editbox_changed_new());
-		wnd_invalidate(wnd);
+	next:
+		free(namelisti);
 	}
-	return WND_MSG_RETCODE_OK;
-} /* End of 'filebox_on_action' function */
+	free(namelist);
+
+finally:
+	if (real_name != dirname)
+		free(real_name);
+} /* End of 'filebox_scandir' function */
 
 /* Load names list */
-void filebox_load_names( filebox_t *fb )
+static void filebox_load_names( filebox_t *fb )
 {
 	str_t *text = EDITBOX_OBJ(fb)->m_text, *dirname = NULL;
-	int cursor = EDITBOX_OBJ(fb)->m_cursor;
+	int cursor = EDITBOX_OBJ(fb)->m_cursor_byte;
 	int i;
 	int field_begin = 0;
 	bool_t not_first = FALSE;
 	bool_t use_global = FALSE;
-	vfs_glob_flags_t glob_flags;
 	assert(fb);
 
-	/* Set glob flags */
-	glob_flags = VFS_GLOB_AT_LEVEL_ONLY | VFS_GLOB_RETURN_DIRS;
-	if (fb->m_flags & FILEBOX_NOPATTERN) 
-		glob_flags |= VFS_GLOB_NOPATTERN;
-	else
-		glob_flags |= VFS_GLOB_OUTPUT_ESCAPED;
-
 	/* In case of command box mode multiple fields are allowed */
 	if (fb->m_command_box)
 	{
@@ -149,7 +173,6 @@
 		}
 		ch = STR_AT(text, field_begin);
 		use_global = (!not_first && !(ch == '.' || ch == '/' || ch == '~'));
-		glob_flags |= VFS_GLOB_SPACE_IS_SPECIAL;
 	}
 
 	/* Get directory name */
@@ -172,8 +195,7 @@
 	fb->m_use_global = use_global;
 	if (!use_global)
 	{
-		vfs_glob(fb->m_vfs, STR_TO_CPTR(dirname), filebox_glob_handler, fb,
-				1, glob_flags);
+		filebox_scandir(fb, STR_TO_CPTR(dirname));
 	}
 	/* List global executables */
 	else
@@ -184,7 +206,7 @@
 			char *s = strchr(path, ':');
 			if (s != NULL)
 				(*s) = 0;
-			vfs_glob(fb->m_vfs, path, filebox_glob_handler, fb, 1, glob_flags);
+			filebox_scandir(fb, path);
 			if (s != NULL)
 			{
 				(*s) = ':';
@@ -203,7 +225,7 @@
 } /* End of 'filebox_load_names' function */
 
 /* Insert next entry in the file names */
-void filebox_insert_next( filebox_t *fb )
+static void filebox_insert_next( filebox_t *fb )
 {
 	assert(fb);
 
@@ -223,9 +245,8 @@
 		editbox_t *eb = EDITBOX_OBJ(fb);
 
 		/* Delete current insertion first */
-		cursor = eb->m_cursor;
-		for ( i = fb->m_insert_start; i < cursor; i ++ )
-			editbox_delch(eb, fb->m_insert_start);
+		while (eb->m_cursor_byte != fb->m_insert_start)
+			editbox_delch(eb, TRUE);
 
 		/* Insert this name */
 		for ( ch = fb->m_names->m_name; (*ch) != 0; ch ++ )
@@ -235,81 +256,95 @@
 	}
 } /* End of 'filebox_insert_next' function */
 
-/* Free names list */
-void filebox_free_names( filebox_t *fb )
+/* 'action' message handler */
+static wnd_msg_retcode_t filebox_on_action( wnd_t *wnd, char *action )
 {
-	struct filebox_name_t *item, *next;
+	filebox_t *fb = FILEBOX_OBJ(wnd);
 
-	assert(fb);
-	fb->m_names_valid = FALSE;
-	if (fb->m_names == NULL)
-		return;
-	for ( item = fb->m_names;; )
+	/* Do completion */
+	if (!strcasecmp(action, "complete"))
 	{
-		next = item->m_next;
-		free(item->m_name);
-		free(item);
-		item = next;
-		if (item == fb->m_names)
-			break;
+		/* Free if something has changed */
+		if (EDITBOX_OBJ(wnd)->m_state_changed)
+		{
+			filebox_free_names(fb);
+		}
+
+		/* Insert next name */
+		filebox_insert_next(fb);
+		wnd_msg_send(wnd, "changed", editbox_changed_new());
+		wnd_invalidate(wnd);
 	}
-	fb->m_names = NULL;
-} /* End of 'filebox_free_names' function */
+	return WND_MSG_RETCODE_OK;
+} /* End of 'filebox_on_action' function */
 
-/* Handler for glob */
-void filebox_glob_handler( vfs_file_t *file, void *data )
+/* Destructor */
+static void filebox_destructor( wnd_t *wnd )
 {
-	struct filebox_name_t *item;
-	filebox_t *fb = (filebox_t *)data;
+	filebox_free_names(FILEBOX_OBJ(wnd));
+} /* End of 'filebox_destructor' function */
 
-	/* Filter file */
-	if (file->m_short_name0 == '.' ||
-			strncmp(STR_TO_CPTR(fb->m_pattern), file->m_short_name, 
-				STR_LEN(fb->m_pattern)))
-		return;
-	if (fb->m_command_box && !fb->m_not_first)
-	{
-		if (!(file->m_stat.st_mode & S_IXUSR))
-			return;
-	}
-	if ((fb->m_flags & FILEBOX_ONLY_DIRS) && !S_ISDIR(file->m_stat.st_mode))
-		return;
+/* File box constructor */
+bool_t filebox_construct( filebox_t *fb, wnd_t *parent, char *id, char *text, 
+		char letter, int width )
+{
+	wnd_t *wnd = WND_OBJ(fb);
 
-	/* Create names list item */
-	item = (struct filebox_name_t *)malloc(sizeof(*item));
-	item->m_name = (char *)malloc(strlen(file->m_short_name) + 2);
-	strcpy(item->m_name, file->m_short_name);
-	if (S_ISDIR(file->m_stat.st_mode))
-		strcat(item->m_name, "/");
+	/* Initialize edit box part */
+	if (!editbox_construct(EDITBOX_OBJ(fb), parent, id, text, letter, width))
+		return FALSE;
 
-	/* It's the first name */
-	if (fb->m_names == NULL)
-	{
-		item->m_next = item;
-		item->m_prev = item;
-		fb->m_names = item;
-	}
-	else
-	{
-		item->m_next = fb->m_names;
-		item->m_prev = fb->m_names->m_prev;
-		fb->m_names->m_prev->m_next = item;
-		fb->m_names->m_prev = item;
-	}
-} /* End of 'filebox_glob_handler' function */
+	/* Set message map */
+	wnd_msg_add_handler(wnd, "action", filebox_on_action);
+	wnd_msg_add_handler(wnd, "destructor", filebox_destructor);
+	return TRUE;
+} /* End of 'filebox_construct' function */
+
+/* Set file box class default styles */
+static void filebox_class_set_default_styles( cfg_node_t *list )
+{
+	cfg_set_var(list, "kbind.complete", "<Tab>");
+} /* End of 'filebox_class_set_default_styles' function */
 
 /* Initialize file box class */
-wnd_class_t *filebox_class_init( wnd_global_data_t *global )
+static wnd_class_t *filebox_class_init( wnd_global_data_t *global )
 {
 	return wnd_class_new(global, "filebox", editbox_class_init(global), NULL,
 			NULL, filebox_class_set_default_styles);
 } /* End of 'filebox_class_init' function */
 
-/* Set file box class default styles */
-void filebox_class_set_default_styles( cfg_node_t *list )
+/* Create a new file box */
+filebox_t *filebox_new( wnd_t *parent, char *id, char *text, char letter,
+		int width )
 {
-	cfg_set_var(list, "kbind.complete", "<Tab>");
-} /* End of 'filebox_class_set_default_styles' function */
+	filebox_t *fb;
+
+	/* Allocate memory */
+	fb = (filebox_t *)malloc(sizeof(*fb));
+	if (fb == NULL)
+		return NULL;
+	memset(fb, 0, sizeof(*fb));
+	WND_OBJ(fb)->m_class = filebox_class_init(WND_GLOBAL(parent));
+
+	/* Initialize file box */
+	if (!filebox_construct(fb, parent, id, text, letter, width))
+	{
+		free(fb);
+		return NULL;
+	}
+	WND_FLAGS(fb) |= WND_FLAG_INITIALIZED;
+	return fb;
+} /* End of 'filebox_new' function */
+
+/* Create an edit box with label */
+filebox_t *filebox_new_with_label( wnd_t *parent, char *title, char *id,
+		char *text, char letter, int width )
+{
+	hbox_t *hbox;
+	hbox = hbox_new(parent, NULL, 0);
+	label_new(WND_OBJ(hbox), title, "", 0);
+	return filebox_new(WND_OBJ(hbox), id, text, letter, width - utf8_width(title));
+} /* End of 'filebox_new_with_label' function */
 
 /* End of 'filebox.c' file */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_filebox.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_filebox.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Interface for file box functions.
- * $Id: wnd_filebox.h 229 2005-02-21 18:36:59Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -24,7 +24,6 @@
 #define __SG_MPFC_WND_FILEBOX_H__
 
 #include "types.h"
-#include "vfs.h"
 #include "wnd.h"
 #include "wnd_editbox.h"
 
@@ -32,7 +31,6 @@
 typedef enum
 {
 	FILEBOX_ONLY_DIRS = 1 << 0,
-	FILEBOX_NOPATTERN = 1 << 1,
 } filebox_flags_t;
 
 /* File box type */
@@ -55,9 +53,6 @@
 	/* Start of the text that we are inserting */
 	int m_insert_start;
 
-	/* Virtual file system data (used for auto-completion) */
-	vfs_t *m_vfs;
-
 	/* Names building temporary values */
 	str_t *m_pattern;
 	bool_t m_use_global, m_not_first;
@@ -81,34 +76,6 @@
 filebox_t *filebox_new_with_label( wnd_t *parent, char *title, char *id,
 		char *text, char letter, int width );
 
-/* Destructor */
-void filebox_destructor( wnd_t *wnd );
-
-/* 'action' message handler */
-wnd_msg_retcode_t filebox_on_action( wnd_t *wnd, char *action );
-
-/* Load names list */
-void filebox_load_names( filebox_t *fb );
-
-/* Insert next entry in the file names */
-void filebox_insert_next( filebox_t *fb );
-
-/* Free names list */
-void filebox_free_names( filebox_t *fb );
-
-/* Handler for glob */
-void filebox_glob_handler( vfs_file_t *file, void *data );
-
-/* 
- * Class functions
- */
-
-/* Initialize file box class */
-wnd_class_t *filebox_class_init( wnd_global_data_t *global );
-
-/* Set file box class default styles */
-void filebox_class_set_default_styles( cfg_node_t *list );
-
 #endif
 
 /* End of 'filebox.h' file */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_hbox.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_hbox.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_hbox.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_hbox.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_kbd.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_kbd.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Keyboard functions implementation.
- * $Id: wnd_kbd.c 262 2006-06-06 10:08:04Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -27,7 +27,6 @@
 #include <sys/time.h>
 #include <stdlib.h>
 #include <string.h>
-#include <term.h>
 #include "types.h"
 #include "wnd.h"
 #include "wnd_kbd.h"
@@ -43,9 +42,6 @@
 	data->m_wnd_root = wnd_root;
 	data->m_global = WND_GLOBAL(data->m_wnd_root);
 
-	/* Initialize escape sequences list */
-	wnd_kbd_init_seq(data);
-	
 	/* Start thread */
 	if (pthread_create(&data->m_tid, NULL, wnd_kbd_thread, data))
 	{
@@ -55,217 +51,9 @@
 	return data;
 } /* End of 'wnd_kbd_init' function */
 
-/* Initialize the escape sequences list */
-void wnd_kbd_init_seq( wnd_kbd_data_t *data )
-{
-	int i;
-	cfg_list_t *list = WND_ROOT_CFG(data->m_wnd_root);
-	char *kb_val;
-
-	/* Initialize sequences */
-	data->m_seq = NULL;
-	data->m_last_seq = NULL;
-
-	/* Add sequences */
-	for ( i = 0; i <= 0xFF; i ++ )
-	{
-		char str3 = {'\033', (char)i, 0};
-		wnd_kbd_add_seq(data, str, WND_KEY_WITH_ALT(i));
-	}
-	kb_val = wnd_kbd_ti_val(list, "kb");
-	wnd_kbd_add_seq(data, kb_val, KEY_BACKSPACE);
-	if (kb_val == NULL || !(kb_val0 == '\x7F' && kb_val1 == '\0'))
-		wnd_kbd_add_seq(data, "\x7F", KEY_BACKSPACE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "K1"), KEY_A1);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "K3"), KEY_A3);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "K2"), KEY_B2);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "@1"), KEY_BEG);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kB"), KEY_BTAB);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "K4"), KEY_C1);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "K5"), KEY_C3);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "@2"), KEY_CANCEL);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "ka"), KEY_CATAB);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kC"), KEY_CLEAR);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "@3"), KEY_CLOSE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "@4"), KEY_COMMAND);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "@5"), KEY_COPY);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "@6"), KEY_CREATE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kt"), KEY_CTAB);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kD"), KEY_DC);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kL"), KEY_DL);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kd"), KEY_DOWN);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kM"), KEY_EIC);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "@7"), KEY_END);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "@8"), KEY_ENTER);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kE"), KEY_EOL);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kS"), KEY_EOS);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "@9"), KEY_EXIT);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "k0"), KEY_F0);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "k1"), KEY_F(1));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "k;"), KEY_F(10));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "F1"), KEY_F(11));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "F2"), KEY_F(12));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "F3"), KEY_F(13));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "F4"), KEY_F(14));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "F5"), KEY_F(15));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "F6"), KEY_F(16));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "F7"), KEY_F(17));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "F8"), KEY_F(18));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "F9"), KEY_F(19));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "k2"), KEY_F(2));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FA"), KEY_F(20));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FB"), KEY_F(21));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FC"), KEY_F(22));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FD"), KEY_F(23));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FE"), KEY_F(24));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FF"), KEY_F(25));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FG"), KEY_F(26));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FH"), KEY_F(27));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FI"), KEY_F(28));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FJ"), KEY_F(29));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "k3"), KEY_F(3));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FK"), KEY_F(30));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FL"), KEY_F(31));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FM"), KEY_F(32));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FN"), KEY_F(33));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FO"), KEY_F(34));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FP"), KEY_F(35));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FQ"), KEY_F(36));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FR"), KEY_F(37));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FS"), KEY_F(38));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FT"), KEY_F(39));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "k4"), KEY_F(4));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FU"), KEY_F(40));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FV"), KEY_F(41));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FW"), KEY_F(42));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FX"), KEY_F(43));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FY"), KEY_F(44));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "FZ"), KEY_F(45));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fa"), KEY_F(46));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fb"), KEY_F(47));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fc"), KEY_F(48));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fd"), KEY_F(49));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "k5"), KEY_F(5));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fe"), KEY_F(50));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Ff"), KEY_F(51));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fg"), KEY_F(52));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fh"), KEY_F(53));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fi"), KEY_F(54));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fj"), KEY_F(55));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fk"), KEY_F(56));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fl"), KEY_F(57));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fm"), KEY_F(58));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fn"), KEY_F(59));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "k6"), KEY_F(6));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fo"), KEY_F(60));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fp"), KEY_F(61));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fq"), KEY_F(62));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "Fr"), KEY_F(63));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "k7"), KEY_F(7));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "k8"), KEY_F(8));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "k9"), KEY_F(9));
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "@0"), KEY_FIND);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%1"), KEY_HELP);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kh"), KEY_HOME);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kI"), KEY_IC);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kA"), KEY_IL);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kl"), KEY_LEFT);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kH"), KEY_LL);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%2"), KEY_MARK);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%3"), KEY_MESSAGE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%4"), KEY_MOVE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%5"), KEY_NEXT);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kN"), KEY_NPAGE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%6"), KEY_OPEN);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%7"), KEY_OPTIONS);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kP"), KEY_PPAGE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%8"), KEY_PREVIOUS);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%9"), KEY_PRINT);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%0"), KEY_REDO);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "&1"), KEY_REFERENCE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "&2"), KEY_REFRESH);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "&3"), KEY_REPLACE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "&4"), KEY_RESTART);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "&5"), KEY_RESUME);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kr"), KEY_RIGHT);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "&6"), KEY_SAVE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "&9"), KEY_SBEG);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "&0"), KEY_SCANCEL);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "*1"), KEY_SCOMMAND);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "*2"), KEY_SCOPY);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "*3"), KEY_SCREATE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "*4"), KEY_SDC);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "*5"), KEY_SDL);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "*6"), KEY_SELECT);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "*7"), KEY_SEND);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "*8"), KEY_SEOL);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "*9"), KEY_SEXIT);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kF"), KEY_SF);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "*0"), KEY_SFIND);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "#1"), KEY_SHELP);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "#2"), KEY_SHOME);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "#3"), KEY_SIC);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "#4"), KEY_SLEFT);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%a"), KEY_SMESSAGE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%b"), KEY_SMOVE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%c"), KEY_SNEXT);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%d"), KEY_SOPTIONS);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%e"), KEY_SPREVIOUS);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%f"), KEY_SPRINT);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kR"), KEY_SR);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%g"), KEY_SREDO);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%h"), KEY_SREPLACE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%i"), KEY_SRIGHT);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "%j"), KEY_SRSUME);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "!1"), KEY_SSAVE);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "!2"), KEY_SSUSPEND);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "kT"), KEY_STAB);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "!3"), KEY_SUNDO);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "&7"), KEY_SUSPEND);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "&8"), KEY_UNDO);
-	wnd_kbd_add_seq(data, wnd_kbd_ti_val(list, "ku"), KEY_UP);
-	wnd_kbd_add_seq(data, /*wnd_kbd_ti_val(list, "kM")*/"\033M", KEY_MOUSE);
-} /* End of 'wnd_kbd_init_seq' function */
-
-/* Add a sequence to the list */
-void wnd_kbd_add_seq( wnd_kbd_data_t *data, char *seq, int code )
-{
-	struct wnd_kbd_seq_t *item;
-
-	/* Sequence is invalid */
-	if (seq == NULL)
-		return;
-
-	/* Create the list item */
-	item = (struct wnd_kbd_seq_t *)malloc(sizeof(*item));
-	item->m_str = strdup(seq);
-	item->m_code = code;
-	item->m_next = NULL;
-
-	/* Add it */
-	if (data->m_seq == NULL)
-		data->m_seq = item;
-	else
-		data->m_last_seq->m_next = item;
-	data->m_last_seq = item;
-} /* End of 'wnd_kbd_add_seq' function */
-
 /* Uninitialize keyboard management system */
 void wnd_kbd_free( wnd_kbd_data_t *data )
 {
-	struct wnd_kbd_seq_t *seq, *next;
-
-	if (data == NULL)
-		return;
-
-	/* Free memory */
-	for ( seq = data->m_seq; seq != NULL; seq = next )
-	{
-		next = seq->m_next;
-		free(seq->m_str);
-		free(seq);
-	}
-	
 	/* Stop keyboard thread */
 	data->m_end_thread = TRUE;
 	pthread_join(data->m_tid, NULL);
@@ -278,8 +66,6 @@
 {
 	wnd_kbd_data_t *data = (wnd_kbd_data_t *)arg;
 	wnd_t *wnd_root = data->m_wnd_root;
-	char buf32;
-	int buf_ptr = 0;
 	wnd_key_t keycode;
 	struct timeval was_tv, now_tv;
 	int was_btn;
@@ -289,66 +75,6 @@
 	gettimeofday(&was_tv, NULL);
 	for ( ; !data->m_end_thread; ) 
 	{
-		/* Extract keycode */
-		if (wnd_kbd_extract_code(data, &keycode, buf, &buf_ptr))
-		{
-			/* Handle mouse events */
-			if (keycode == KEY_MOUSE)
-			{
-				//if (WND_MOUSE_DATA(wnd_root)->m_driver == WND_MOUSE_XTERM)
-				//{
-					int x, y;
-					wnd_mouse_event_t type;
-					wnd_mouse_button_t btn;
-
-					/* Get event parameters */
-					pthread_mutex_lock(&global->m_curses_mutex);
-					btn = getch() - 040;
-					x = getch() - 040 - 1;
-					y = getch() - 040 - 1;
-					pthread_mutex_unlock(&global->m_curses_mutex);
-					type = WND_MOUSE_DOWN;
-					switch (btn)
-					{
-					case 0:
-						btn = WND_MOUSE_LEFT;
-						break;
-					case 1:
-						btn = WND_MOUSE_MIDDLE;
-						break;
-					case 2:
-						btn = WND_MOUSE_RIGHT;
-						break;
-					}
-
-					/* Check for double click */
-					gettimeofday(&now_tv, NULL);
-					if (((now_tv.tv_sec == was_tv.tv_sec && 
-							now_tv.tv_usec - was_tv.tv_usec <= 200000) ||
-							(now_tv.tv_sec == was_tv.tv_sec + 1 &&
-							 now_tv.tv_usec + 1000000 - 
-								 was_tv.tv_usec <= 200000)) && 
-							btn == was_btn)
-						type = WND_MOUSE_DOUBLE;
-					memcpy(&was_tv, &now_tv, sizeof(was_tv));
-					was_btn = btn;
-					
-					/* Handle mouse */
-					wnd_mouse_handle_event(global->m_mouse_data,
-							x, y, btn, type, NULL);
-					continue;
-				//}
-			}
-
-			/* Send message */
-			wnd_t *focus = global->m_focus;
-			if (focus != NULL)
-			{
-				wnd_msg_send(focus, "keydown", wnd_msg_key_new(keycode));
-			}
-		}
-
-		/* Read key into buffer */
 		pthread_mutex_lock(&global->m_curses_mutex);
 		key = getch();
 		pthread_mutex_unlock(&global->m_curses_mutex);
@@ -357,116 +83,74 @@
 			util_wait();
 			continue;
 		}
-		else
-		{
-			bufbuf_ptr ++ = (char)key;
-		}
-	}
-	return NULL;
-} /* End of 'wnd_kbd_thread' function */
-
-/* Extract real key code from the keys buffer */
-bool_t wnd_kbd_extract_code( wnd_kbd_data_t *data, wnd_key_t *code, 
-		char *buf, int *len )
-{
-	int pos, matched_pos = 0;
 
-	/* Buffer is empty */
-	if ((*len) == 0)
-		return FALSE;
+		keycode = key;
 
-	/* Test increasing sequences from the buffer */
-	for ( pos = 1; pos <= (*len); pos ++ )
-	{
-		int num;
-		wnd_key_t ret;
-		num = wnd_kbd_test_seq(data, buf, pos, &ret);
-
-		/* No matches : return the last matched sequence */
-		if (num == 0)
+		/* Handle mouse events */
+		if (keycode == KEY_MOUSE)
 		{
-			wnd_kbd_rem_from_buf(buf, matched_pos, len);
-			return TRUE;
+			//if (WND_MOUSE_DATA(wnd_root)->m_driver == WND_MOUSE_XTERM)
+			//{
+				int x, y;
+				wnd_mouse_event_t type;
+				wnd_mouse_button_t btn;
+
+				/* Get event parameters */
+				pthread_mutex_lock(&global->m_curses_mutex);
+				btn = getch() - 040;
+				x = getch() - 040 - 1;
+				y = getch() - 040 - 1;
+				pthread_mutex_unlock(&global->m_curses_mutex);
+				type = WND_MOUSE_DOWN;
+				switch (btn)
+				{
+				case 0:
+					btn = WND_MOUSE_LEFT;
+					break;
+				case 1:
+					btn = WND_MOUSE_MIDDLE;
+					break;
+				case 2:
+					btn = WND_MOUSE_RIGHT;
+					break;
+				}
+
+				/* Check for double click */
+				gettimeofday(&now_tv, NULL);
+				if (((now_tv.tv_sec == was_tv.tv_sec && 
+						now_tv.tv_usec - was_tv.tv_usec <= 200000) ||
+						(now_tv.tv_sec == was_tv.tv_sec + 1 &&
+						 now_tv.tv_usec + 1000000 - 
+							 was_tv.tv_usec <= 200000)) && 
+						btn == was_btn)
+					type = WND_MOUSE_DOUBLE;
+				memcpy(&was_tv, &now_tv, sizeof(was_tv));
+				was_btn = btn;
+				
+				/* Handle mouse */
+				wnd_mouse_handle_event(global->m_mouse_data,
+						x, y, btn, type, NULL);
+				continue;
+			//}
 		}
-		/* There are matches and one match is exact, so save it */
-		else if (ret != WND_KEY_UNDEF)
-		{
-			(*code) = ret;
-			matched_pos = pos;
 
-			/* Return this match if it is the only match */
-			if (num == 1)
-			{
-				wnd_kbd_rem_from_buf(buf, matched_pos, len);
-				return TRUE;
-			}
+		if (keycode == 27)
+		{
+			pthread_mutex_lock(&global->m_curses_mutex);
+			int n = getch();
+			pthread_mutex_unlock(&global->m_curses_mutex);
+			keycode = (n != ERR) ? WND_KEY_WITH_ALT(n) : KEY_ESCAPE;
 		}
-	}
-	
-	/* Sequence is not complete, so wait for it */
-	return FALSE;
-} /* End of 'wnd_kbd_extract_code' function */
-
-/* Test sequence for matches in the list */
-int wnd_kbd_test_seq( wnd_kbd_data_t *data, char *seq, int len, 
-		wnd_key_t *code )
-{
-	int matches = 0;
-	struct wnd_kbd_seq_t *s;
 
-	assert(len > 0);
-	
-	/* Test escape sequences */
-	(*code) = WND_KEY_UNDEF;
-	for ( s = data->m_seq; s != NULL; s = s->m_next )
-	{
-		int sl = strlen(s->m_str);
-		if (!strncmp(s->m_str, seq, len))
+		/* Send message */
+		wnd_t *focus = global->m_focus;
+		if (focus != NULL)
 		{
-			matches ++;
-			if (sl == len)
-			{
-				(*code) = s->m_code;
-			}
+			wnd_msg_send(focus, "keydown", wnd_msg_key_new(keycode));
 		}
 	}
-	if (matches > 0)
-		return matches;
-
-	/* Test common keys */
-	if ((*seq) != 27)
-	{
-		(*code) = (byte)(*seq);
-		return 1;
-	}
-	return 0;
-} /* End of 'wnd_kbd_test_seq' function */
-
-/* Remove a sequence from the buffer */
-void wnd_kbd_rem_from_buf( char *buf, int pos, int *len )
-{
-	memmove(buf, &bufpos, (*len) - pos);
-	(*len) -= pos;
-} /* End of 'wnd_kbd_rem_from_buf' function */
-
-/* Get terminfo entry value */
-char *wnd_kbd_ti_val( cfg_node_t *list, char *name )
-{
-	char *var_name;
-
-	/* Look up configuration for this entry first */
-	var_name = util_strcat("ti.", name, NULL);
-	if (var_name != NULL)
-	{
-		char *val = cfg_get_var(list, var_name);
-		free(var_name);
-		if (val != NULL)
-			return val;
-	}
-
-	/* Look up terminfo */
-	return tgetstr(name, NULL);
-} /* End of 'wnd_kbd_ti_val' function */
+	return NULL;
+} /* End of 'wnd_kbd_thread' function */
 
 /* End of 'wnd_kbd.c' file */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_kbd.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_kbd.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Interface for keyboard functions.
- * $Id: wnd_kbd.h 229 2005-02-21 18:36:59Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -76,14 +76,6 @@
 	/* Pointer to the root window */
 	wnd_t *m_wnd_root;
 	wnd_global_data_t *m_global;
-
-	/* Known escape sequences list */
-	struct wnd_kbd_seq_t
-	{
-		char *m_str;
-		int m_code;
-		struct wnd_kbd_seq_t *m_next;
-	} *m_seq, *m_last_seq;
 } wnd_kbd_data_t;
 
 /* Key identification type */
@@ -95,32 +87,12 @@
 /* Initialize keyboard management system */
 wnd_kbd_data_t *wnd_kbd_init( wnd_t *wnd_root );
 
-/* Initialize the escape sequences list */
-void wnd_kbd_init_seq( wnd_kbd_data_t *data );
-
-/* Add a sequence to the list */
-void wnd_kbd_add_seq( wnd_kbd_data_t *data, char *seq, int code );
-
-/* Get terminfo entry value */
-char *wnd_kbd_ti_val( cfg_node_t *list, char *name );
-
 /* Uninitialize keyboard management system */
 void wnd_kbd_free( wnd_kbd_data_t *data );
 
 /* Keyboard thread function */
 void *wnd_kbd_thread( void *arg );
 
-/* Extract real key code from the keys buffer */
-bool_t wnd_kbd_extract_code( wnd_kbd_data_t *data, wnd_key_t *key_info, 
-		char *buf, int *len );
-
-/* Test sequence for matches in the list */
-int wnd_kbd_test_seq( wnd_kbd_data_t *data, char *seq, int len, 
-		wnd_key_t *code );
-
-/* Remove a sequence from the buffer */
-void wnd_kbd_rem_from_buf( char *buf, int pos, int *len );
-
 #endif
 
 /* End of 'wnd_kbd.h' file */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_kbind.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_kbind.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_kbind.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_kbind.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_label.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_label.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Label functions implementation.
- * $Id: wnd_label.c 307 2011-03-13 11:58:47Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -27,6 +27,7 @@
 #include "wnd_dialog.h"
 #include "wnd_dlgitem.h"
 #include "wnd_label.h"
+#include "util.h"
 
 /* Create a new label */
 label_t *label_new( wnd_t *parent, char *text, char *id, label_flags_t flags )
@@ -54,6 +55,8 @@
 bool_t label_construct( label_t *l, wnd_t *parent, char *text, char *id,
 		label_flags_t flags )
 {
+	label_text_parse(&l->m_text, text);
+
 	/* Initialize dialog item part */
 	if (!dlgitem_construct(DLGITEM_OBJ(l), parent, text, id, 
 				label_get_desired_size, NULL, 0, DLGITEM_NOTABSTOP))
@@ -69,11 +72,17 @@
 
 	/* Set message map */
 	wnd_msg_add_handler(WND_OBJ(l), "display", label_on_display);
-	l->m_text = WND_OBJ(l)->m_title;
+	wnd_msg_add_handler(WND_OBJ(l), "destructor", label_destructor);
 	l->m_flags = flags;
 	return TRUE;
 } /* End of 'label_construct' function */
 
+/* Destructor */
+void label_destructor( wnd_t *wnd )
+{
+	label_text_free(&LABEL_OBJ(wnd)->m_text);
+} /* End of 'combo_destructor' function */
+
 /* Create a label with another label */
 label_t *label_new_with_label( wnd_t *parent, char *title, char *text,
 		char *id, label_flags_t flags )
@@ -88,40 +97,116 @@
 void label_set_text( label_t *l, char *text )
 {
 	wnd_set_title(WND_OBJ(l), text);
-	l->m_text = text;
+	label_text_free(&l->m_text);
+	label_text_parse(&l->m_text, text);
 	dialog_update_size(DIALOG_OBJ(DLGITEM_OBJ(l)->m_dialog));
 } /* End of 'label_set_text' function */
 
-/* Calculate size desired by this label */
-void label_get_desired_size( dlgitem_t *di, int *width, int *height )
+/* Parse label title */
+void label_text_parse( label_text_t *text, char *str )
 {
-	label_t *l = LABEL_OBJ(di);
-	int i, lines = 0, max_width = 0, w = 0;
+	/* Initialize */
+	text->pre = strdup(str);
+	text->letter = 0;
+	text->post = "";
 
-	for ( i = 0; i <= strlen(l->m_text); i ++ )
+	/* Find the position of letter (marked by '&') and split by it */
+	char *p = strchr(text->pre, '&');
+	if (p)
 	{
-		if (l->m_texti == '&')
-			continue;
-		if (l->m_texti == '\n' || l->m_texti == 0)
+		text->letter = *(p + 1);
+		(*p) = 0;
+
+		if (text->letter)
+			text->post = p + 2;
+	}
+
+	/* Calculate width and height */
+	int max_width = 0;
+	int lines = 0;
+	char *s0 = text->pre;
+	int w = 0;
+	for (char *s = s0;;)
+	{
+		/* Extract a line */
+		char *nl = strchr(s, '\n');
+		if (nl)
+			(*nl) = 0;
+
+		w += utf8_width(s);
+		if (w > max_width)
+			max_width = w;
+
+		if (nl)
 		{
-			lines ++;
-			if (w > max_width)
-				max_width = w;
+			(*nl) = '\n';
+			s = nl + 1;
+			++lines;
 			w = 0;
+			continue;
 		}
-		else
-			w ++;
+
+		/* This string has ended */
+		if (s0 == text->pre)
+		{
+			/* We may have letter+post */
+			if (text->letter)
+			{
+				++w; /* letter */
+				s0 = text->post;
+				s = s0;
+				continue;
+			}
+		}
+
+		/* If we reach here, we finished iterating */
+		++lines;
+		break;
 	}
-	*width = max_width;
-	*height = lines;
+	text->width = max_width;
+	text->height = lines;
+} /* End of 'label_text_parse' function */
+
+/* Free label title struct */
+void label_text_free( label_text_t *text )
+{
+	/* 'pre' points to the original string */
+	if (text->pre)
+		free(text->pre);
+} /* End of 'label_text_free' function */
+
+/* Calculate size desired by this label */
+void label_get_desired_size( dlgitem_t *di, int *width, int *height )
+{
+	label_t *l = LABEL_OBJ(di);
+
+	*width = l->m_text.width;
+	*height = l->m_text.height;
 } /* End of 'label_get_desired_size' function */
 
+/* Display a label-like text */
+void label_text_display( wnd_t *wnd, label_text_t *text )
+{
+	wnd_putstring(wnd, 0, 0, text->pre);
+	if (text->letter)
+	{
+		char *color = wnd_get_style(wnd, "letter-color");
+		wnd_push_state(wnd, WND_STATE_COLOR);
+		if (color != NULL)
+			wnd_set_fg_color(wnd, wnd_string2color(color));
+		wnd_putchar(wnd, 0, text->letter);
+		wnd_pop_state(wnd);
+
+		wnd_putstring(wnd, 0, 0, text->post);
+	}
+} /* End of 'label_text_display' function */
+
 /* 'display' message handler */
 wnd_msg_retcode_t label_on_display( wnd_t *wnd )
 {
 	wnd_move(wnd, 0, 0, 0);
 	wnd_apply_default_style(wnd);
-	dlgitem_display_label_text(wnd, wnd->m_title);
+	label_text_display(wnd, &LABEL_OBJ(wnd)->m_text);
     return WND_MSG_RETCODE_OK;
 } /* End of 'label_on_display' function */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_label.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_label.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Interface for label functions.
- * $Id: wnd_label.h 229 2005-02-21 18:36:59Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -34,6 +34,19 @@
 	LABEL_NOBOLD = 1 << 0,
 } label_flags_t;
 
+/* Parsed label text */
+typedef struct
+{
+	/* Effective text is "pre letter post"
+	 * but 'letter' will be highlighted */
+	char *pre;
+	char letter;
+	char *post;
+
+	int width;
+	int height;
+} label_text_t;
+
 /* Label type */
 typedef struct 
 {
@@ -41,7 +54,7 @@
 	dlgitem_t m_wnd;
 
 	/* Label text */
-	char *m_text;
+	label_text_t m_text;
 
 	/* Label flags */
 	label_flags_t m_flags;
@@ -57,6 +70,18 @@
 bool_t label_construct( label_t *l, wnd_t *parent, char *text, char *id,
 		label_flags_t flags );
 
+/* Destructor */
+void label_destructor( wnd_t *wnd );
+
+/* Parse label title */
+void label_text_parse( label_text_t *text, char *str );
+
+/* Free label title struct */
+void label_text_free( label_text_t *text );
+
+/* Display a label-like text */
+void label_text_display( wnd_t *wnd, label_text_t *text );
+
 /* Create a label with another label */
 label_t *label_new_with_label( wnd_t *parent, char *title, char *text,
 		char *id, label_flags_t flags );
@@ -70,13 +95,6 @@
 /* 'display' message handler */
 wnd_msg_retcode_t label_on_display( wnd_t *wnd );
 
-/* Display label-like text */
-void label_display_text( wnd_t *wnd, char *text, wnd_color_t fg, 
-		wnd_color_t bg, int attr );
-
-/* Get label-like text length */
-int label_text_len( wnd_t *wnd );
-
 /*
  * Class functions
  */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_listbox.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_listbox.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_listbox.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_listbox.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_mouse.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_mouse.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_msg.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_msg.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_msg.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_msg.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_multiview_dialog.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_multiview_dialog.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_multiview_dialog.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_multiview_dialog.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_print.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_print.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Printing functions implementation.
- * $Id: wnd_print.c 272 2009-08-08 12:33:12Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -27,11 +27,10 @@
 #include <stdarg.h>
 #include <string.h>
 #include <wchar.h>
-#include <unicode/ucnv.h>
-#include <unicode/unorm.h>
 #include "types.h"
 #include "wnd.h"
 #include "wnd_print.h"
+#include "util.h"
 
 /* Move cursor to a specified position */
 void wnd_move( wnd_t *wnd, wnd_move_style_t style, int x, int y )
@@ -41,6 +40,10 @@
 	
 	assert(wnd);
 
+	/* Invalidate previous printing position */
+	wnd->m_prev_print_pos = NULL;
+	wnd->m_prev_num_codes = 0;
+
 	/* Calculate new cursor position */
 	if (addressing == WND_MOVE_NORMAL)
 	{
@@ -76,51 +79,71 @@
 } /* End of 'wnd_move' function */
 
 /* Low-level character printing */
-void wnd_putc_impl( wnd_t *wnd, struct wnd_display_buf_symbol_char_t* ch )
+static void wnd_putc_impl( wnd_t *wnd, wchar_t ch )
 {
-	int cx, cy;
-	struct wnd_display_buf_symbol_t *pos;
+	int width = wcwidth(ch);
+	if (width < 0)
+		width = 0;
+
+	/* Obtain position to print to */
+	struct wnd_display_buf_symbol_t *pos = NULL;
+	if (width == 0)
+	{
+		/* This is a combining char: append it to the previous position */
+		pos = wnd->m_prev_print_pos;
+	}
+	else
+	{
+		/* Else invalidate the previous position */
+		wnd->m_prev_print_pos = NULL;
+		wnd->m_prev_num_codes = 0;
+
+		if (!wnd_pos_visible(wnd, wnd->m_cursor_x, wnd->m_cursor_y, &pos))
+			pos = NULL;
+	}
 
 	/* Print character */
-	if (wnd_pos_visible(wnd, wnd->m_cursor_x, wnd->m_cursor_y, &pos))
+	if (pos)
 	{
 		short fg = wnd->m_fg_color, bg = wnd->m_bg_color - 1;
 		if (bg < 0)
 			bg += WND_COLOR_NUMBER;
-		pos->m_attr = wnd->m_attrib | 
+		pos->m_char.attr = wnd->m_attrib | 
 			COLOR_PAIR(fg * WND_COLOR_NUMBER + bg);
-		pos->m_char = *ch;
+
+		if (wnd->m_prev_num_codes < CCHARW_MAX - 1)
+			pos->m_char.charswnd->m_prev_num_codes++ = ch;
+
+		for (int i = 1; i < width; ++i)
+		{
+			(pos + i)->m_char.chars0 = 0;
+		}
+
+		wnd->m_prev_print_pos = pos;
 	}
 
 	/* Advance cursor */
-	wnd->m_cursor_x ++;
+	wnd->m_cursor_x += width;
 } /* End of 'wnd_putc' function */
 
 /* Put a special (ACS_*) symbol */
-void wnd_put_special( wnd_t *wnd, chtype ch )
+void wnd_put_special( wnd_t *wnd, wchar_t ch )
 {
-	struct wnd_display_buf_symbol_char_t c;
-	c.m_normal_tag = FALSE;
-	c.m_special = ch;
-	wnd_putc_impl(wnd, &c);
+	wnd_putc_impl(wnd, ch);
 }
 
 /* Put a normal symbol */
-void wnd_putc( wnd_t *wnd, dword ch )
+void wnd_putc( wnd_t *wnd, wchar_t ch )
 {
-	struct wnd_display_buf_symbol_char_t c;
-
 	/* This function doesn't print not-printable characters */
 	if (ch < 0x20)
 		return;
 
-	c.m_normal_tag = TRUE;
-	c.m_normal = ch;
-	wnd_putc_impl(wnd, &c);
+	wnd_putc_impl(wnd, ch);
 }
 
 /* Put a character */
-void wnd_putchar( wnd_t *wnd, wnd_print_flags_t flags, dword ch )
+void wnd_putchar( wnd_t *wnd, wnd_print_flags_t flags, wchar_t ch )
 {
 	/* Print special character */
 	if (ch < 0x20)
@@ -157,15 +180,6 @@
 void wnd_putstring( wnd_t *wnd, wnd_print_flags_t flags, int right_border,
 		char *str )
 {
-	UChar* converted = NULL;
-	UChar* normalized = NULL;
-	UConverter* cnv = NULL;
-	UErrorCode err = 0;
-	size_t len = 0;
-	size_t conv_len = 0;
-	size_t norm_len = 0;
-	int i;
-
 	assert(wnd);
 	assert(str);
 
@@ -180,59 +194,44 @@
 	else if (right_border <= 0 || right_border >= wnd->m_client_w)
 		right_border = wnd->m_client_w - 1;
 
-	/* Allocate memory for unicode string */
-	len = strlen(str);
-	converted = malloc(sizeof(UChar) * (len + 1));
-	if (!converted)
-	{
-		util_log("Fatal error: memory allocation failed\n");
-		goto cleanup;
-	}
-
-	/* Allocate memory for normalized string */
-	normalized = malloc(sizeof(UChar) * (len + 1));
-	if (!normalized)
-	{
-		util_log("Fatal error: memory allocation failed\n");
-		goto cleanup;
-	}
-
-	/* Create converter */
-	cnv = ucnv_open("UTF-8", &err);
-	if (!cnv)
-	{
-		util_log("Fatal error: utf-8 converter creation failed: %s\n",
-				u_errorName(err));
-		goto cleanup;
-	}
-
-	/* Convert to unicode */
-	conv_len = ucnv_toUChars(cnv, converted, len + 1, str, -1, &err);
-	if (U_FAILURE(err))
-	{
-		util_log("Fatal error: utf-8 converting failed: %s\n",
-				u_errorName(err));
-		goto cleanup;
-	}
-
-	/* Normalize string */
-	norm_len = unorm_normalize(converted, conv_len, UNORM_NFC, 0,
-			normalized, len + 1, &err);
-	if (U_FAILURE(err))
-	{
-		util_log("Fatal error: unicode normalization failed: %s\n",
-				u_errorName(err));
-		goto cleanup;
-	}
+	/* Prepare for conversion to unicode */
+	size_t nbytes = strlen(str);
+	mbstate_t mbstate;
+	memset(&mbstate, 0, sizeof(mbstate));
 
 	/* Print characters */
-	for ( i = 0; i < norm_len; i ++ )
+	bool_t skip_to_eol = FALSE;
+	while (nbytes > 0)
 	{
+		/* Convert to unicode */
 		wchar_t ch;
+		size_t n = mbrtowc(&ch, str, nbytes, &mbstate);
+		if (n >= (size_t)(-2))
+		{
+			ch = '?';
+			n = 1;
+		}
+
+		/* Should not happen if locale is correct */
+		if (n == 0)
+			break;
 
-		ch = normalizedi;
+		/* Advance the input string */
+		str += n;
+		nbytes -= n;
 
-		/* In case of new line - clear the rest of the current */
+		/* In the skip-to-end-of-line mode */
+		if (skip_to_eol)
+		{
+			if (ch == '\n')
+			{
+				wnd_putchar(wnd, flags, ch);
+				skip_to_eol = FALSE;
+				continue;
+			}
+		}
+
+		/* In case of new line - clear the rest of the current one */
 		if (ch == '\n')
 		{
 			while (wnd->m_cursor_x <= right_border)
@@ -242,7 +241,10 @@
 		}
 		
 		/* Border is OK, so simply print this char */
-		if (wnd->m_cursor_x <= right_border)
+		int cw = wcwidth(ch);
+		if (cw < 0)
+			cw = 0;
+		if (wnd->m_cursor_x + cw - 1 <= right_border)
 		{
 			wnd_putchar(wnd, flags, ch);
 
@@ -255,7 +257,7 @@
 		}
 
 		/* If the very next char is new line, that's OK */
-		if (normalizedi + 1 == '\n')
+		if ((*str) == '\n')
 			continue;
 
 		/* Put ellipses */
@@ -268,32 +270,8 @@
 			wnd_putchar(wnd, flags, '.');
 		}
 
-		/* Skip to the end of this line */
-		bool_t finished = FALSE;
-		for ( ;; i ++ )
-		{
-			if (i == norm_len - 1)
-			{
-				finished = TRUE;
-				break;
-			}
-
-			ch = normalizedi;
-			if ('\n' == ch)
-				break;
-		}
-		if (finished)
-			break;
-		else
-			wnd_putchar(wnd, flags, ch);
+		skip_to_eol = TRUE;
 	}
-cleanup:
-	if (converted)
-		free(converted);
-	if (normalized)
-		free(normalized);
-	if (cnv)
-		ucnv_close(cnv);
 } /* End of 'wnd_putstring' function */
 
 /* Print a formatted string */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_print.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_print.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Interface for printing functions.
- * $Id: wnd_print.h 270 2008-11-23 12:50:11Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -100,13 +100,13 @@
 void wnd_move( struct tag_wnd_t *wnd, wnd_move_style_t style, int x, int y );
 
 /* Low-level character printing */
-void wnd_putc( struct tag_wnd_t *wnd, dword ch );
+void wnd_putc( struct tag_wnd_t *wnd, wchar_t ch );
 
 /* Low-level special (ACS_*) character printing */
-void wnd_put_special( struct tag_wnd_t *wnd, chtype ch );
+void wnd_put_special( struct tag_wnd_t *wnd, wchar_t ch );
 
 /* Put a character */
-void wnd_putchar( struct tag_wnd_t *wnd, wnd_print_flags_t flags, dword ch );
+void wnd_putchar( struct tag_wnd_t *wnd, wnd_print_flags_t flags, wchar_t ch );
 
 /* Print a string */
 void wnd_putstring( struct tag_wnd_t *wnd, wnd_print_flags_t flags,

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_radio.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_radio.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Window Library. Radio button functions implementation.
- * $Id: wnd_radio.c 307 2011-03-13 11:58:47Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -50,10 +50,18 @@
 	return r;
 } /* End of 'radio_new' function */
 
+/* Destructor */
+static void radio_destructor( wnd_t *wnd )
+{
+	label_text_free(&RADIO_OBJ(wnd)->m_text);
+} /* End of 'radio_destructor' function */
+
 /* Radio button constructor */
 bool_t radio_construct( radio_t *r, wnd_t *parent, char *title, char *id, 
 		char letter, bool_t checked )
 {
+	label_text_parse(&r->m_text, title);
+
 	/* Initialize dialog item part */
 	if (!dlgitem_construct(DLGITEM_OBJ(r), parent, title, id, 
 				radio_get_desired_size, NULL, letter, 0))
@@ -65,6 +73,7 @@
 	wnd_msg_add_handler(WND_OBJ(r), "mouse_ldown", radio_on_mouse);
 	wnd_msg_add_handler(WND_OBJ(r), "quick_change_focus", 
 			radio_on_quick_change_focus);
+	wnd_msg_add_handler(WND_OBJ(r), "destructor", radio_destructor);
 
 	/* Set fields */
 	r->m_checked = checked;
@@ -103,7 +112,7 @@
 	wnd_apply_style(wnd, WND_FOCUS(wnd) == wnd ? "focus-label-style" :
 			"label-style");
 	wnd_putchar(wnd, 0, ' ');
-	dlgitem_display_label_text(wnd, wnd->m_title);
+	label_text_display(wnd, &RADIO_OBJ(wnd)->m_text);
 	wnd_move(wnd, 0, 1, 0);
     return WND_MSG_RETCODE_OK;
 } /* End of 'radio_on_display' function */
@@ -142,7 +151,7 @@
 /* Get size desired by check box */
 void radio_get_desired_size( dlgitem_t *di, int *width, int *height )
 {
-	*width = dlgitem_label_text_len(WND_OBJ(di), WND_OBJ(di)->m_title) + 5;
+	*width = RADIO_OBJ(di)->m_text.width + 5;
 	*height = 1;
 } /* End of 'radio_get_desired_size' function */

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_radio.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_radio.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_repval.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_repval.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_root.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_root.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_root.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_root.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_scrollable.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_scrollable.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_scrollable.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_scrollable.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_types.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_types.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_vbox.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_vbox.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_vbox.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_vbox.h Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_views.c -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_views.c Changed

mpfc-1.3.8.1.tar.bz2/libmpfcwnd/wnd_views.h -> mpfc-2.0.tar.bz2/libmpfcwnd/wnd_views.h Changed

mpfc-1.3.8.1.tar.bz2/ltmain.sh -> mpfc-2.0.tar.bz2/ltmain.sh Changed

@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
+#         $progname:	(GNU libtool) 2.4.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION=2.4.2
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="grep -E"}
-: ${FGREP="grep -F"}
-: ${GREP="grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
     *.cCFSifmso | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.fF09? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.fF09? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/$\\"$/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^$.\{79\}$$..*$/\1\
+\2/
+h
+s/$\\"$/\\\1/g
+s/$/\\n/
+s/$^\n*$.*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6147,7 +6160,8 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6831,7 +6845,7 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7316,6 +7330,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7432,7 +7447,7 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8020,6 +8035,11 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8050,7 +8070,7 @@
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8058,11 +8078,7 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9152,6 +9168,8 @@
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9261,7 +9279,8 @@
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"

mpfc-1.3.8.1.tar.bz2/m4/libtool.m4 -> mpfc-2.0.tar.bz2/m4/libtool.m4 Changed

@@ -1,8 +1,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@
 
 m4_define(_LT_COPYING, dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -146,6 +146,8 @@
 AC_REQUIRE(_LT_PREPARE_SED_QUOTE_VARS)dnl
 AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
 
+_LT_DECL(, PATH_SEPARATOR, 1, The PATH separator for the build system)dnl
+dnl
 _LT_DECL(, host_alias, 0, The host system)dnl
 _LT_DECL(, host, 0)dnl
 _LT_DECL(, host_os, 0)dnl
@@ -637,7 +639,7 @@
 m4_ifset(AC_PACKAGE_VERSION,  AC_PACKAGE_VERSION)
 configured by $0, generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -801,6 +803,7 @@
 m4_case($1,
   C,			_LT_LANG(C),
   C++,		_LT_LANG(CXX),
+  Go,			_LT_LANG(GO),
   Java,		_LT_LANG(GCJ),
   Fortran 77,		_LT_LANG(F77),
   Fortran,		_LT_LANG(FC),
@@ -822,6 +825,31 @@
 )# _LT_LANG
 
 
+m4_ifndef(AC_PROG_GO, 
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun(AC_PROG_GO,
+AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR(GOC,     Go compiler command)dnl
+AC_ARG_VAR(GOFLAGS, Go compiler flags)dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, ${ac_tool_prefix}gccgo, ${ac_tool_prefix}gccgo)
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+)#m4_defun
+)#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun(_LT_LANG_DEFAULT_CONFIG,
@@ -852,6 +880,10 @@
        m4_ifdef(LT_PROG_GCJ,
 	m4_define(LT_PROG_GCJ, defn(LT_PROG_GCJ)LT_LANG(GCJ))))))
 
+AC_PROVIDE_IFELSE(AC_PROG_GO,
+  LT_LANG(GO),
+  m4_define(AC_PROG_GO, defn(AC_PROG_GO)LT_LANG(GO)))
+
 AC_PROVIDE_IFELSE(LT_PROG_RC,
   LT_LANG(RC),
   m4_define(LT_PROG_RC, defn(LT_PROG_RC)LT_LANG(RC)))
@@ -954,7 +986,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -962,6 +1000,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi)
+
     AC_CACHE_CHECK(for -exported_symbols_list linker flag,
       lt_cv_ld_exported_symbols_list,
       lt_cv_ld_exported_symbols_list=no
@@ -973,6 +1012,7 @@
 	lt_cv_ld_exported_symbols_list=no)
 	LDFLAGS="$save_LDFLAGS"
     )
+
     AC_CACHE_CHECK(for -force_load linker flag,lt_cv_ld_force_load,
       lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -990,7 +1030,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1035,8 +1077,8 @@
 )
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES(TAG)
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun(_LT_DARWIN_LINKER_FEATURES,
 
@@ -1047,6 +1089,8 @@
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case($1, F77, _LT_TAGVAR(compiler_needs_object, $1)=yes,
+                  FC,  _LT_TAGVAR(compiler_needs_object, $1)=yes)
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -1330,14 +1374,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1414,13 +1471,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -1600,6 +1657,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1639,7 +1701,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -2185,7 +2247,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2194,7 +2256,7 @@
   ;;
 
 aix4-9*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2259,7 +2321,7 @@
   ;;
 
 bsdi45*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2398,7 +2460,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2406,10 +2468,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2417,18 +2475,11 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd123*) objformat=aout ;;
+    freebsd23.*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
-  # Handle Gentoo/FreeBSD as it was Linux
-  case $host_vendor in
-    gentoo)
-      version_type=linux ;;
-    *)
-      version_type=freebsd-$objformat ;;
-  esac
-
+  version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -2439,16 +2490,10 @@
       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
       need_version=yes
       ;;
-    linux)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-      soname_spec='${libname}${release}${shared_ext}$major'
-      need_lib_prefix=no
-      need_version=no
-      ;;
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.01* | freebsdelf3.01*)
@@ -2468,17 +2513,18 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -2539,7 +2585,7 @@
   ;;
 
 interix3-9*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2555,7 +2601,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -2592,9 +2638,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2657,7 +2703,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2726,7 +2772,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2751,7 +2797,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2775,7 +2821,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2806,7 +2852,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2816,7 +2862,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3238,7 +3284,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3658,6 +3704,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
 "     /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF $^|$*()/{next};"\
@@ -4242,7 +4289,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -4334,18 +4383,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ CF*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -4505,7 +4569,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/;s/^.* __nm__$^ *$ ^ */\1 DATA/;/^I /d;/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
@@ -4530,7 +4596,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4781,8 +4846,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5077,6 +5141,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1,DATA/'\'' | $SED -e '\''/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5123,10 +5188,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.012 allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5139,7 +5200,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5178,7 +5239,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5620,9 +5680,6 @@
 _LT_TAGDECL(, hardcode_libdir_flag_spec, 1,
     Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist)
-_LT_TAGDECL(, hardcode_libdir_flag_spec_ld, 1,
-    If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist)
 _LT_TAGDECL(, hardcode_libdir_separator, 1,
     Whether we need a single "-rpath" flag with a separated argument)
 _LT_TAGDECL(, hardcode_direct, 0,
@@ -5780,7 +5837,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6150,7 +6206,7 @@
         esac
         ;;
 
-      freebsd12*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6911,12 +6967,18 @@
   }
 };
 _LT_EOF
+, $1, GO, cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 )
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7113,7 +7175,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7246,7 +7307,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7433,6 +7493,77 @@
 )# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG(TAG)
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun(_LT_LANG_GO_CONFIG,
+AC_REQUIRE(LT_PROG_GO)dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME($compiler)
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## 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
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+)# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG(TAG)
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7502,6 +7633,13 @@
 dnl AC_DEFUN(LT_AC_PROG_GCJ, )
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN(LT_PROG_GO,
+AC_CHECK_TOOL(GOC, gccgo,)
+)
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN(LT_PROG_RC,

mpfc-1.3.8.1.tar.bz2/m4/ltoptions.m4 -> mpfc-2.0.tar.bz2/m4/ltoptions.m4 Changed

mpfc-1.3.8.1.tar.bz2/m4/ltversion.m4 -> mpfc-2.0.tar.bz2/m4/ltversion.m4 Changed

mpfc-2.0.tar.bz2/m4/pkg.m4 Added

@@ -0,0 +1,214 @@
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG(MIN-VERSION)
+# ----------------------------------
+AC_DEFUN(PKG_PROG_PKG_CONFIG,
+m4_pattern_forbid(^_?PKG_A-Z_+$)
+m4_pattern_allow(^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$)
+m4_pattern_allow(^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$)
+AC_ARG_VAR(PKG_CONFIG, path to pkg-config utility)
+AC_ARG_VAR(PKG_CONFIG_PATH, directories to add to pkg-config's search path)
+AC_ARG_VAR(PKG_CONFIG_LIBDIR, path overriding pkg-config's built-in search path)
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL(PKG_CONFIG, pkg-config)
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default($1, 0.9.0)
+	AC_MSG_CHECKING(pkg-config is at least version $_pkg_min_version)
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT(yes)
+	else
+		AC_MSG_RESULT(no)
+		PKG_CONFIG=""
+	fi
+fidnl
+)# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE(PKG_PROG_PKG_CONFIG)
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN(PKG_CHECK_EXISTS,
+AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG($PKG_CONFIG --exists --print-errors "$1"); then
+  m4_default($2, :)
+m4_ifvaln($3, else
+  $3)dnl
+fi)
+
+# _PKG_CONFIG(VARIABLE, COMMAND, MODULES)
+# ---------------------------------------------
+m4_define(_PKG_CONFIG,
+if test -n "$$1"; then
+    pkg_cv_$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS($3,
+                     pkg_cv_$1=`$PKG_CONFIG --$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ,
+		     pkg_failed=yes)
+ else
+    pkg_failed=untried
+fidnl
+)# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN(_PKG_SHORT_ERRORS_SUPPORTED,
+AC_REQUIRE(PKG_PROG_PKG_CONFIG)
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fidnl
+)# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, ACTION-IF-FOUND,
+# ACTION-IF-NOT-FOUND)
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN(PKG_CHECK_MODULES,
+AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
+AC_ARG_VAR($1_CFLAGS, C compiler flags for $1, overriding pkg-config)dnl
+AC_ARG_VAR($1_LIBS, linker flags for $1, overriding pkg-config)dnl
+
+pkg_failed=no
+AC_MSG_CHECKING(for $1)
+
+_PKG_CONFIG($1_CFLAGS, cflags, $2)
+_PKG_CONFIG($1_LIBS, libs, $2)
+
+m4_define(_PKG_TEXT, Alternatively, you may set the environment variables $1_CFLAGS
+and $1_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.)
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT(no)
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default($4, AC_MSG_ERROR(
+Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT)dnl
+        )
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT(no)
+	m4_default($4, AC_MSG_FAILURE(
+The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.)dnl
+        )
+else
+	$1_CFLAGS=$pkg_cv_$1_CFLAGS
+	$1_LIBS=$pkg_cv_$1_LIBS
+        AC_MSG_RESULT(yes)
+	$3
+fidnl
+)# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN(PKG_INSTALLDIR,
+m4_pushdef(pkg_default, m4_default($1, '${libdir}/pkgconfig'))
+m4_pushdef(pkg_description,
+    pkg-config installation directory @<:@pkg_default@:>@)
+AC_ARG_WITH(pkgconfigdir,
+    AS_HELP_STRING(--with-pkgconfigdir, pkg_description),,
+    with_pkgconfigdir=pkg_default)
+AC_SUBST(pkgconfigdir, $with_pkgconfigdir)
+m4_popdef(pkg_default)
+m4_popdef(pkg_description)
+) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN(PKG_NOARCH_INSTALLDIR,
+m4_pushdef(pkg_default, m4_default($1, '${datadir}/pkgconfig'))
+m4_pushdef(pkg_description,
+    pkg-config arch-independent installation directory @<:@pkg_default@:>@)
+AC_ARG_WITH(noarch-pkgconfigdir,
+    AS_HELP_STRING(--with-noarch-pkgconfigdir, pkg_description),,
+    with_noarch_pkgconfigdir=pkg_default)
+AC_SUBST(noarch_pkgconfigdir, $with_noarch_pkgconfigdir)
+m4_popdef(pkg_default)
+m4_popdef(pkg_description)
+) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN(PKG_CHECK_VAR,
+AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
+AC_ARG_VAR($1, value of $3 for $2, overriding pkg-config)dnl
+
+_PKG_CONFIG($1, variable="$3", $2)
+AS_VAR_COPY($1, pkg_cv_$1)
+
+AS_VAR_IF($1, "", $5, $4)dnl
+)# PKG_CHECK_VAR

mpfc-1.3.8.1.tar.bz2/missing -> mpfc-2.0.tar.bz2/missing Changed

@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,69 +25,40 @@
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output =$^ *$.*/\1/p'
-sed_minuso='s/.* -o $^ *$.*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 OPTION... PROGRAM ARGUMENT...
 
-Handle \`PROGRAM ARGUMENT...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM ARGUMENT...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.ch', if possible, from existing .ch
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.ch', if possible, from existing .ch
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -100,272 +70,141 @@
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^ *ACM_CONFIG_HEADER($^)*$).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^^:*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* $^ *$ *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* $^ *$ *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.^.*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)

mpfc-1.3.8.1.tar.bz2/mpfc-config.h -> mpfc-2.0.tar.bz2/mpfc-config.h Changed

@@ -23,9 +23,6 @@
    */
 #define HAVE_ALLOCA_H 1
 
-/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
-#define HAVE_ALSA_ASOUNDLIB_H 1
-
 /* Define to 1 if you have the `argz_count' function. */
 #define HAVE_ARGZ_COUNT 1
 
@@ -52,9 +49,6 @@
    the CoreFoundation framework. */
 /* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
 
-/* Define to 1 if you have the <curses.h> header file. */
-#define HAVE_CURSES_H 1
-
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #define HAVE_DCGETTEXT 1
@@ -82,9 +76,6 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
-/* Define to 1 if you have the <FLAC/all.h> header file. */
-#define HAVE_FLAC_ALL_H 1
-
 /* Define to 1 if you have the `fwprintf' function. */
 #define HAVE_FWPRINTF 1
 
@@ -112,7 +103,7 @@
 /* Define to 1 if you have the <gpm.h> header file. */
 #define HAVE_GPM_H 1
 
-/* Define if you have the iconv() function and it works. */
+/* Define if you have the iconv() function. */
 #define HAVE_ICONV 1
 
 /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
@@ -131,57 +122,33 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 #define HAVE_LC_MESSAGES 1
 
-/* Define to 1 if you have the `asound' library (-lasound). */
-#define HAVE_LIBASOUND 1
-
 /* Define to 1 if you have the `dl' library (-ldl). */
 #define HAVE_LIBDL 1
 
-/* Define to 1 if you have the `FLAC' library (-lFLAC). */
-#define HAVE_LIBFLAC 1
-
 /* Define to 1 if you have the `gpm' library (-lgpm). */
 #define HAVE_LIBGPM 1
 
 /* Define to 1 if you have the `m' library (-lm). */
 #define HAVE_LIBM 1
 
-/* Define to 1 if you have the `ncursesw' library (-lncursesw). */
-#define HAVE_LIBNCURSESW 1
-
-/* Define to 1 if you have the `ogg' library (-logg). */
-#define HAVE_LIBOGG 1
-
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #define HAVE_LIBPTHREAD 1
 
 /* Define to 1 if you have the `resolv' library (-lresolv). */
 #define HAVE_LIBRESOLV 1
 
-/* Define to 1 if you have the `vorbis' library (-lvorbis). */
-#define HAVE_LIBVORBIS 1
-
-/* Define to 1 if you have the `vorbisfile' library (-lvorbisfile). */
-#define HAVE_LIBVORBISFILE 1
-
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
-/* Define to 1 if you have the <linux/cdrom.h> header file. */
-#define HAVE_LINUX_CDROM_H 1
+/* Define if you have the 'long double' type. */
+#define HAVE_LONG_DOUBLE 1
 
 /* Define to 1 if the system has the type `long long int'. */
 #define HAVE_LONG_LONG_INT 1
 
-/* Define to 1 if you have the <mad.h> header file. */
-#define HAVE_MAD_H 1
-
 /* Define to 1 if you have the <math.h> header file. */
 #define HAVE_MATH_H 1
 
-/* Define to 1 if you have the `mbrtowc' function. */
-#define HAVE_MBRTOWC 1
-
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
@@ -197,11 +164,9 @@
 /* Define to 1 if you have the <netdb.h> header file. */
 #define HAVE_NETDB_H 1
 
-/* Define to 1 if you have the `newlocale' function. */
-#define HAVE_NEWLOCALE 1
-
-/* Define to 1 if you have the <ogg/ogg.h> header file. */
-#define HAVE_OGG_OGG_H 1
+/* Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if
+   _GNU_SOURCE is defined. */
+#define HAVE_NL_LOCALE_NAME 1
 
 /* Define if your printf() function supports format strings with positions. */
 #define HAVE_POSIX_PRINTF 1
@@ -255,9 +220,6 @@
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
-/* Define to 1 if you have the `strnlen' function. */
-#define HAVE_STRNLEN 1
-
 /* Define to 1 if you have the `strtoul' function. */
 #define HAVE_STRTOUL 1
 
@@ -279,49 +241,28 @@
 /* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
 #define HAVE_UINTMAX_T 1
 
-/* Define to 1 if you have the <unicode/ucnv.h> header file. */
-#define HAVE_UNICODE_UCNV_H 1
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
+/* Define if you have the 'unsigned long long' type. */
+#define HAVE_UNSIGNED_LONG_LONG 1
+
 /* Define to 1 if the system has the type `unsigned long long int'. */
 #define HAVE_UNSIGNED_LONG_LONG_INT 1
 
-/* Define to 1 if you have the `uselocale' function. */
-#define HAVE_USELOCALE 1
-
 /* Define to 1 or 0, depending whether the compiler supports simple visibility
    declarations. */
 #define HAVE_VISIBILITY 1
 
-/* Define to 1 if you have the <vorbis/codec.h> header file. */
-#define HAVE_VORBIS_CODEC_H 1
-
-/* Define to 1 if you have the <vorbis/vorbisfile.h> header file. */
-#define HAVE_VORBIS_VORBISFILE_H 1
-
 /* Define if you have the 'wchar_t' type. */
 #define HAVE_WCHAR_T 1
 
-/* Define to 1 if you have the `wcrtomb' function. */
-#define HAVE_WCRTOMB 1
-
 /* Define to 1 if you have the `wcslen' function. */
 #define HAVE_WCSLEN 1
 
-/* Define to 1 if you have the `wcsnlen' function. */
-#define HAVE_WCSNLEN 1
-
 /* Define if you have the 'wint_t' type. */
 #define HAVE_WINT_T 1
 
-/* Define to 1 if O_NOATIME works. */
-#define HAVE_WORKING_O_NOATIME 1
-
-/* Define to 1 if O_NOFOLLOW works. */
-#define HAVE_WORKING_O_NOFOLLOW 1
-
 /* Define to 1 if you have the `__fsetlocking' function. */
 #define HAVE___FSETLOCKING 1
 
@@ -342,19 +283,19 @@
 #define PACKAGE_BUGREPORT ""
 
 /* Define to the full name of this package. */
-#define PACKAGE_NAME ""
+#define PACKAGE_NAME "mpfc"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
+#define PACKAGE_STRING "mpfc 2.0"
 
 /* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
+#define PACKAGE_TARNAME "mpfc"
 
 /* Define to the home page for this package. */
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION ""
+#define PACKAGE_VERSION "2.0"
 
 /* Define if <inttypes.h> exists and defines unusable PRI* macros. */
 /* #undef PRI_MACROS_BROKEN */
@@ -364,9 +305,7 @@
 
 /* Define as the maximum value of type 'size_t', if the system doesn't define
    it. */
-#ifndef SIZE_MAX
-/* # undef SIZE_MAX */
-#endif
+/* #undef SIZE_MAX */
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
@@ -426,7 +365,7 @@
 /* #undef USE_WIN32_THREADS */
 
 /* Version number of package */
-#define VERSION "1.3.8.1"
+#define VERSION "2.0"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -440,6 +379,10 @@
 # endif
 #endif
 
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+   `char'. */
+#define YYTEXT_POINTER 1
+
 /* Define to 1 if on MINIX. */
 /* #undef _MINIX */
 
@@ -481,29 +424,20 @@
 #define __libc_lock_lock_recursive                gl_recursive_lock_lock
 #define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
 #define glthread_in_use  libintl_thread_in_use
-#define glthread_lock_init_func     libintl_lock_init_func
-#define glthread_lock_lock_func     libintl_lock_lock_func
-#define glthread_lock_unlock_func   libintl_lock_unlock_func
-#define glthread_lock_destroy_func  libintl_lock_destroy_func
-#define glthread_rwlock_init_multithreaded     libintl_rwlock_init_multithreaded
-#define glthread_rwlock_init_func              libintl_rwlock_init_func
-#define glthread_rwlock_rdlock_multithreaded   libintl_rwlock_rdlock_multithreaded
-#define glthread_rwlock_rdlock_func            libintl_rwlock_rdlock_func
-#define glthread_rwlock_wrlock_multithreaded   libintl_rwlock_wrlock_multithreaded
-#define glthread_rwlock_wrlock_func            libintl_rwlock_wrlock_func
-#define glthread_rwlock_unlock_multithreaded   libintl_rwlock_unlock_multithreaded
-#define glthread_rwlock_unlock_func            libintl_rwlock_unlock_func
-#define glthread_rwlock_destroy_multithreaded  libintl_rwlock_destroy_multithreaded
-#define glthread_rwlock_destroy_func           libintl_rwlock_destroy_func
-#define glthread_recursive_lock_init_multithreaded     libintl_recursive_lock_init_multithreaded
-#define glthread_recursive_lock_init_func              libintl_recursive_lock_init_func
-#define glthread_recursive_lock_lock_multithreaded     libintl_recursive_lock_lock_multithreaded
-#define glthread_recursive_lock_lock_func              libintl_recursive_lock_lock_func
-#define glthread_recursive_lock_unlock_multithreaded   libintl_recursive_lock_unlock_multithreaded
-#define glthread_recursive_lock_unlock_func            libintl_recursive_lock_unlock_func
-#define glthread_recursive_lock_destroy_multithreaded  libintl_recursive_lock_destroy_multithreaded
-#define glthread_recursive_lock_destroy_func           libintl_recursive_lock_destroy_func
-#define glthread_once_func            libintl_once_func
+#define glthread_lock_init     libintl_lock_init
+#define glthread_lock_lock     libintl_lock_lock
+#define glthread_lock_unlock   libintl_lock_unlock
+#define glthread_lock_destroy  libintl_lock_destroy
+#define glthread_rwlock_init     libintl_rwlock_init
+#define glthread_rwlock_rdlock   libintl_rwlock_rdlock
+#define glthread_rwlock_wrlock   libintl_rwlock_wrlock
+#define glthread_rwlock_unlock   libintl_rwlock_unlock
+#define glthread_rwlock_destroy  libintl_rwlock_destroy
+#define glthread_recursive_lock_init     libintl_recursive_lock_init
+#define glthread_recursive_lock_lock     libintl_recursive_lock_lock
+#define glthread_recursive_lock_unlock   libintl_recursive_lock_unlock
+#define glthread_recursive_lock_destroy  libintl_recursive_lock_destroy
+#define glthread_once                 libintl_once
+#define glthread_once_call            libintl_once_call
 #define glthread_once_singlethreaded  libintl_once_singlethreaded
-#define glthread_once_multithreaded   libintl_once_multithreaded

mpfc-1.3.8.1.tar.bz2/mpfc-config.h.in -> mpfc-2.0.tar.bz2/mpfc-config.h.in Changed

@@ -22,9 +22,6 @@
    */
 #undef HAVE_ALLOCA_H
 
-/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
-#undef HAVE_ALSA_ASOUNDLIB_H
-
 /* Define to 1 if you have the `argz_count' function. */
 #undef HAVE_ARGZ_COUNT
 
@@ -51,9 +48,6 @@
    the CoreFoundation framework. */
 #undef HAVE_CFPREFERENCESCOPYAPPVALUE
 
-/* Define to 1 if you have the <curses.h> header file. */
-#undef HAVE_CURSES_H
-
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT
@@ -81,9 +75,6 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the <FLAC/all.h> header file. */
-#undef HAVE_FLAC_ALL_H
-
 /* Define to 1 if you have the `fwprintf' function. */
 #undef HAVE_FWPRINTF
 
@@ -111,7 +102,7 @@
 /* Define to 1 if you have the <gpm.h> header file. */
 #undef HAVE_GPM_H
 
-/* Define if you have the iconv() function and it works. */
+/* Define if you have the iconv() function. */
 #undef HAVE_ICONV
 
 /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
@@ -130,57 +121,33 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 #undef HAVE_LC_MESSAGES
 
-/* Define to 1 if you have the `asound' library (-lasound). */
-#undef HAVE_LIBASOUND
-
 /* Define to 1 if you have the `dl' library (-ldl). */
 #undef HAVE_LIBDL
 
-/* Define to 1 if you have the `FLAC' library (-lFLAC). */
-#undef HAVE_LIBFLAC
-
 /* Define to 1 if you have the `gpm' library (-lgpm). */
 #undef HAVE_LIBGPM
 
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
-/* Define to 1 if you have the `ncursesw' library (-lncursesw). */
-#undef HAVE_LIBNCURSESW
-
-/* Define to 1 if you have the `ogg' library (-logg). */
-#undef HAVE_LIBOGG
-
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #undef HAVE_LIBPTHREAD
 
 /* Define to 1 if you have the `resolv' library (-lresolv). */
 #undef HAVE_LIBRESOLV
 
-/* Define to 1 if you have the `vorbis' library (-lvorbis). */
-#undef HAVE_LIBVORBIS
-
-/* Define to 1 if you have the `vorbisfile' library (-lvorbisfile). */
-#undef HAVE_LIBVORBISFILE
-
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
-/* Define to 1 if you have the <linux/cdrom.h> header file. */
-#undef HAVE_LINUX_CDROM_H
+/* Define if you have the 'long double' type. */
+#undef HAVE_LONG_DOUBLE
 
 /* Define to 1 if the system has the type `long long int'. */
 #undef HAVE_LONG_LONG_INT
 
-/* Define to 1 if you have the <mad.h> header file. */
-#undef HAVE_MAD_H
-
 /* Define to 1 if you have the <math.h> header file. */
 #undef HAVE_MATH_H
 
-/* Define to 1 if you have the `mbrtowc' function. */
-#undef HAVE_MBRTOWC
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -196,11 +163,9 @@
 /* Define to 1 if you have the <netdb.h> header file. */
 #undef HAVE_NETDB_H
 
-/* Define to 1 if you have the `newlocale' function. */
-#undef HAVE_NEWLOCALE
-
-/* Define to 1 if you have the <ogg/ogg.h> header file. */
-#undef HAVE_OGG_OGG_H
+/* Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if
+   _GNU_SOURCE is defined. */
+#undef HAVE_NL_LOCALE_NAME
 
 /* Define if your printf() function supports format strings with positions. */
 #undef HAVE_POSIX_PRINTF
@@ -254,9 +219,6 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strnlen' function. */
-#undef HAVE_STRNLEN
-
 /* Define to 1 if you have the `strtoul' function. */
 #undef HAVE_STRTOUL
 
@@ -278,49 +240,28 @@
 /* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
 #undef HAVE_UINTMAX_T
 
-/* Define to 1 if you have the <unicode/ucnv.h> header file. */
-#undef HAVE_UNICODE_UCNV_H
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define if you have the 'unsigned long long' type. */
+#undef HAVE_UNSIGNED_LONG_LONG
+
 /* Define to 1 if the system has the type `unsigned long long int'. */
 #undef HAVE_UNSIGNED_LONG_LONG_INT
 
-/* Define to 1 if you have the `uselocale' function. */
-#undef HAVE_USELOCALE
-
 /* Define to 1 or 0, depending whether the compiler supports simple visibility
    declarations. */
 #undef HAVE_VISIBILITY
 
-/* Define to 1 if you have the <vorbis/codec.h> header file. */
-#undef HAVE_VORBIS_CODEC_H
-
-/* Define to 1 if you have the <vorbis/vorbisfile.h> header file. */
-#undef HAVE_VORBIS_VORBISFILE_H
-
 /* Define if you have the 'wchar_t' type. */
 #undef HAVE_WCHAR_T
 
-/* Define to 1 if you have the `wcrtomb' function. */
-#undef HAVE_WCRTOMB
-
 /* Define to 1 if you have the `wcslen' function. */
 #undef HAVE_WCSLEN
 
-/* Define to 1 if you have the `wcsnlen' function. */
-#undef HAVE_WCSNLEN
-
 /* Define if you have the 'wint_t' type. */
 #undef HAVE_WINT_T
 
-/* Define to 1 if O_NOATIME works. */
-#undef HAVE_WORKING_O_NOATIME
-
-/* Define to 1 if O_NOFOLLOW works. */
-#undef HAVE_WORKING_O_NOFOLLOW
-
 /* Define to 1 if you have the `__fsetlocking' function. */
 #undef HAVE___FSETLOCKING
 
@@ -363,9 +304,7 @@
 
 /* Define as the maximum value of type 'size_t', if the system doesn't define
    it. */
-#ifndef SIZE_MAX
-# undef SIZE_MAX
-#endif
+#undef SIZE_MAX
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
@@ -439,6 +378,10 @@
 # endif
 #endif
 
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+   `char'. */
+#undef YYTEXT_POINTER
+
 /* Define to 1 if on MINIX. */
 #undef _MINIX
 
@@ -480,29 +423,20 @@
 #define __libc_lock_lock_recursive                gl_recursive_lock_lock
 #define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
 #define glthread_in_use  libintl_thread_in_use
-#define glthread_lock_init_func     libintl_lock_init_func
-#define glthread_lock_lock_func     libintl_lock_lock_func
-#define glthread_lock_unlock_func   libintl_lock_unlock_func
-#define glthread_lock_destroy_func  libintl_lock_destroy_func
-#define glthread_rwlock_init_multithreaded     libintl_rwlock_init_multithreaded
-#define glthread_rwlock_init_func              libintl_rwlock_init_func
-#define glthread_rwlock_rdlock_multithreaded   libintl_rwlock_rdlock_multithreaded
-#define glthread_rwlock_rdlock_func            libintl_rwlock_rdlock_func
-#define glthread_rwlock_wrlock_multithreaded   libintl_rwlock_wrlock_multithreaded
-#define glthread_rwlock_wrlock_func            libintl_rwlock_wrlock_func
-#define glthread_rwlock_unlock_multithreaded   libintl_rwlock_unlock_multithreaded
-#define glthread_rwlock_unlock_func            libintl_rwlock_unlock_func
-#define glthread_rwlock_destroy_multithreaded  libintl_rwlock_destroy_multithreaded
-#define glthread_rwlock_destroy_func           libintl_rwlock_destroy_func
-#define glthread_recursive_lock_init_multithreaded     libintl_recursive_lock_init_multithreaded
-#define glthread_recursive_lock_init_func              libintl_recursive_lock_init_func
-#define glthread_recursive_lock_lock_multithreaded     libintl_recursive_lock_lock_multithreaded
-#define glthread_recursive_lock_lock_func              libintl_recursive_lock_lock_func
-#define glthread_recursive_lock_unlock_multithreaded   libintl_recursive_lock_unlock_multithreaded
-#define glthread_recursive_lock_unlock_func            libintl_recursive_lock_unlock_func
-#define glthread_recursive_lock_destroy_multithreaded  libintl_recursive_lock_destroy_multithreaded
-#define glthread_recursive_lock_destroy_func           libintl_recursive_lock_destroy_func
-#define glthread_once_func            libintl_once_func
+#define glthread_lock_init     libintl_lock_init
+#define glthread_lock_lock     libintl_lock_lock
+#define glthread_lock_unlock   libintl_lock_unlock
+#define glthread_lock_destroy  libintl_lock_destroy
+#define glthread_rwlock_init     libintl_rwlock_init
+#define glthread_rwlock_rdlock   libintl_rwlock_rdlock
+#define glthread_rwlock_wrlock   libintl_rwlock_wrlock
+#define glthread_rwlock_unlock   libintl_rwlock_unlock
+#define glthread_rwlock_destroy  libintl_rwlock_destroy
+#define glthread_recursive_lock_init     libintl_recursive_lock_init
+#define glthread_recursive_lock_lock     libintl_recursive_lock_lock
+#define glthread_recursive_lock_unlock   libintl_recursive_lock_unlock
+#define glthread_recursive_lock_destroy  libintl_recursive_lock_destroy
+#define glthread_once                 libintl_once
+#define glthread_once_call            libintl_once_call
 #define glthread_once_singlethreaded  libintl_once_singlethreaded
-#define glthread_once_multithreaded   libintl_once_multithreaded

mpfc-1.3.8.1.tar.bz2/plugins/Makefile.am -> mpfc-2.0.tar.bz2/plugins/Makefile.am Changed

mpfc-1.3.8.1.tar.bz2/plugins/Makefile.in -> mpfc-2.0.tar.bz2/plugins/Makefile.in Changed

mpfc-1.3.8.1.tar.bz2/plugins/general/Makefile.in -> mpfc-2.0.tar.bz2/plugins/general/Makefile.in Changed

mpfc-2.0.tar.bz2/plugins/plist Added

mpfc-2.0.tar.bz2/plugins/plist/Makefile.am Added

mpfc-2.0.tar.bz2/plugins/plist/Makefile.in Added

@@ -0,0 +1,685 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = plugins/plist
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/mpfc-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$^/*$/.*$$,\1,'; \
+  sed_rest='s,^^/*/*,,'; \
+  sed_last='s,^.*/$^/*$$$,\1,'; \
+  sed_butlast='s,/*^/*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COMMON_LIBS = @COMMON_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_CFLAGS = @CURSES_CFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GENERAL_PLUGINS = @GENERAL_PLUGINS@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GPM_LIBS = @GPM_LIBS@
+GREP = @GREP@
+GSTREAMER_AUDIO_CFLAGS = @GSTREAMER_AUDIO_CFLAGS@
+GSTREAMER_AUDIO_LIBS = @GSTREAMER_AUDIO_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSON_CFLAGS = @JSON_CFLAGS@
+JSON_LIBS = @JSON_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MATH_LIBS = @MATH_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLIST_PLUGINS = @PLIST_PLUGINS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+RESOLV_LIBS = @RESOLV_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
+TAGLIB_LIBS = @TAGLIB_LIBS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ALL_PLUGINS = m3u pls cue audiocd
+SUBDIRS = @PLIST_PLUGINS@
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/plist/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign plugins/plist/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+
+# 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:

mpfc-2.0.tar.bz2/plugins/plist/audiocd Added

mpfc-2.0.tar.bz2/plugins/plist/audiocd/Makefile.am Added

mpfc-2.0.tar.bz2/plugins/plist/audiocd/Makefile.in Added

@@ -0,0 +1,715 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = plugins/plist/audiocd
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/mpfc-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
+  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
+    if (++n$$2 == $(am__install_max)) \
+      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
+    END { for (dir in files) print dir, filesdir }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(mylibdir)"
+LTLIBRARIES = $(mylib_LTLIBRARIES)
+libaudiocd_la_DEPENDENCIES =
+am_libaudiocd_la_OBJECTS = audiocd.lo
+libaudiocd_la_OBJECTS = $(am_libaudiocd_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libaudiocd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libaudiocd_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libaudiocd_la_SOURCES)
+DIST_SOURCES = $(libaudiocd_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COMMON_LIBS = @COMMON_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_CFLAGS = @CURSES_CFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GENERAL_PLUGINS = @GENERAL_PLUGINS@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GPM_LIBS = @GPM_LIBS@
+GREP = @GREP@
+GSTREAMER_AUDIO_CFLAGS = @GSTREAMER_AUDIO_CFLAGS@
+GSTREAMER_AUDIO_LIBS = @GSTREAMER_AUDIO_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSON_CFLAGS = @JSON_CFLAGS@
+JSON_LIBS = @JSON_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MATH_LIBS = @MATH_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLIST_PLUGINS = @PLIST_PLUGINS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+RESOLV_LIBS = @RESOLV_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
+TAGLIB_LIBS = @TAGLIB_LIBS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+mylib_LTLIBRARIES = libaudiocd.la
+mylibdir = $(libdir)/mpfc/plist
+libaudiocd_la_SOURCES = audiocd.c 
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/libmpfcwnd @GSTREAMER_CFLAGS@
+libaudiocd_la_LDFLAGS = -Xcompiler -nostartfiles -version-info 2:0
+libaudiocd_la_LIBADD = @COMMON_LIBS@ 
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/plist/audiocd/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign plugins/plist/audiocd/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(mylibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(mylibdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
+	}
+
+uninstall-mylibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
+	done
+
+clean-mylibLTLIBRARIES:
+	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
+	@list='$(mylib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libaudiocd.la: $(libaudiocd_la_OBJECTS) $(libaudiocd_la_DEPENDENCIES) $(EXTRA_libaudiocd_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libaudiocd_la_LINK) -rpath $(mylibdir) $(libaudiocd_la_OBJECTS) $(libaudiocd_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audiocd.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(mylibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-mylibLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-mylibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-mylibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-mylibLTLIBRARIES \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-mylibLTLIBRARIES
+
+
+# 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:

mpfc-2.0.tar.bz2/plugins/plist/audiocd/audiocd.c Added

@@ -0,0 +1,128 @@
+/******************************************************************
+ * Copyright (C) 2003 - 2011 by SG Software.
+ *
+ * SG MPFC. Audio CD playlist plugin.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gst/gst.h>
+#include "types.h"
+#include "plp.h"
+#include "logger.h"
+#include "pmng.h"
+#include "util.h"
+
+/* Logger */
+static logger_t *audiocd_log = NULL;
+
+static char *audiocd_desc = "AudioCD playlist plugin";
+
+/* Plugin author */
+static char *audiocd_author = "Sergey E. Galanov <sgsoftware@mail.ru>";
+
+/* Get supported formats function */
+char *audiocd_get_prefix( void )
+{
+	return "audiocd://";
+} /* End of 'audiocd_get_formats' function */
+
+/* Determine the number of tracks in AudioCD */
+guint64 audiocd_get_num_tracks( void )
+{
+	guint64 num_tracks = 0;
+
+	/* Create cdda element */
+	GstElement *cdda = gst_element_make_from_uri(GST_URI_SRC, "cdda://", NULL, NULL);
+	if (!cdda)
+	{
+		logger_error(audiocd_log, 0, _("Unable to load Audio CD"));
+		return 0;
+	}
+
+	//rb_debug ("cdda longname: %s", gst_element_factory_get_longname (gst_element_get_factory (priv->cdda)));
+	//g_object_set (G_OBJECT (priv->cdda), "device", priv->device_path, NULL);
+	GstElement *pipeline = gst_pipeline_new("pipeline");
+	GstElement *sink = gst_element_factory_make("fakesink", "fakesink");
+	gst_bin_add_many(GST_BIN(pipeline), cdda, sink, NULL);
+	gst_element_link(cdda, sink);
+
+	/* disable paranoia (if using cdparanoia) since we're only reading track information here.
+	 * this reduces cdparanoia's cache size, so the process is much faster.
+	 */
+	//if (g_object_class_find_property (G_OBJECT_GET_CLASS (source), "paranoia-mode"))
+	//	g_object_set (source, "paranoia-mode", 0, NULL);
+
+	GstStateChangeReturn ret = gst_element_set_state(pipeline, GST_STATE_PAUSED);
+	if (ret == GST_STATE_CHANGE_ASYNC)
+		ret = gst_element_get_state(pipeline, NULL, NULL, 3 * GST_SECOND);
+	if (ret == GST_STATE_CHANGE_FAILURE)
+	{
+		logger_error(audiocd_log, 0, _("Unable to load Audio CD"));
+		goto finally;
+	}
+
+	GstFormat fmt = gst_format_get_by_nick("track");
+	if (!gst_element_query_duration(cdda, fmt, &num_tracks))
+	{
+		logger_error(audiocd_log, 0, _("Unable to load Audio CD"));
+		goto finally;
+	}
+
+finally:
+	g_object_unref(pipeline);
+	return num_tracks;
+}
+
+/* Parse playlist and handle its contents */
+plp_status_t audiocd_for_each_item( char *pl_name, void *ctx, plp_func_t f )
+{
+	guint64 num_tracks = audiocd_get_num_tracks();
+	if (!num_tracks)
+		return PLP_STATUS_FAILED;
+
+	/* Now add 'cdda://idx' elements */
+	for ( unsigned long long i = 0; i < num_tracks; i++ )
+	{
+		char name64;
+		snprintf(name, sizeof(name), "cdda://%llu", i + 1);
+		logger_error(audiocd_log, 0, _("adding %s"), name);
+		song_metadata_t metadata = SONG_METADATA_EMPTY;
+
+		plp_status_t res = f(ctx, name, &metadata);
+		if (res != PLP_STATUS_OK)
+			return res;
+	}
+	return PLP_STATUS_OK;
+} /* End of 'audiocd_for_each_item' function */
+
+/* Exchange data with main program */
+void plugin_exchange_data( plugin_data_t *pd )
+{
+	pd->m_desc = audiocd_desc;
+	pd->m_author = audiocd_author;
+	PLIST_DATA(pd)->m_get_prefix = audiocd_get_prefix;
+	PLIST_DATA(pd)->m_for_each_item = audiocd_for_each_item;
+	audiocd_log = pd->m_logger;
+} /* End of 'plugin_exchange_data' function */
+
+/* End of 'audiocd.c' file */
+

mpfc-2.0.tar.bz2/plugins/plist/cue Added

mpfc-2.0.tar.bz2/plugins/plist/cue/Makefile.am Added

mpfc-2.0.tar.bz2/plugins/plist/cue/Makefile.in Added

@@ -0,0 +1,717 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = plugins/plist/cue
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/mpfc-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
+  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
+    if (++n$$2 == $(am__install_max)) \
+      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
+    END { for (dir in files) print dir, filesdir }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(mylibdir)"
+LTLIBRARIES = $(mylib_LTLIBRARIES)
+libcueplist_la_DEPENDENCIES =  \
+	$(top_builddir)/libcue/src/libcue/libmpfccue.la
+am_libcueplist_la_OBJECTS = cue.lo
+libcueplist_la_OBJECTS = $(am_libcueplist_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libcueplist_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libcueplist_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libcueplist_la_SOURCES)
+DIST_SOURCES = $(libcueplist_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COMMON_LIBS = @COMMON_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_CFLAGS = @CURSES_CFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GENERAL_PLUGINS = @GENERAL_PLUGINS@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GPM_LIBS = @GPM_LIBS@
+GREP = @GREP@
+GSTREAMER_AUDIO_CFLAGS = @GSTREAMER_AUDIO_CFLAGS@
+GSTREAMER_AUDIO_LIBS = @GSTREAMER_AUDIO_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSON_CFLAGS = @JSON_CFLAGS@
+JSON_LIBS = @JSON_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MATH_LIBS = @MATH_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLIST_PLUGINS = @PLIST_PLUGINS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+RESOLV_LIBS = @RESOLV_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
+TAGLIB_LIBS = @TAGLIB_LIBS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+mylib_LTLIBRARIES = libcueplist.la
+mylibdir = $(libdir)/mpfc/plist
+libcueplist_la_SOURCES = cue.c 
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/libmpfcwnd -I$(top_srcdir)/libcue/src
+libcueplist_la_LDFLAGS = -Xcompiler -nostartfiles -version-info 2:0
+libcueplist_la_LIBADD = $(top_builddir)/libcue/src/libcue/libmpfccue.la @COMMON_LIBS@
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/plist/cue/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign plugins/plist/cue/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(mylibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(mylibdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
+	}
+
+uninstall-mylibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
+	done
+
+clean-mylibLTLIBRARIES:
+	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
+	@list='$(mylib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libcueplist.la: $(libcueplist_la_OBJECTS) $(libcueplist_la_DEPENDENCIES) $(EXTRA_libcueplist_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libcueplist_la_LINK) -rpath $(mylibdir) $(libcueplist_la_OBJECTS) $(libcueplist_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cue.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(mylibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-mylibLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-mylibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-mylibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-mylibLTLIBRARIES \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-mylibLTLIBRARIES
+
+
+# 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:

mpfc-2.0.tar.bz2/plugins/plist/cue/cue.c Added

@@ -0,0 +1,182 @@
+/******************************************************************
+ * Copyright (C) 2005 - 2011 by SG Software.
+ *
+ * SG MPFC. Cue format support plugin.
+ * $Id$ 
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+//#include "config.h"
+#include <ctype.h>
+#define __MPFC_OUTER__
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <libgen.h>
+#include <dirent.h>
+#include "libcue/libcue.h"
+#include "types.h"
+#include "plp.h"
+#include "pmng.h"
+#include "util.h"
+
+/* Plugins manager */
+static pmng_t *cue_pmng = NULL;
+
+/* Plugin description */
+static char *cue_desc = "Cue format support plugin";
+
+/* Plugin author */
+static char *cue_author = "Sergey E. Galanov <sgsoftware@mail.ru>";
+
+/* Logger */
+static logger_t *cue_log = NULL;
+
+/* Get supported formats function */
+void cue_get_formats( char *extensions, char *content_type )
+{
+	if (extensions != NULL)
+		strcpy(extensions, "cue");
+	if (content_type != NULL)
+		strcpy(content_type, "");
+} /* End of 'cue_get_formats' function */
+
+static long cue_get_track_begin( Track *track )
+{
+	/* Use index 1 */
+	int index = (track_get_nindex(track) == 1 ? 0 : 1);
+	return track_get_start(track) + track_get_index(track, index);
+}
+
+static char *cue_get_genre(Cd *cd, Track *track)
+{
+	char *res;
+
+	res = cdtext_get(PTI_GENRE, track_get_cdtext(track));
+	if (res && *res)
+		return res;
+	res = rem_get(REM_GENRE, track_get_rem(track));
+	if (res && *res)
+		return res;
+
+	res = cdtext_get(PTI_GENRE, cd_get_cdtext(cd));
+	if (res && *res)
+		return res;
+	res = rem_get(REM_GENRE, cd_get_rem(cd));
+	if (res && *res)
+		return res;
+	return NULL;
+}
+
+static char *cue_get_comment(Cd *cd, Track *track)
+{
+	char *res;
+
+	res = rem_get(REM_COMMENT, track_get_rem(track));
+	if (res && *res)
+		return res;
+	res = rem_get(REM_COMMENT, cd_get_rem(cd));
+	if (res && *res)
+		return res;
+	return NULL;
+}
+
+/* Parse playlist and handle its contents */
+plp_status_t cue_for_each_item( char *pl_name, void *ctx, plp_func_t f )
+{
+	/* Load cue sheet */
+	FILE *fd = fopen(pl_name, "rt");
+	if (!fd)
+	{
+		logger_error(cue_log, 0, _("cue: failed to load cue sheet %s"), pl_name);
+		return PLP_STATUS_FAILED;
+	}
+	Cd *cd = cue_parse_file(fd, pl_name);
+	if (!cd)
+	{
+		logger_error(cue_log, 0, _("cue: failed to load cue sheet %s"), pl_name);
+		fclose(fd);
+		return PLP_STATUS_FAILED;
+	}
+	fclose(fd);
+
+	/* Handle tracks */
+	int num_tracks = cd_get_ntrack(cd);
+	plp_status_t res = PLP_STATUS_OK;
+	for ( int i = 1; i <= num_tracks; ++i )
+	{
+		Track *track = cd_get_track(cd, i);
+		char *filename = track_get_filename(track);
+		if (!filename)
+			continue;
+
+		song_metadata_t metadata = SONG_METADATA_EMPTY;
+
+		/* Set bounds */
+		long start = cue_get_track_begin(track);
+		long end = -1;
+		if (i < num_tracks)
+		{
+			Track *next_track = cd_get_track(cd, i + 1);
+			char *next_name = track_get_filename(next_track);
+			if (next_name && !strcmp(filename, next_name))
+				end = cue_get_track_begin(next_track);
+		}
+		metadata.m_start_time = SECONDS_TO_TIME(start) / 75;
+		metadata.m_end_time = (end < 0 ? -1 : SECONDS_TO_TIME(end) / 75);
+
+		/* Set song info */
+		song_info_t *si = si_new();
+		si_set_album(si, cdtext_get(PTI_TITLE, cd_get_cdtext(cd)));
+		si_set_year(si, rem_get(REM_DATE, cd_get_rem(cd)));
+		si_set_artist(si, cdtext_get(PTI_PERFORMER, cd_get_cdtext(cd)));
+		si_set_name(si, cdtext_get(PTI_TITLE, track_get_cdtext(track)));
+		si_set_genre(si, cue_get_genre(cd, track));
+		si_set_comments(si, cue_get_comment(cd, track));
+
+		char track_num_str10;
+		snprintf(track_num_str, sizeof(track_num_str), "%02d", i);
+		si_set_track(si, track_num_str);
+		metadata.m_song_info = si;
+
+		plp_status_t st = f(ctx, filename, &metadata);
+		if (st != PLP_STATUS_OK)
+		{
+			res = st;
+			break;
+		}
+	}
+
+	/* Free memory */
+	cd_delete(cd);
+	return res;
+} /* End of 'cue_for_each_item' function */
+
+/* Exchange data with main program */
+void plugin_exchange_data( plugin_data_t *pd )
+{
+	pd->m_desc = cue_desc;
+	pd->m_author = cue_author;
+	PLIST_DATA(pd)->m_get_formats = cue_get_formats;
+	PLIST_DATA(pd)->m_for_each_item = cue_for_each_item;
+	cue_pmng = pd->m_pmng;
+	cue_log = pd->m_logger;
+} /* End of 'plugin_exchange_data' function */
+
+/* End of 'cue.c' file */
+

mpfc-2.0.tar.bz2/plugins/plist/m3u Added

mpfc-2.0.tar.bz2/plugins/plist/m3u/Makefile.am Added

mpfc-2.0.tar.bz2/plugins/plist/m3u/Makefile.in Added

@@ -0,0 +1,715 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = plugins/plist/m3u
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/mpfc-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
+  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
+    if (++n$$2 == $(am__install_max)) \
+      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
+    END { for (dir in files) print dir, filesdir }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(mylibdir)"
+LTLIBRARIES = $(mylib_LTLIBRARIES)
+libm3u_la_DEPENDENCIES =
+am_libm3u_la_OBJECTS = m3u.lo
+libm3u_la_OBJECTS = $(am_libm3u_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libm3u_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libm3u_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libm3u_la_SOURCES)
+DIST_SOURCES = $(libm3u_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COMMON_LIBS = @COMMON_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_CFLAGS = @CURSES_CFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GENERAL_PLUGINS = @GENERAL_PLUGINS@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GPM_LIBS = @GPM_LIBS@
+GREP = @GREP@
+GSTREAMER_AUDIO_CFLAGS = @GSTREAMER_AUDIO_CFLAGS@
+GSTREAMER_AUDIO_LIBS = @GSTREAMER_AUDIO_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSON_CFLAGS = @JSON_CFLAGS@
+JSON_LIBS = @JSON_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MATH_LIBS = @MATH_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLIST_PLUGINS = @PLIST_PLUGINS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+RESOLV_LIBS = @RESOLV_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
+TAGLIB_LIBS = @TAGLIB_LIBS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+mylib_LTLIBRARIES = libm3u.la
+mylibdir = $(libdir)/mpfc/plist
+libm3u_la_SOURCES = m3u.c 
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/libmpfcwnd
+libm3u_la_LDFLAGS = -Xcompiler -nostartfiles -version-info 2:0
+libm3u_la_LIBADD = @COMMON_LIBS@ 
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/plist/m3u/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign plugins/plist/m3u/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(mylibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(mylibdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
+	}
+
+uninstall-mylibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
+	done
+
+clean-mylibLTLIBRARIES:
+	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
+	@list='$(mylib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libm3u.la: $(libm3u_la_OBJECTS) $(libm3u_la_DEPENDENCIES) $(EXTRA_libm3u_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libm3u_la_LINK) -rpath $(mylibdir) $(libm3u_la_OBJECTS) $(libm3u_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m3u.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(mylibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-mylibLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-mylibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-mylibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-mylibLTLIBRARIES \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-mylibLTLIBRARIES
+
+
+# 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:

mpfc-2.0.tar.bz2/plugins/plist/m3u/m3u.c Added

@@ -0,0 +1,163 @@
+/******************************************************************
+ * Copyright (C) 2003 - 2011 by SG Software.
+ *
+ * SG MPFC. M3U playlist plugin.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "types.h"
+#include "plp.h"
+#include "logger.h"
+#include "pmng.h"
+#include "util.h"
+
+/* Logger */
+static logger_t *m3u_log = NULL;
+
+static char *m3u_desc = "m3u playlist plugin";
+
+/* Plugin author */
+static char *m3u_author = "Sergey E. Galanov <sgsoftware@mail.ru>";
+
+/* Get supported formats function */
+void m3u_get_formats( char *extensions, char *content_type )
+{
+	if (extensions != NULL)
+		strcpy(extensions, "m3u");
+	if (content_type != NULL)
+		strcpy(content_type, "");
+} /* End of 'm3u_get_formats' function */
+
+/* Read a number from m3u line */
+static int m3u_read_int( char **s )
+{
+	int res = 0;
+	while (isdigit(**s))
+	{
+		int d = (**s) - '0';
+		++(*s);
+		res *= 10;
+		res += d;
+	}
+	return res;
+} /* End of 'm3u_read_int' function */
+
+/* Parse playlist and handle its contents */
+plp_status_t m3u_for_each_item( char *pl_name, void *ctx, plp_func_t f )
+{
+	char str1024;
+	bool_t ext_info;
+
+	/* Try to open file */
+	FILE *fd = fopen(pl_name, "rt");
+	if (fd == NULL)
+	{
+		logger_error(m3u_log, 0, _("Unable to read %s file"), pl_name);
+		return PLP_STATUS_FAILED;
+	}
+
+	/* Read file head */
+	fgets(str, sizeof(str), fd);
+	ext_info = !strncmp(str, "#EXTM3U", 7);
+	if (!ext_info)
+		fseek(fd, 0, SEEK_SET);
+		
+	/* Read file contents */
+	plp_status_t res = PLP_STATUS_OK;
+	while (!feof(fd))
+	{
+		/* Read file name if no extended info is supplied */
+		if (!ext_info)
+		{
+			fgets(str, sizeof(str), fd);
+			if (feof(fd))
+				break;
+			util_del_nl(str, str);
+
+			song_metadata_t metadata = SONG_METADATA_EMPTY;
+			plp_status_t st = f(ctx, str, &metadata);
+			if (st != PLP_STATUS_OK)
+			{
+				res = st;
+				break;
+			}
+			continue;
+		}
+		
+		/* Read song length and title string */
+		fgets(str, sizeof(str), fd);
+		if (feof(fd) || strlen(str) < 10)
+			break;
+
+		/* Extract song length and starting position from string read */
+		char *s = &str8; /* skip '#EXTINF:' */
+		song_time_t song_len = SECONDS_TO_TIME(m3u_read_int(&s));
+		song_time_t song_start = -1;
+		if ((*s) == '-')
+		{
+			++s;
+			song_start = SECONDS_TO_TIME(m3u_read_int(&s));
+		}
+		if ((*s) == ',')
+			++s;
+		char *title = strdup(s);
+		util_del_nl(title, title);
+
+		/* Read song file name */
+		fgets(str, sizeof(str), fd);
+		util_del_nl(str, str);
+
+		song_metadata_t metadata = SONG_METADATA_EMPTY;
+		metadata.m_title = title;
+		metadata.m_len = song_len;
+		if (song_start >= 0)
+		{
+			metadata.m_start_time = song_start;
+			metadata.m_end_time = song_start + song_len - 1;
+		}
+		plp_status_t st = f(ctx, str, &metadata);
+		free(title);
+
+		if (st != PLP_STATUS_OK)
+		{
+			res = st;
+			break;
+		}
+	}
+
+	/* Close file */
+	fclose(fd);
+	return res;
+} /* End of 'm3u_for_each_item' function */
+
+/* Exchange data with main program */
+void plugin_exchange_data( plugin_data_t *pd )
+{
+	pd->m_desc = m3u_desc;
+	pd->m_author = m3u_author;
+	PLIST_DATA(pd)->m_get_formats = m3u_get_formats;
+	PLIST_DATA(pd)->m_for_each_item = m3u_for_each_item;
+	m3u_log = pd->m_logger;
+} /* End of 'plugin_exchange_data' function */
+
+/* End of 'm3u.c' file */
+

mpfc-2.0.tar.bz2/plugins/plist/pls Added

mpfc-2.0.tar.bz2/plugins/plist/pls/Makefile.am Added

mpfc-2.0.tar.bz2/plugins/plist/pls/Makefile.in Added

@@ -0,0 +1,715 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = plugins/plist/pls
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/mpfc-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
+  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
+    if (++n$$2 == $(am__install_max)) \
+      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
+    END { for (dir in files) print dir, filesdir }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(mylibdir)"
+LTLIBRARIES = $(mylib_LTLIBRARIES)
+libpls_la_DEPENDENCIES =
+am_libpls_la_OBJECTS = pls.lo
+libpls_la_OBJECTS = $(am_libpls_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libpls_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libpls_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libpls_la_SOURCES)
+DIST_SOURCES = $(libpls_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COMMON_LIBS = @COMMON_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_CFLAGS = @CURSES_CFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GENERAL_PLUGINS = @GENERAL_PLUGINS@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GPM_LIBS = @GPM_LIBS@
+GREP = @GREP@
+GSTREAMER_AUDIO_CFLAGS = @GSTREAMER_AUDIO_CFLAGS@
+GSTREAMER_AUDIO_LIBS = @GSTREAMER_AUDIO_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSON_CFLAGS = @JSON_CFLAGS@
+JSON_LIBS = @JSON_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MATH_LIBS = @MATH_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLIST_PLUGINS = @PLIST_PLUGINS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+RESOLV_LIBS = @RESOLV_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
+TAGLIB_LIBS = @TAGLIB_LIBS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+mylib_LTLIBRARIES = libpls.la
+mylibdir = $(libdir)/mpfc/plist
+libpls_la_SOURCES = pls.c 
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/libmpfcwnd
+libpls_la_LDFLAGS = -Xcompiler -nostartfiles -version-info 2:0
+libpls_la_LIBADD = @COMMON_LIBS@ 
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/plist/pls/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign plugins/plist/pls/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-mylibLTLIBRARIES: $(mylib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(mylibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(mylibdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mylibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mylibdir)"; \
+	}
+
+uninstall-mylibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(mylib_LTLIBRARIES)'; test -n "$(mylibdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mylibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mylibdir)/$$f"; \
+	done
+
+clean-mylibLTLIBRARIES:
+	-test -z "$(mylib_LTLIBRARIES)" || rm -f $(mylib_LTLIBRARIES)
+	@list='$(mylib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libpls.la: $(libpls_la_OBJECTS) $(libpls_la_DEPENDENCIES) $(EXTRA_libpls_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libpls_la_LINK) -rpath $(mylibdir) $(libpls_la_OBJECTS) $(libpls_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pls.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(mylibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-mylibLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-mylibLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-mylibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-mylibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-mylibLTLIBRARIES \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-mylibLTLIBRARIES
+
+
+# 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:

mpfc-2.0.tar.bz2/plugins/plist/pls/pls.c Added

@@ -0,0 +1,221 @@
+/******************************************************************
+ * Copyright (C) 2003 - 2011 by SG Software.
+ *
+ * SG MPFC. PLS playlist plugin.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "types.h"
+#include "plp.h"
+#include "logger.h"
+#include "pmng.h"
+#include "util.h"
+
+/* Logger */
+static logger_t *pls_log = NULL;
+
+static char *pls_desc = "pls playlist plugin";
+
+/* Plugin author */
+static char *pls_author = "Sergey E. Galanov <sgsoftware@mail.ru>";
+
+/* Get supported formats function */
+void pls_get_formats( char *extensions, char *content_type )
+{
+	if (extensions != NULL)
+		strcpy(extensions, "pls");
+	if (content_type != NULL)
+		strcpy(content_type, "");
+} /* End of 'pls_get_formats' function */
+
+/* Parse playlist and handle its contents */
+plp_status_t pls_for_each_item( char *pl_name, void *ctx, plp_func_t f )
+{
+	int num = 0;
+	char str1024;
+	int num_entries;
+	struct pls_entry_t
+	{
+		char *name;
+		char *title;
+		int len;
+	} *entries;
+	int i;
+
+	/* Try to open file */
+	FILE *fd = fopen(pl_name, "rt");
+	if (fd == NULL)
+	{
+		logger_error(pls_log, 0, _("Unable to open file %s"), pl_name);
+		return PLP_STATUS_FAILED;
+	}
+
+	/* Read header */
+	fgets(str, sizeof(str), fd);
+	util_del_nl(str, str);
+	if (strcasecmp(str, "playlist"))
+	{
+		fclose(fd);
+		logger_error(pls_log, 1, _("%s: missing play list header"), 
+				pl_name);
+		return PLP_STATUS_FAILED;
+	}
+
+	/* Read number of entries */
+	fgets(str, sizeof(str), fd);
+	util_del_nl(str, str);
+	if (strncasecmp(str, "numberofentries=", 16))
+	{
+		fclose(fd);
+		logger_error(pls_log, 1, _("%s: missing `numberofentries' tag"), 
+				pl_name);
+		return 0;
+	}
+	num_entries = atoi(strchr(str, '=') + 1);
+
+	/* Allocate memory for play list entries */
+	entries = (struct pls_entry_t *)malloc(sizeof(*entries) * num_entries);
+	if (entries == NULL)
+	{
+		fclose(fd);
+		logger_error(pls_log, 0, _("No enough memory"));
+		return 0;
+	}
+	memset(entries, 0, sizeof(*entries) * num_entries);
+
+	/* Read data */
+	while (!feof(fd))
+	{
+		char *value;
+		enum
+		{
+			FILE_NAME,
+			TITLE,
+			LENGTH
+		} type;
+		int index;
+		char *s = str;
+		
+		/* Read line */
+		fgets(str, sizeof(str), fd);
+		util_del_nl(str, str);
+
+		/* Determine line type */
+		if (!strncasecmp(s, "File", 4))
+		{
+			s += 4;
+			type = FILE_NAME;
+		}
+		else if (!strncasecmp(s, "Title", 5))
+		{
+			s += 5;
+			type = TITLE;
+		}
+		else if (!strncasecmp(s, "Length", 6))
+		{
+			s += 6;
+			type = LENGTH;
+		}
+		else
+		{
+			continue;
+		}
+
+		/* Extract index */
+		index = 0;
+		while (isdigit(*s))
+		{
+			index *= 10;
+			index += ((*s) - '0');
+			s ++;
+		}
+		index --;
+		if (index >= num_entries)
+			continue;
+
+		/* Extract value */
+		if ((*s) != '=')
+			continue;
+		else
+			s ++;
+		value = strdup(s);
+
+		/* Save entry */
+		if (type == FILE_NAME)
+			entriesindex.name = value;
+		else if (type == TITLE)
+			entriesindex.title = value;
+		else 
+		{
+			entriesindex.len = atoi(value);
+			free(value);
+		}
+	}
+
+	/* Close file */
+	fclose(fd);
+
+	/* Add the value to the play list */
+	plp_status_t res = PLP_STATUS_OK;
+	for ( i = 0; i < num_entries; i ++ )
+	{
+		char *name = entriesi.name;
+		char *title = entriesi.title;
+		int len = entriesi.len;
+
+		if (name != NULL)
+		{
+			song_metadata_t metadata = SONG_METADATA_EMPTY;
+			metadata.m_title = title;
+			metadata.m_len = len < 0 ? 0 : SECONDS_TO_TIME(len);
+			plp_status_t st = f(ctx, name, &metadata);
+
+			/* Free this entry */
+			free(name);
+			if (title != NULL)
+				free(title);
+
+			if (st != PLP_STATUS_OK)
+			{
+				res = st;
+				break;
+			}
+		}
+		else if (title != NULL)
+			free(title);
+	}
+	free(entries);
+	return res;
+} /* End of 'pls_for_each_item' function */
+
+/* Exchange data with main program */
+void plugin_exchange_data( plugin_data_t *pd )
+{
+	pd->m_desc = pls_desc;
+	pd->m_author = pls_author;
+	PLIST_DATA(pd)->m_get_formats = pls_get_formats;
+	PLIST_DATA(pd)->m_for_each_item = pls_for_each_item;
+	pls_log = pd->m_logger;
+} /* End of 'plugin_exchange_data' function */
+
+/* End of 'pls.c' file */
+

mpfc-1.3.8.1.tar.bz2/po/POTFILES.in -> mpfc-2.0.tar.bz2/po/POTFILES.in Changed

@@ -1,65 +1,54 @@
-libmpfc/cfg.c
-libmpfc/cfg_rcfile.c
-libmpfc/charset.c
-libmpfc/file.c
-libmpfc/file_http.c
-libmpfc/file_reg.c
-libmpfc/genre_list.c
-libmpfc/id3.c
 libmpfc/logger.c
 libmpfc/plugin.c
-libmpfc/plugin_charset.c
-libmpfc/plugin_effect.c
-libmpfc/plugin_input.c
-libmpfc/plugin_mng.c
-libmpfc/plugin_output.c
 libmpfc/song_info.c
+libmpfc/command.c
 libmpfc/string.c
 libmpfc/util.c
-libmpfc/vfs.c
-libmpfcwnd/wnd.c
+libmpfc/cfg.c
+libmpfc/plugin_mng.c
+libmpfc/plugin_plist.c
+libmpfc/cfg_rcfile.c
+libmpfc/plugin_general.c
 libmpfcwnd/wnd_basic.c
-libmpfcwnd/wnd_button.c
+libmpfcwnd/wnd.c
+libmpfcwnd/wnd_multiview_dialog.c
+libmpfcwnd/wnd_root.c
+libmpfcwnd/wnd_filebox.c
+libmpfcwnd/wnd_label.c
+libmpfcwnd/wnd_radio.c
+libmpfcwnd/wnd_hbox.c
+libmpfcwnd/wnd_repval.c
+libmpfcwnd/wnd_views.c
 libmpfcwnd/wnd_checkbox.c
-libmpfcwnd/wnd_class.c
-libmpfcwnd/wnd_combobox.c
 libmpfcwnd/wnd_def_handlers.c
-libmpfcwnd/wnd_dialog.c
-libmpfcwnd/wnd_dlgitem.c
+libmpfcwnd/wnd_listbox.c
 libmpfcwnd/wnd_editbox.c
-libmpfcwnd/wnd_filebox.c
-libmpfcwnd/wnd_hbox.c
+libmpfcwnd/wnd_dialog.c
+libmpfcwnd/wnd_print.c
+libmpfcwnd/wnd_class.c
+libmpfcwnd/wnd_msg.c
 libmpfcwnd/wnd_kbd.c
-libmpfcwnd/wnd_kbind.c
-libmpfcwnd/wnd_label.c
-libmpfcwnd/wnd_listbox.c
 libmpfcwnd/wnd_mouse.c
-libmpfcwnd/wnd_msg.c
-libmpfcwnd/wnd_multiview_dialog.c
-libmpfcwnd/wnd_print.c
-libmpfcwnd/wnd_radio.c
-libmpfcwnd/wnd_root.c
-libmpfcwnd/wnd_scrollable.c
+libmpfcwnd/wnd_combobox.c
+libmpfcwnd/wnd_button.c
+libmpfcwnd/wnd_dlgitem.c
 libmpfcwnd/wnd_vbox.c
-libmpfcwnd/wnd_views.c
-plugins/input/audiocd/audiocd.c
-plugins/input/audiocd/cddb.c
-plugins/input/mp3/mp3.c
-plugins/input/ogg/ogg.c
-plugins/input/ogg/vcedit.c
-plugins/input/wav/wav.c
-plugins/output/alsa/alsa.c
-plugins/output/disk_writer/writer.c
-plugins/output/oss/oss.c
-src/browser.c
-src/eqwnd.c
+libmpfcwnd/wnd_scrollable.c
+libmpfcwnd/wnd_kbind.c
+src/rd_with_notify.c
 src/help_screen.c
-src/history.c
+src/file_utils.c
 src/info_rw_thread.c
-src/logger_view.c
-src/main.c
-src/player.c
 src/plist.c
+src/metadata_io.c
 src/song.c
-src/test.c
+src/browser.c
 src/undo.c
+src/main.c
+src/history.c
+src/logger_view.c
+src/server.c
+src/test.c
+src/server_client.c
+src/json_helpers.c
+src/player.c

mpfc-1.3.8.1.tar.bz2/po/mpfc.pot -> mpfc-2.0.tar.bz2/po/mpfc.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-13 15:17+0300\n"
+"POT-Creation-Date: 2014-01-26 13:42+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,1217 +18,942 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: libmpfc/file_http.c:81
-#, c-format
-msgid "Getting address of host %s"
-msgstr ""
-
-#: libmpfc/file_http.c:87 libmpfc/file_http.c:101 libmpfc/file_http.c:158
-#: libmpfcwnd/wnd_dialog.c:89 plugins/input/mp3/mp3.c:984
-msgid "OK"
-msgstr ""
-
-#: libmpfc/file_http.c:97 plugins/input/audiocd/cddb.c:222
-#: plugins/input/audiocd/cddb.c:592
-#, c-format
-msgid "Connecting to %s"
-msgstr ""
-
-#: libmpfc/file_http.c:104
-#, c-format
-msgid "Sending request for file %s"
-msgstr ""
-
-#: libmpfc/file_http.c:113
-msgid "Getting HTTP header"
-msgstr ""
-
-#: libmpfc/file_http.c:174
-#, c-format
-msgid "Redirect to %s"
-msgstr ""
-
-#: libmpfc/file_http.c:183
-msgid "Failure"
-msgstr ""
-
-#: libmpfc/file_http.c:251 libmpfc/file_http.c:256
-#, c-format
-msgid "Filling buffer: %d%% done"
-msgstr ""
-
-#: libmpfc/plugin.c:89
+#: libmpfc/plugin.c:83
 #, c-format
 msgid "Plugin %s has no 'plugin_exchange_data'"
 msgstr ""
 
-#: libmpfc/vfs.c:143 libmpfc/vfs.c:246
+#: libmpfc/plugin_mng.c:124
 #, c-format
-msgid "Unable to read directory %s"
+msgid "Supported media file extensions: %s"
 msgstr ""
 
-#: libmpfc/vfs.c:215
-#, c-format
-msgid "Unable to stat file %s"
-msgstr ""
-
-#: libmpfcwnd/wnd.c:747
+#: libmpfcwnd/wnd.c:772
 msgid "No children\n"
 msgstr ""
 
-#: libmpfcwnd/wnd_dialog.c:91
-msgid "Cancel"
-msgstr ""
-
-#: plugins/input/audiocd/audiocd.c:565
-msgid "Configure AudioCD plugin"
-msgstr ""
-
-#: plugins/input/audiocd/audiocd.c:566
-msgid "CD &device: "
-msgstr ""
-
-#: plugins/input/audiocd/audiocd.c:568
-msgid "Use di&gital mode"
-msgstr ""
-
-#: plugins/input/audiocd/audiocd.c:570
-msgid "CDDB parameters"
-msgstr ""
-
-#: plugins/input/audiocd/audiocd.c:571
-msgid "&Host: "
-msgstr ""
-
-#: plugins/input/audiocd/audiocd.c:573
-msgid "&Email: "
-msgstr ""
-
-#: plugins/input/audiocd/audiocd.c:575
-msgid "Disc c&ategory: "
-msgstr ""
-
-#: plugins/input/audiocd/audiocd.c:630
-msgid "Reload info from CDDB"
-msgstr ""
-
-#: plugins/input/audiocd/audiocd.c:633
-msgid "Submit info to CDDB"
-msgstr ""
-
-#: plugins/input/audiocd/cddb.c:216 plugins/input/audiocd/cddb.c:586
-#, c-format
-msgid "Getting address of %s"
-msgstr ""
-
-#: plugins/input/audiocd/cddb.c:235
-msgid "Sending query to server"
-msgstr ""
-
-#: plugins/input/audiocd/cddb.c:269
-msgid "Saving data"
-msgstr ""
-
-#: plugins/input/audiocd/cddb.c:271
-msgid "Success"
-msgstr ""
-
-#: plugins/input/audiocd/cddb.c:274
-msgid "Failed!"
-msgstr ""
-
-#: plugins/input/audiocd/cddb.c:380 plugins/input/ogg/ogg.c:347
-#, c-format
-msgid "Unable to open file %s for writing"
-msgstr ""
-
-#: plugins/input/audiocd/cddb.c:562
-msgid "CDDB submit error: no existing info found"
-msgstr ""
-
-#: plugins/input/audiocd/cddb.c:571
-msgid "CDDB submit error: you must specify your email address"
-msgstr ""
-
-#: plugins/input/audiocd/cddb.c:578
-msgid "CDDB submit error: you must specify your category"
-msgstr ""
-
-#: plugins/input/audiocd/cddb.c:605
-msgid "Posting data to server"
-msgstr ""
-
-#: plugins/input/audiocd/cddb.c:616
-msgid "Getting response"
-msgstr ""
-
-#: plugins/input/audiocd/cddb.c:624
-msgid "Failure!"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:308
-msgid "Only regular files are supported for writing info by mp3 plugin"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:327
-msgid "Unable to create ID3 tag"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:483
-#, c-format
-msgid ""
-"MPEG %s, layer %i\n"
-"Bitrate: %lu kb/s\n"
-"Samplerate: %i Hz\n"
-"%s\n"
-"Error protection: %s\n"
-"Copyright: %s\n"
-"Original: %s\n"
-"Emphasis: %s"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:496 plugins/input/mp3/mp3.c:631
-msgid "Single channel"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:497 plugins/input/mp3/mp3.c:632
-msgid "Dual channel"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:498 plugins/input/mp3/mp3.c:633
-msgid "Joint Stereo"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:499 plugins/input/mp3/mp3.c:634
-msgid "Stereo"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:500 plugins/input/mp3/mp3.c:501
-#: plugins/input/mp3/mp3.c:502 plugins/input/mp3/mp3.c:635
-#: plugins/input/mp3/mp3.c:636 plugins/input/mp3/mp3.c:637
-msgid "Yes"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:500 plugins/input/mp3/mp3.c:501
-#: plugins/input/mp3/mp3.c:502 plugins/input/mp3/mp3.c:635
-#: plugins/input/mp3/mp3.c:636 plugins/input/mp3/mp3.c:637
-msgid "No"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:503 plugins/input/mp3/mp3.c:638
-msgid "None"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:505 plugins/input/mp3/mp3.c:640
-msgid "50/15 microseconds"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:505 plugins/input/mp3/mp3.c:640
-msgid "CCITT J.17"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:615
-#, c-format
-msgid ""
-"MPEG %s, layer %i\n"
-"Bitrate: %lu kb/s\n"
-"Samplerate: %i Hz\n"
-"%s\n"
-"Error protection: %s\n"
-"Copyright: %s\n"
-"Original: %s\n"
-"Emphasis: %s\n"
-"%s%i frames\n"
-"Length: %i seconds\n"
-"File size: %i bytes"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:641
-msgid "approx. "
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:963
-#, c-format
-msgid "Removing tag from file %s"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:1002
-msgid "Configure mp3 plugin"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:1004
-msgid "&Quick length calculation"
-msgstr ""
-
-#: plugins/input/mp3/mp3.c:1035
-msgid "Remove ID3 tags"
-msgstr ""
-
-#: plugins/input/ogg/ogg.c:281
-msgid "Only regular files are supported forwriting info by ogg plugin"
-msgstr ""
-
-#: plugins/input/ogg/ogg.c:308 src/plist.c:273
-#, c-format
-msgid "Unable to open file %s"
-msgstr ""
-
-#: plugins/input/ogg/ogg.c:379
-#, c-format
-msgid ""
-"Nominal bitrate: %li kb/s\n"
-"Samplerate: %li Hz\n"
-"Channels: %i"
-msgstr ""
-
-#: plugins/input/ogg/ogg.c:420
-#, c-format
-msgid ""
-"Nominal bitrate: %li kb/s\n"
-"Samplerate: %li Hz\n"
-"Channels: %i\n"
-"Length: %i seconds\n"
-"File size: %i bytes"
-msgstr ""
-
-#: plugins/input/ogg/ogg.c:450
-msgid "Configure OggVorbis plugin"
-msgstr ""
-
-#: plugins/input/ogg/ogg.c:452
-msgid "Always use &UTF-8"
-msgstr ""
-
-#: plugins/input/ogg/vcedit.c:220
-msgid "Input truncated or empty."
-msgstr ""
-
-#: plugins/input/ogg/vcedit.c:222
-msgid "Input is not an Ogg bitstream."
-msgstr ""
-
-#: plugins/input/ogg/vcedit.c:239
-msgid "Error reading first page of Ogg bitstream."
-msgstr ""
-
-#: plugins/input/ogg/vcedit.c:245
-msgid "Error reading initial header packet."
-msgstr ""
-
-#: plugins/input/ogg/vcedit.c:251
-msgid "Ogg bitstream does not contain vorbis data."
-msgstr ""
-
-#: plugins/input/ogg/vcedit.c:274
-msgid "Corrupt secondary header."
-msgstr ""
-
-#: plugins/input/ogg/vcedit.c:295
-msgid "EOF before end of vorbis headers."
+#: libmpfcwnd/wnd_repval.c:39
+msgid "Repeat value"
 msgstr ""
 
-#: plugins/input/ogg/vcedit.c:448
-msgid "Corrupt or missing data, continuing..."
+#: libmpfcwnd/wnd_repval.c:41
+msgid "Enter count &value for the next command: "
 msgstr ""
 
-#: plugins/input/ogg/vcedit.c:487
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr ""
-
-#: plugins/input/wav/wav.c:257
-#, c-format
-msgid ""
-"File size: %i bytes\n"
-"Length: %i seconds\n"
-"Bits/sample: %i\n"
-"Format: PCM\n"
-"Channels: %i\n"
-"Samplerate: %i Hz\n"
-"Bytes/sec: %i\n"
-"Block align: %i"
-msgstr ""
-
-#: plugins/output/alsa/alsa.c:545
-msgid "Configure ALSA plugin"
-msgstr ""
-
-#: plugins/output/alsa/alsa.c:546 plugins/output/oss/oss.c:181
-msgid "&Device: "
-msgstr ""
-
-#: plugins/output/disk_writer/writer.c:93
-#, c-format
-msgid "Unable to create file %s"
-msgstr ""
-
-#: plugins/output/disk_writer/writer.c:316
-#, c-format
-msgid "Encoding: %s"
-msgstr ""
-
-#: plugins/output/disk_writer/writer.c:319
-msgid "Encoder command failed"
-msgstr ""
-
-#: plugins/output/disk_writer/writer.c:357
-msgid "Configure disk writer plugin"
-msgstr ""
-
-#: plugins/output/disk_writer/writer.c:358
-msgid "P&ath to store: "
-msgstr ""
-
-#: plugins/output/disk_writer/writer.c:360
-msgid "Encoder"
-msgstr ""
-
-#: plugins/output/disk_writer/writer.c:361
-msgid "&Enable encoder"
-msgstr ""
-
-#: plugins/output/disk_writer/writer.c:363
-msgid "F&ragment size: "
-msgstr ""
-
-#: plugins/output/disk_writer/writer.c:365
-msgid "Encoder c&ommand: "
-msgstr ""
-
-#: plugins/output/oss/oss.c:180
-msgid "Configure OSS plugin"
-msgstr ""
-
-#: src/browser.c:90
-msgid "File browser"
-msgstr ""
-
-#: src/browser.c:139
-#, c-format
-msgid "Current directory is %s\n"
-msgstr ""
-
-#: src/browser.c:176
-msgid "Enter name you want to search: "
-msgstr ""
-
-#: src/browser.c:623
-msgid "Select files matching pattern"
-msgstr ""
-
-#: src/browser.c:624
-msgid "Deselect files matching pattern"
-msgstr ""
-
-#: src/browser.c:626
-msgid "P&attern: "
-msgstr ""
-
-#: src/browser.c:791
-msgid "File name"
-msgstr ""
-
-#: src/browser.c:797
-msgid "Title"
-msgstr ""
-
-#: src/browser.c:803
-msgid "Artist"
-msgstr ""
-
-#: src/browser.c:809
-msgid "Album"
-msgstr ""
-
-#: src/browser.c:815
-msgid "Year"
-msgstr ""
-
-#: src/browser.c:821
-msgid "Genre"
-msgstr ""
-
-#: src/browser.c:827
-msgid "Track"
-msgstr ""
-
-#: src/browser.c:833
-msgid "Time"
-msgstr ""
-
-#: src/browser.c:949
-msgid "Change directory"
-msgstr ""
-
-#: src/browser.c:950
-msgid "&Directory: "
-msgstr ""
-
-#: src/eqwnd.c:77
-msgid "MPFC Equalizer"
-msgstr ""
-
-#: src/eqwnd.c:214
-msgid "Load preset from a Winamp EQF file"
+#: libmpfcwnd/wnd_dialog.c:89
+msgid "OK"
 msgstr ""
 
-#: src/eqwnd.c:215 src/player.c:2174 src/player.c:2420
-msgid "&Name: "
+#: libmpfcwnd/wnd_dialog.c:91
+msgid "Cancel"
 msgstr ""
 
 #: src/help_screen.c:61
 msgid "MPFC Default Key Bindings"
 msgstr ""
 
-#: src/help_screen.c:62
-msgid "Equalizer Key Bindings"
-msgstr ""
-
-#: src/help_screen.c:63
+#: src/help_screen.c:61
 msgid "File Browser Key Bindings"
 msgstr ""
 
-#: src/help_screen.c:131
+#: src/help_screen.c:126
 msgid "Press <Space> to see next screen and <q> to exit\n"
 msgstr ""
 
-#: src/help_screen.c:165
+#: src/help_screen.c:160
 msgid "q:\t\t Quit program"
 msgstr ""
 
-#: src/help_screen.c:166 src/help_screen.c:239
+#: src/help_screen.c:161 src/help_screen.c:234
 msgid "j or <Down>:\t Move one line down"
 msgstr ""
 
-#: src/help_screen.c:167 src/help_screen.c:240
+#: src/help_screen.c:162 src/help_screen.c:235
 msgid "k or <Up>:\t Move one line up"
 msgstr ""
 
-#: src/help_screen.c:168 src/help_screen.c:241
+#: src/help_screen.c:163 src/help_screen.c:236
 msgid "u or <PgUp>:\t Move one screen up"
 msgstr ""
 
-#: src/help_screen.c:169 src/help_screen.c:242
+#: src/help_screen.c:164 src/help_screen.c:237
 msgid "d or <PgDn>:\t Move one screen down"
 msgstr ""
 
-#: src/help_screen.c:170
+#: src/help_screen.c:165
 msgid "gg:\t\t Move to play list begin"
 msgstr ""
 
-#: src/help_screen.c:171
+#: src/help_screen.c:166
 msgid "G:\t\t Move to play list end"
 msgstr ""
 
-#: src/help_screen.c:172
+#: src/help_screen.c:167
 msgid "<Number>G:\t Move to line <Number>"
 msgstr ""
 
-#: src/help_screen.c:173
+#: src/help_screen.c:168
 msgid "J:\t\t Move play list one line down"
 msgstr ""
 
-#: src/help_screen.c:174
+#: src/help_screen.c:169
 msgid "K:\t\t Move play list one line up"
 msgstr ""
 
-#: src/help_screen.c:175
+#: src/help_screen.c:170
 msgid "<Number>M:\t Move play list to line <Number>"
 msgstr ""
 
-#: src/help_screen.c:176
+#: src/help_screen.c:171
 msgid "<Ret>:\t\t Start playing"
 msgstr ""
 
-#: src/help_screen.c:177
+#: src/help_screen.c:172
 msgid "x:\t\t Play stopped song or start playing from begin"
 msgstr ""
 
-#: src/help_screen.c:179
+#: src/help_screen.c:174
 msgid "c:\t\t Pause/unpause"
 msgstr ""
 
-#: src/help_screen.c:180
+#: src/help_screen.c:175
 msgid "v:\t\t Stop playing"
 msgstr ""
 
-#: src/help_screen.c:181
+#: src/help_screen.c:176
 msgid "b:\t\t Next song"
 msgstr ""
 
-#: src/help_screen.c:182
+#: src/help_screen.c:177
 msgid "z:\t\t Previous song"
 msgstr ""
 
-#: src/help_screen.c:183
+#: src/help_screen.c:178
 msgid "<:\t\t Scroll song 10 seconds back"
 msgstr ""
 
-#: src/help_screen.c:184
+#: src/help_screen.c:179
 msgid ">:\t\t Scroll song 10 seconds forth"
 msgstr ""
 
-#: src/help_screen.c:185
+#: src/help_screen.c:180
 msgid "<Number>gt:\t Go to <Number>th second in song"
 msgstr ""
 
-#: src/help_screen.c:186
+#: src/help_screen.c:181
 msgid "+:\t\t Increase volume"
 msgstr ""
 
-#: src/help_screen.c:187
+#: src/help_screen.c:182
 msgid "-:\t\t Decrease volume"
 msgstr ""
 
-#: src/help_screen.c:188
+#: src/help_screen.c:183
 msgid ":\t\t Increase balance"
 msgstr ""
 
-#: src/help_screen.c:189
+#: src/help_screen.c:184
 msgid ":\t\t Decrease balance"
 msgstr ""
 
-#: src/help_screen.c:190
+#: src/help_screen.c:185
 msgid "i:\t\t Song info editor"
 msgstr ""
 
-#: src/help_screen.c:191
+#: src/help_screen.c:186
 msgid "a:\t\t Add songs"
 msgstr ""
 
-#: src/help_screen.c:192
+#: src/help_screen.c:187
 msgid "B:\t\t Launch file browser"
 msgstr ""
 
-#: src/help_screen.c:193
+#: src/help_screen.c:188
+msgid "A:\t\t Audio output setup"
+msgstr ""
+
+#: src/help_screen.c:189
 msgid "r:\t\t Remove songs"
 msgstr ""
 
-#: src/help_screen.c:194
+#: src/help_screen.c:190
 msgid "s:\t\t Save play list"
 msgstr ""
 
-#: src/help_screen.c:195
+#: src/help_screen.c:191
 msgid "S:\t\t Sort play list"
 msgstr ""
 
-#: src/help_screen.c:196
+#: src/help_screen.c:192
 msgid "P:\t\t Launch plugins manager"
 msgstr ""
 
-#: src/help_screen.c:197
+#: src/help_screen.c:193
 msgid "V:\t\t Start visual mode"
 msgstr ""
 
-#: src/help_screen.c:198
+#: src/help_screen.c:194
 msgid "C:\t\t Centrize view"
 msgstr ""
 
-#: src/help_screen.c:199
+#: src/help_screen.c:195
 msgid "/:\t\t Search"
 msgstr ""
 
-#: src/help_screen.c:200
+#: src/help_screen.c:196
 msgid "\\:\t\t Advanced search"
 msgstr ""
 
-#: src/help_screen.c:201
+#: src/help_screen.c:197
 msgid "n:\t\t Go to next search match"
 msgstr ""
 
-#: src/help_screen.c:202
+#: src/help_screen.c:198
 msgid "N:\t\t Go to previous search match"
 msgstr ""
 
-#: src/help_screen.c:203
-msgid "e:\t\t Launch equalizer window"
-msgstr ""
-
-#: src/help_screen.c:204
+#: src/help_screen.c:199
 msgid "R:\t\t Set/unset shuffle play mode"
 msgstr ""
 
-#: src/help_screen.c:205
+#: src/help_screen.c:200
 msgid "L:\t\t Set/unset loop play mode"
 msgstr ""
 
-#: src/help_screen.c:206
+#: src/help_screen.c:201
 msgid "o:\t\t Variables manager"
 msgstr ""
 
-#: src/help_screen.c:207
+#: src/help_screen.c:202
 msgid "O:\t\t Show logger window"
 msgstr ""
 
-#: src/help_screen.c:208
+#: src/help_screen.c:203
 msgid "U:\t\t Undo"
 msgstr ""
 
-#: src/help_screen.c:209
+#: src/help_screen.c:204
 msgid "D:\t\t Redo"
 msgstr ""
 
-#: src/help_screen.c:210
+#: src/help_screen.c:205
 msgid "I:\t\t Reload songs information"
 msgstr ""
 
-#: src/help_screen.c:211
+#: src/help_screen.c:206
 msgid "ps:\t\t Set play bounds"
 msgstr ""
 
-#: src/help_screen.c:212
+#: src/help_screen.c:207
 msgid "p<Ret>:\t\t Set play bounds and play"
 msgstr ""
 
-#: src/help_screen.c:213
+#: src/help_screen.c:208
 msgid "pc:\t\t Clear play bounds"
 msgstr ""
 
-#: src/help_screen.c:214
+#: src/help_screen.c:209
 msgid "!:\t\t Execute command"
 msgstr ""
 
-#: src/help_screen.c:215
+#: src/help_screen.c:210
 msgid "m<Letter>:\t Set mark <Letter>"
 msgstr ""
 
-#: src/help_screen.c:216
+#: src/help_screen.c:211
 msgid "`<Letter>:\t Go to mark <Letter>"
 msgstr ""
 
-#: src/help_screen.c:217
+#: src/help_screen.c:212
 msgid "``:\t\t Go to previous position"
 msgstr ""
 
-#: src/help_screen.c:218
+#: src/help_screen.c:213
 msgid "<Backspace>:\t Go to previous time"
 msgstr ""
 
-#: src/help_screen.c:220
+#: src/help_screen.c:215
 msgid "Window library bindings"
 msgstr ""
 
-#: src/help_screen.c:221
+#: src/help_screen.c:216
 msgid "^l:\t\t Redisplay screen"
 msgstr ""
 
-#: src/help_screen.c:222
+#: src/help_screen.c:217
 msgid "<Alt>-,:\t Set focus to previous window"
 msgstr ""
 
-#: src/help_screen.c:223
+#: src/help_screen.c:218
 msgid "<Alt>-.:\t Set focus to next window"
 msgstr ""
 
-#: src/help_screen.c:224
+#: src/help_screen.c:219
 msgid "<Alt>-c:\t Close window"
 msgstr ""
 
-#: src/help_screen.c:225
+#: src/help_screen.c:220
 msgid "<Alt>-m:\t Maximize/minimize window"
 msgstr ""
 
-#: src/help_screen.c:226
+#: src/help_screen.c:221
 msgid "<Alt>-p:\t Change window position"
 msgstr ""
 
-#: src/help_screen.c:227
+#: src/help_screen.c:222
 msgid "<Alt>-s:\t Change window size"
 msgstr ""
 
-#: src/help_screen.c:228
+#: src/help_screen.c:223
 msgid "<Alt>-<letter>:\t Set focus to a dialog item marked by letter"
 msgstr ""
 
-#: src/help_screen.c:230
+#: src/help_screen.c:225
 msgid "<Ctrl>-g:\t Close dialog window"
 msgstr ""
 
-#: src/help_screen.c:232 src/help_screen.c:254 src/help_screen.c:266
+#: src/help_screen.c:227 src/help_screen.c:249
 msgid "?:\t\t This help screen"
 msgstr ""
 
-#: src/help_screen.c:238
+#: src/help_screen.c:233
 msgid "q:\t\t Return to player"
 msgstr ""
 
-#: src/help_screen.c:243
+#: src/help_screen.c:238
 msgid "<Ret>:\t\t Go to the highlighted directory"
 msgstr ""
 
-#: src/help_screen.c:244
+#: src/help_screen.c:239
 msgid "h:\t\t Go to home directory"
 msgstr ""
 
-#: src/help_screen.c:245
+#: src/help_screen.c:240
 msgid "<Backspace>:\t Move to parent directory"
 msgstr ""
 
-#: src/help_screen.c:246
+#: src/help_screen.c:241
 msgid "<Insert>:\t Select/deselect file"
 msgstr ""
 
-#: src/help_screen.c:247
+#: src/help_screen.c:242
 msgid "+:\t\t Select files matching a pattern"
 msgstr ""
 
-#: src/help_screen.c:248
+#: src/help_screen.c:243
 msgid "-:\t\t Deselect files matching a pattern"
 msgstr ""
 
-#: src/help_screen.c:249
+#: src/help_screen.c:244
 msgid "a:\t\t Add selected files to playlist"
 msgstr ""
 
-#: src/help_screen.c:250
+#: src/help_screen.c:245
 msgid "r:\t\t Replace playlist files with the selected"
 msgstr ""
 
-#: src/help_screen.c:251
+#: src/help_screen.c:246
 msgid "c:\t\t Change directory"
 msgstr ""
 
-#: src/help_screen.c:252
+#: src/help_screen.c:247
 msgid "i:\t\t Toggle song info mode"
 msgstr ""
 
-#: src/help_screen.c:253
+#: src/help_screen.c:248
 msgid "s:\t\t Toggle search mode"
 msgstr ""
 
-#: src/help_screen.c:260
-msgid "q or <Esc>:\t Return to player"
+#: src/plist.c:629
+#, c-format
+msgid "%i/%i song; %i:%02i:%02i/%i:%02i:%02i"
+msgid_plural "%i/%i songs; %i:%02i:%02i/%i:%02i:%02i"
+msgstr0 ""
+msgstr1 ""
+
+#: src/plist.c:1024
+#, c-format
+msgid ""
+"Unable to add '%s' because nesting level is too high. It is likely to be a "
+"recursive playlist"
+msgstr ""
+
+#: src/song.c:335
+#, c-format
+msgid "Failed to save info to file %s"
+msgstr ""
+
+#: src/browser.c:93
+msgid "File browser"
+msgstr ""
+
+#: src/browser.c:142
+#, c-format
+msgid "Current directory is %s\n"
 msgstr ""
 
-#: src/help_screen.c:261
-msgid "h or <Left>:\t Move cursor left"
+#: src/browser.c:179
+msgid "Enter name you want to search: "
 msgstr ""
 
-#: src/help_screen.c:262
-msgid "l or <Right>:\t Move cursor right"
+#: src/browser.c:646
+msgid "Select files matching pattern"
 msgstr ""
 
-#: src/help_screen.c:263
-msgid "j or <Down>:\t Move cursor down"
+#: src/browser.c:647
+msgid "Deselect files matching pattern"
 msgstr ""
 
-#: src/help_screen.c:264
-msgid "k or <Up>:\t Move cursor up"
+#: src/browser.c:649
+msgid "P&attern: "
 msgstr ""
 
-#: src/help_screen.c:265
-msgid "p:\t\t Load Winamp EQF preset"
+#: src/browser.c:817
+msgid "File name"
 msgstr ""
 
-#: src/logger_view.c:61
-msgid "Log"
+#: src/browser.c:823
+msgid "Title"
+msgstr ""
+
+#: src/browser.c:829
+msgid "Artist"
+msgstr ""
+
+#: src/browser.c:835
+msgid "Album"
+msgstr ""
+
+#: src/browser.c:841
+msgid "Year"
+msgstr ""
+
+#: src/browser.c:847
+msgid "Genre"
+msgstr ""
+
+#: src/browser.c:853
+msgid "Track"
 msgstr ""
 
-#: src/main.c:47
+#: src/browser.c:859
+msgid "Time"
+msgstr ""
+
+#: src/browser.c:964
+msgid "Change directory"
+msgstr ""
+
+#: src/browser.c:965
+msgid "&Directory: "
+msgstr ""
+
+#: src/main.c:51
 #, c-format
 msgid ""
 "A fatal error occured during player initialization. See log for details\n"
 msgstr ""
 
-#: src/player.c:200
+#: src/logger_view.c:61
+msgid "Log"
+msgstr ""
+
+#: src/server.c:63 src/server.c:73
+msgid "No enough memory!"
+msgstr ""
+
+#: src/server.c:81
+#, c-format
+msgid "Connection notification pipe create failed: %s"
+msgstr ""
+
+#: src/server.c:133
+#, c-format
+msgid "Starting the server at port %d"
+msgstr ""
+
+#: src/server.c:140
+#, c-format
+msgid "Server socket creation failed: %s"
+msgstr ""
+
+#: src/server.c:155
+#, c-format
+msgid "Server socket bind at port %d failed: %s"
+msgstr ""
+
+#: src/server.c:161
+#, c-format
+msgid "Server listening at port %d"
+msgstr ""
+
+#: src/server.c:167
+#, c-format
+msgid "Server socket listen failed: %s"
+msgstr ""
+
+#: src/server.c:177
+#, c-format
+msgid "Server notification pipe create failed: %s"
+msgstr ""
+
+#: src/server.c:187
+#, c-format
+msgid "Server thread create failed: %s"
+msgstr ""
+
+#: src/server.c:267
+#, c-format
+msgid "Server select failed: %s"
+msgstr ""
+
+#: src/server.c:287
+#, c-format
+msgid "Server socket accept failed: %s"
+msgstr ""
+
+#: src/server.c:292
+msgid "Received a connection"
+msgstr ""
+
+#: src/server.c:306
+#, c-format
+msgid "Server connection thread create failed: %s"
+msgstr ""
+
+#: src/server.c:386
+#, c-format
+msgid "Connection select failed: %s"
+msgstr ""
+
+#: src/server.c:425
+msgid "Closing connection"
+msgstr ""
+
+#: src/player.c:191
+msgid "unable to parse player state"
+msgstr ""
+
+#: src/player.c:278
 #, c-format
 msgid "Unable to initialize configuration"
 msgstr ""
 
-#: src/player.c:208
+#: src/player.c:286
 #, c-format
 msgid "Unable to initialize log system"
 msgstr ""
 
-#: src/player.c:213
+#: src/player.c:291
 #, c-format
 msgid ""
 "MPFC %s Log\n"
 "%s"
 msgstr ""
 
-#: src/player.c:220 src/plist.c:305
+#: src/player.c:298
 msgid "No enough memory"
 msgstr ""
 
-#: src/player.c:242
+#: src/player.c:320
 msgid "Window system initialization failed"
 msgstr ""
 
-#: src/player.c:252
+#: src/player.c:337
 msgid "Unable to initialize play list window"
 msgstr ""
 
-#: src/player.c:268
+#: src/player.c:353
 msgid "Unable to initialize plugin manager"
 msgstr ""
 
-#: src/player.c:279
-msgid "Unable to initialize VFS module"
-msgstr ""
-
-#: src/player.c:288
+#: src/player.c:364
 msgid "Unable to initialize info read/write thread"
 msgstr ""
 
-#: src/player.c:297
+#: src/player.c:373
 msgid "Unable to initialize undo list"
 msgstr ""
 
-#: src/player.c:305
+#: src/player.c:381
 msgid "Play list initialization failed"
 msgstr ""
 
-#: src/player.c:316
+#: src/player.c:392
 msgid "Unable to initialize set of files for play list"
 msgstr ""
 
-#: src/player.c:338
+#: src/player.c:414
 msgid "Unable to initialize player thread"
 msgstr ""
 
-#: src/player.c:365
+#: src/player.c:426
 msgid "Player initialized"
 msgstr ""
 
-#: src/player.c:384
+#: src/player.c:451
 msgid "Play list"
 msgstr ""
 
-#: src/player.c:504
+#: src/player.c:556
 msgid "Left MPFC"
 msgstr ""
 
-#: src/player.c:947 src/player.c:2967 src/player.c:3008
+#: src/player.c:707
+#, c-format
+msgid "creating directory %s\n"
+msgstr ""
+
+#: src/player.c:963 src/player.c:2883 src/player.c:2924
 #, c-format
 msgid "String `%s' not found"
 msgstr ""
 
-#: src/player.c:951 src/player.c:2971 src/player.c:3012
+#: src/player.c:967 src/player.c:2887 src/player.c:2928
 #, c-format
 msgid "String `%s' found at position %d"
 msgstr ""
 
-#: src/player.c:1343
+#: src/player.c:1238
 msgid "SG Software Media Player For Console"
 msgstr ""
 
-#: src/player.c:1346 src/player.c:1383
+#: src/player.c:1244 src/player.c:1285
 msgid "Shuffle"
 msgstr ""
 
-#: src/player.c:1347 src/player.c:1384
+#: src/player.c:1245 src/player.c:1286
 msgid "Loop"
 msgstr ""
 
-#: src/player.c:1367
+#: src/player.c:1265
 #, c-format
 msgid "version %s"
 msgstr ""
 
-#: src/player.c:1852
+#: src/player.c:1424 src/player.c:1833
+msgid "gstreamer: gst_element_seek returned FALSE"
+msgstr ""
+
+#: src/player.c:1523
 #, c-format
-msgid "Input plugin for file %s failed"
+msgid "setting volume to %lg%% (linear = %lg%%)"
 msgstr ""
 
-#: src/player.c:1879
-msgid "Output plugin initialization failed"
+#: src/player.c:1640
+#, c-format
+msgid "gstreamer error: %s"
+msgstr ""
+
+#: src/player.c:1728
+#, c-format
+msgid "Audio sink %s could not be created"
+msgstr ""
+
+#: src/player.c:1781
+msgid "g_main_loop_new failed"
+msgstr ""
+
+#: src/player.c:1788
+msgid "gstreamer: unable to create playbin"
 msgstr ""
 
-#: src/player.c:2095
+#: src/player.c:1811
+msgid "gst_pipeline_get_bus failed"
+msgstr ""
+
+#: src/player.c:1888
+#, c-format
+msgid "stopping at time %lld(%lld) with end_time=%lld."
+msgstr ""
+
+#: src/player.c:1952
 msgid "Add songs"
 msgstr ""
 
-#: src/player.c:2096 src/player.c:2111
+#: src/player.c:1953 src/player.c:1967
 msgid "File &name: "
 msgstr ""
 
-#: src/player.c:2110
+#: src/player.c:1966
 msgid "Save play list"
 msgstr ""
 
-#: src/player.c:2124
+#: src/player.c:1980
 msgid "Execute external command"
 msgstr ""
 
-#: src/player.c:2125
+#: src/player.c:1981
 msgid "C&ommand: "
 msgstr ""
 
-#: src/player.c:2139
+#: src/player.c:1995
 msgid "Sort play list"
 msgstr ""
 
-#: src/player.c:2140
+#: src/player.c:1996
 msgid "Sort by"
 msgstr ""
 
-#: src/player.c:2141 src/player.c:2449
+#: src/player.c:1997 src/player.c:2422
 msgid "&Title"
 msgstr ""
 
-#: src/player.c:2142
+#: src/player.c:1998
 msgid "&File name"
 msgstr ""
 
-#: src/player.c:2143
+#: src/player.c:1999
 msgid "P&ath and file name"
 msgstr ""
 
-#: src/player.c:2144 src/player.c:2455
+#: src/player.c:2000 src/player.c:2428
 msgid "T&rack"
 msgstr ""
 
-#: src/player.c:2145
+#: src/player.c:2001
 msgid "&Only selected area"
 msgstr ""
 
-#: src/player.c:2176
+#: src/player.c:2028 src/player.c:2303
+msgid "&Name: "
+msgstr ""
+
+#: src/player.c:2030
 msgid "&Artist: "
 msgstr ""
 
-#: src/player.c:2178
+#: src/player.c:2032
 msgid "A&lbum: "
 msgstr ""
 
-#: src/player.c:2180
+#: src/player.c:2034
 msgid "&Year: "
 msgstr ""
 
-#: src/player.c:2182
+#: src/player.c:2036
 msgid "&Track No: "
 msgstr ""
 
-#: src/player.c:2184
+#: src/player.c:2038
 msgid "C&omments: "
 msgstr ""
 
-#: src/player.c:2186
+#: src/player.c:2040
 msgid "&Genre: "
 msgstr ""
 
-#: src/player.c:2189
+#: src/player.c:2043
+msgid "Full path: "
+msgstr ""
+
+#: src/player.c:2046
 msgid "&Reload info"
 msgstr ""
 
-#: src/player.c:2252
+#: src/player.c:2138
 msgid "Write in&fo in all the selected songs"
 msgstr ""
 
-#: src/player.c:2403
+#: src/player.c:2286
 msgid "Search"
 msgstr ""
 
-#: src/player.c:2404 src/player.c:2445
+#: src/player.c:2287 src/player.c:2418
 msgid "S&tring: "
 msgstr ""
 
-#: src/player.c:2419
+#: src/player.c:2302
 msgid "Variables manager"
 msgstr ""
 
-#: src/player.c:2423
+#: src/player.c:2306
 msgid "&Value: "
 msgstr ""
 
-#: src/player.c:2426
+#: src/player.c:2309
 msgid "Vie&w current value"
 msgstr ""
 
-#: src/player.c:2428
+#: src/player.c:2311
 msgid "Operation"
 msgstr ""
 
-#: src/player.c:2429
+#: src/player.c:2312
 msgid "S&et"
 msgstr ""
 
-#: src/player.c:2430
+#: src/player.c:2313
 msgid "&Add"
 msgstr ""
 
-#: src/player.c:2431
+#: src/player.c:2314
 msgid "&Remove"
 msgstr ""
 
-#: src/player.c:2444
+#: src/player.c:2352
+msgid "Audio output setup"
+msgstr ""
+
+#: src/player.c:2353
+msgid "&Sink name: "
+msgstr ""
+
+#: src/player.c:2356
+msgid "&Device name: "
+msgstr ""
+
+#: src/player.c:2361
+msgid ""
+"\n"
+"You can specify GStreamer sink (e.g. alsasink) and \n"
+"device here. Device can only be set if sink is specified.\n"
+"If the sink is configured by some other properties, you can set \n"
+"them directly with gstreamer.audio-sink-params.* variables.\n"
+msgstr ""
+
+#: src/player.c:2386
+msgid "&Don't show this anymore"
+msgstr ""
+
+#: src/player.c:2396
+msgid "Welcome"
+msgstr ""
+
+#: src/player.c:2397
+msgid ""
+"Welcome to MPFC, Music Player For Console!\n"
+"To close this window, press <Enter>, and then '?' to see key bindings.\n"
+"For more help please see the full documentation."
+msgstr ""
+
+#: src/player.c:2405
+msgid "Error"
+msgstr ""
+
+#: src/player.c:2417
 msgid "Advanced search"
 msgstr ""
 
-#: src/player.c:2448
+#: src/player.c:2421
 msgid "Search in"
 msgstr ""
 
-#: src/player.c:2450
+#: src/player.c:2423
 msgid "&Name"
 msgstr ""
 
-#: src/player.c:2451
+#: src/player.c:2424
 msgid "&Artist"
 msgstr ""
 
-#: src/player.c:2452
+#: src/player.c:2425
 msgid "A&lbum"
 msgstr ""
 
-#: src/player.c:2453
+#: src/player.c:2426
 msgid "&Year"
 msgstr ""
 
-#: src/player.c:2454
+#: src/player.c:2427
 msgid "&Genre"
 msgstr ""
 
-#: src/player.c:2456
+#: src/player.c:2429
 msgid "C&omment"
 msgstr ""
 
-#: src/player.c:2470
+#: src/player.c:2443
 #, c-format
 msgid "Removed %d song"
 msgid_plural "Removed %d songs"
 msgstr0 ""
 msgstr1 ""
 
-#: src/player.c:2478
+#: src/player.c:2451
 msgid "Reload info"
 msgstr ""
 
-#: src/player.c:2479
+#: src/player.c:2452
 msgid "&Only in selected area"
 msgstr ""
 
-#: src/player.c:2492
+#: src/player.c:2465
 msgid "Run/stop test"
 msgstr ""
 
-#: src/player.c:2493
+#: src/player.c:2466
 msgid "Tests"
 msgstr ""
 
-#: src/player.c:2494
+#: src/player.c:2467
 msgid "Test &1. Window library perfomance"
 msgstr ""
 
-#: src/player.c:2496
+#: src/player.c:2469
 msgid "&Stop job"
 msgstr ""
 
-#: src/player.c:2539
-msgid "Input"
-msgstr ""
-
-#: src/player.c:2540
-msgid "&Input"
-msgstr ""
-
-#: src/player.c:2543
-msgid "Output"
-msgstr ""
-
-#: src/player.c:2544
-msgid "&Output"
-msgstr ""
-
-#: src/player.c:2547
-msgid "Effect"
+#: src/player.c:2509
+msgid "Playlist"
 msgstr ""
 
-#: src/player.c:2548
-msgid "&Effect"
+#: src/player.c:2510
+msgid "&Playlist"
 msgstr ""
 
-#: src/player.c:2551
+#: src/player.c:2513
 msgid "General"
 msgstr ""
 
-#: src/player.c:2552
+#: src/player.c:2514
 msgid "&General"
 msgstr ""
 
-#: src/player.c:2555
-msgid "Charset"
-msgstr ""
-
-#: src/player.c:2556
-msgid "C&harset"
-msgstr ""
-
-#: src/player.c:2561
+#: src/player.c:2519
 msgid "Plugins manager"
 msgstr ""
 
-#: src/player.c:2621
-msgid "Effect is ena&bled"
-msgstr ""
-
-#: src/player.c:2631
+#: src/player.c:2571
 msgid "&Description: "
 msgstr ""
 
-#: src/player.c:2635
+#: src/player.c:2575
 msgid "&Author: "
 msgstr ""
 
-#: src/player.c:2638
+#: src/player.c:2578
 msgid "Con&figure"
 msgstr ""
 
-#: src/player.c:2645 src/player.c:2690
+#: src/player.c:2585 src/player.c:2627
 msgid "S&tart"
 msgstr ""
 
-#: src/player.c:2689
+#: src/player.c:2626
 msgid "S&top"
 msgstr ""
 
-#: src/player.c:2720
+#: src/player.c:2657
 #, c-format
 msgid "Play list saved to %s"
 msgstr ""
 
-#: src/player.c:2723
+#: src/player.c:2660
 #, c-format
 msgid "Unable to save play list to %s (try naming it as a .m3u file)"
 msgstr ""
 
-#: src/player.c:2734
+#: src/player.c:2671
 msgid ""
 "\n"
 "&#x1b;0;32;40mPress enter to continue"
 msgstr ""
 
-#: src/player.c:2743
+#: src/player.c:2680
 msgid "Command execution failed"
 msgstr ""
 
-#: src/player.c:2751
+#: src/player.c:2688
 msgid "Writing to console failed"
 msgstr ""
-
-#: src/plist.c:195
-#, c-format
-msgid "Unable to read %s file"
-msgstr ""
-
-#: src/plist.c:283
-#, c-format
-msgid "%s: missing play list header"
-msgstr ""
-
-#: src/plist.c:294
-#, c-format
-msgid "%s: missing `numberofentries' tag"
-msgstr ""
-
-#: src/plist.c:899
-#, c-format
-msgid "%i/%i song; %i:%02i:%02i/%i:%02i:%02i"
-msgid_plural "%i/%i songs; %i:%02i:%02i/%i:%02i:%02i"
-msgstr0 ""
-msgstr1 ""
-
-#: src/song.c:259
-#, c-format
-msgid "Failed to save info to file %s"
-msgstr ""

mpfc-1.3.8.1.tar.bz2/po/ru.gmo -> mpfc-2.0.tar.bz2/po/ru.gmo Changed

mpfc-1.3.8.1.tar.bz2/po/ru.po -> mpfc-2.0.tar.bz2/po/ru.po Changed

@@ -1,1325 +1,978 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2003-2014 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Sergey E. Galanov <sgsoftware@mail.ru>, 2003.
+# Sergey E. Galanov <sergey.e.galanov@gmail.com>, 2003-2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mpfc 1.3.5\n"
+"Project-Id-Version: mpfc 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-13 15:17+0300\n"
-"PO-Revision-Date: 2003-02-13 09:15+0300\n"
-"Last-Translator: Sergey E. Galanov <sgsoftware@mail.ru>\n"
-"Language-Team: Russian <sgsoftware@mail.ru>\n"
+"POT-Creation-Date: 2014-01-26 13:42+0400\n"
+"PO-Revision-Date: 2013-11-16 19:47+0300\n"
+"Last-Translator: Sergey E. Galanov <sergey.e.galanov@gmail.com>\n"
+"Language-Team: Russian <sergey.e.galanov@gmail.com>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=KOI8-R\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; \tplural=n%10==1 && n%100!=11 ? 0 : \tn%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-# c-format
-#: libmpfc/file_http.c:81
-#, c-format
-msgid "Getting address of host %s"
-msgstr "ðÏÌÕÞÁÀ ÁÄÒÅÓ %s"
-
-#: libmpfc/file_http.c:87 libmpfc/file_http.c:101 libmpfc/file_http.c:158
-#: libmpfcwnd/wnd_dialog.c:89 plugins/input/mp3/mp3.c:984
-msgid "OK"
-msgstr "OK"
-
-#: libmpfc/file_http.c:97 plugins/input/audiocd/cddb.c:222
-#: plugins/input/audiocd/cddb.c:592
-#, c-format
-msgid "Connecting to %s"
-msgstr "ðÏÄËÌÀÞÁÀÓØ Ë %s"
-
-# c-format
-#: libmpfc/file_http.c:104
-#, c-format
-msgid "Sending request for file %s"
-msgstr "ïÔÐÒÁ×ÌÑÀ ÚÁÐÒÏÓ ÎÁ ÆÁÊÌ %s"
-
-#: libmpfc/file_http.c:113
-msgid "Getting HTTP header"
-msgstr "ðÏÌÕÞÁÀ ÚÁÇÏÌÏ×ÏË HTTP"
-
-# c-format
-#: libmpfc/file_http.c:174
-#, c-format
-msgid "Redirect to %s"
-msgstr "ðÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ Ë %s"
-
-#: libmpfc/file_http.c:183
-msgid "Failure"
-msgstr "ïÂÌÏÍ!"
-
-#: libmpfc/file_http.c:251 libmpfc/file_http.c:256
-#, c-format
-msgid "Filling buffer: %d%% done"
-msgstr "úÁÐÏÌÎÑÀ ÂÕÆÅÒ: %d%%"
-
-#: libmpfc/plugin.c:89
+#: libmpfc/plugin.c:83
 #, c-format
 msgid "Plugin %s has no 'plugin_exchange_data'"
-msgstr "ðÌÁÇÉÎ %s ÎÅ ÉÍÅÅÔ 'plugin_exchange_data'"
-
-#: libmpfc/vfs.c:143 libmpfc/vfs.c:246
-#, c-format
-msgid "Unable to read directory %s"
-msgstr "îÅ ÍÏÇÕ ÐÒÏÞÉÔÁÔØ ËÁÔÁÌÏÇ %s"
+msgstr "ÐÐ»Ð°Ð³Ð¸Ð½ %s Ð½Ðµ Ð¸Ð¼ÐµÐµÑ 'plugin_exchange_data'"
 
-#: libmpfc/vfs.c:215
+#: libmpfc/plugin_mng.c:124
 #, c-format
-msgid "Unable to stat file %s"
-msgstr "îÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÆÁÊÌÅ %s"
+msgid "Supported media file extensions: %s"
+msgstr "ÐÐ¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐµ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ Ð¼ÐµÐ´Ð¸Ð° ÑÐ°Ð¹Ð»Ð¾Ð²: %s"
 
-#: libmpfcwnd/wnd.c:747
+#: libmpfcwnd/wnd.c:772
 msgid "No children\n"
-msgstr "îÅÔ ÄÅÔÅÊ\n"
-
-#: libmpfcwnd/wnd_dialog.c:91
-msgid "Cancel"
-msgstr "ïÔÍÅÎÁ"
-
-#: plugins/input/audiocd/audiocd.c:565
-msgid "Configure AudioCD plugin"
-msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ ÐÌÁÇÉÎÁ AudioCD"
-
-#: plugins/input/audiocd/audiocd.c:566
-msgid "CD &device: "
-msgstr "õÓÔÒÏÊÓÔ×Ï CD (&d): "
-
-#: plugins/input/audiocd/audiocd.c:568
-msgid "Use di&gital mode"
-msgstr ""
-
-#: plugins/input/audiocd/audiocd.c:570
-msgid "CDDB parameters"
-msgstr "ðÁÒÁÍÅÔÒÙ CDDB"
-
-#: plugins/input/audiocd/audiocd.c:571
-msgid "&Host: "
-msgstr "èÏÓÔ (&h): "
-
-#: plugins/input/audiocd/audiocd.c:573
-msgid "&Email: "
-msgstr "&Email: "
-
-#: plugins/input/audiocd/audiocd.c:575
-msgid "Disc c&ategory: "
-msgstr "ëÁÔÅÇÏÒÉÑ ÄÉÓËÁ (&a): "
-
-#: plugins/input/audiocd/audiocd.c:630
-msgid "Reload info from CDDB"
-msgstr "úÁÇÒÕÚÉÔØ ÉÎÆÏÒÍÁÃÉÀ ÉÚ CDDB"
-
-#: plugins/input/audiocd/audiocd.c:633
-msgid "Submit info to CDDB"
-msgstr "ïÔÐÒÁ×ÉÔØ ÉÎÆÏÒÍÁÃÉÀ × CDDB"
-
-#: plugins/input/audiocd/cddb.c:216 plugins/input/audiocd/cddb.c:586
-#, c-format
-msgid "Getting address of %s"
-msgstr "ðÏÌÕÞÁÀ ÁÄÒÅÓ %s"
-
-#: plugins/input/audiocd/cddb.c:235
-msgid "Sending query to server"
-msgstr "ïÔÐÒÁ×ÌÑÀ ÚÁÐÒÏÓ ÓÅÒ×ÅÒÕ"
-
-#: plugins/input/audiocd/cddb.c:269
-msgid "Saving data"
-msgstr "óÏÈÒÁÎÑÀ ÄÁÎÎÙÅ"
-
-#: plugins/input/audiocd/cddb.c:271
-msgid "Success"
-msgstr "õÓÐÅÈ"
-
-#: plugins/input/audiocd/cddb.c:274
-msgid "Failed!"
-msgstr "ïÂÌÏÍ!"
-
-#: plugins/input/audiocd/cddb.c:380 plugins/input/ogg/ogg.c:347
-#, fuzzy, c-format
-msgid "Unable to open file %s for writing"
-msgstr "îÅ ÍÏÇÕ ÓÏÚÄÁÔØ ÆÁÊÌ %s"
-
-#: plugins/input/audiocd/cddb.c:562
-msgid "CDDB submit error: no existing info found"
-msgstr "ïÛÉÂËÁ ÏÔÐÒÁ×ËÉ CDDB: ÎÅ ÎÁÊÄÅÎÏ ÓÕÝÅÓÔ×ÕÀÝÅÊ ÉÎÆÏÒÍÁÃÉÉ"
-
-#: plugins/input/audiocd/cddb.c:571
-msgid "CDDB submit error: you must specify your email address"
-msgstr "ïÛÉÂËÁ ÏÔÐÒÁ×ËÉ CDDB: ×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ Ó×ÏÊ ÁÄÒÅÓ email"
-
-#: plugins/input/audiocd/cddb.c:578
-msgid "CDDB submit error: you must specify your category"
-msgstr "ïÛÉÂËÁ ÏÔÐÒÁ×ËÉ CDDB: ×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ËÁÔÅÇÏÒÉÀ"
-
-#: plugins/input/audiocd/cddb.c:605
-msgid "Posting data to server"
-msgstr "ïÔÐÒÁ×ÌÑÀ ÄÁÎÎÙÅ Ë ÓÅÒ×ÅÒÕ"
-
-#: plugins/input/audiocd/cddb.c:616
-msgid "Getting response"
-msgstr "ðÏÌÕÞÁÀ ÏÔ×ÅÔ"
-
-#: plugins/input/audiocd/cddb.c:624
-msgid "Failure!"
-msgstr "ïÂÌÏÍ!"
-
-#: plugins/input/mp3/mp3.c:308
-msgid "Only regular files are supported for writing info by mp3 plugin"
-msgstr "ðÌÁÇÉÎ mp3 ÍÏÖÅÔ ÐÉÓÁÔØ ÉÎÆÏÒÍÁÃÉÀ ÔÏÌØËÏ × ÏÂÙÞÎÙÅ ÆÁÊÌÙ"
-
-#: plugins/input/mp3/mp3.c:327
-msgid "Unable to create ID3 tag"
-msgstr "îÅ ÍÏÇÕ ÓÏÚÄÁÔØ ÔÅÇ ID3"
-
-#: plugins/input/mp3/mp3.c:483
-#, fuzzy, c-format
-msgid ""
-"MPEG %s, layer %i\n"
-"Bitrate: %lu kb/s\n"
-"Samplerate: %i Hz\n"
-"%s\n"
-"Error protection: %s\n"
-"Copyright: %s\n"
-"Original: %s\n"
-"Emphasis: %s"
-msgstr ""
-"MPEG %s, layer %i\n"
-"âÉÔÒÅÊÔ: %i ËÂ/Ó\n"
-"þÁÓÔÏÔÁ ÓÜÍÐÌÏ×: %i çÃ\n"
-"%s\n"
-"úÁÝÉÔÁ ÏÔ ÏÛÉÂÏË: %s\n"
-"ëÏÐÉÒÁÊÔ: %s\n"
-"ðÏÄÌÉÎÎÙÊ: %s\n"
-"áËÃÅÎÔ: %s"
-
-#: plugins/input/mp3/mp3.c:496 plugins/input/mp3/mp3.c:631
-msgid "Single channel"
-msgstr "ïÄÉÎ ËÁÎÁÌ"
-
-#: plugins/input/mp3/mp3.c:497 plugins/input/mp3/mp3.c:632
-msgid "Dual channel"
-msgstr "ä×Á ËÁÎÁÌÁ"
-
-#: plugins/input/mp3/mp3.c:498 plugins/input/mp3/mp3.c:633
-msgid "Joint Stereo"
-msgstr "ïÂßÅÄÉÎÅÎÎÏÅ ÓÔÅÒÅÏ"
-
-#: plugins/input/mp3/mp3.c:499 plugins/input/mp3/mp3.c:634
-msgid "Stereo"
-msgstr "óÔÅÒÅÏ"
-
-#: plugins/input/mp3/mp3.c:500 plugins/input/mp3/mp3.c:501
-#: plugins/input/mp3/mp3.c:502 plugins/input/mp3/mp3.c:635
-#: plugins/input/mp3/mp3.c:636 plugins/input/mp3/mp3.c:637
-msgid "Yes"
-msgstr "äÁ"
-
-#: plugins/input/mp3/mp3.c:500 plugins/input/mp3/mp3.c:501
-#: plugins/input/mp3/mp3.c:502 plugins/input/mp3/mp3.c:635
-#: plugins/input/mp3/mp3.c:636 plugins/input/mp3/mp3.c:637
-msgid "No"
-msgstr "îÅÔ"
-
-#: plugins/input/mp3/mp3.c:503 plugins/input/mp3/mp3.c:638
-msgid "None"
-msgstr "îÅÔ"
-
-#: plugins/input/mp3/mp3.c:505 plugins/input/mp3/mp3.c:640
-msgid "50/15 microseconds"
-msgstr "50/15 ÍÉËÒÏÓÅËÕÎÄ"
-
-#: plugins/input/mp3/mp3.c:505 plugins/input/mp3/mp3.c:640
-msgid "CCITT J.17"
-msgstr "CCITT J.17"
-
-# c-format
-#: plugins/input/mp3/mp3.c:615
-#, fuzzy, c-format
-msgid ""
-"MPEG %s, layer %i\n"
-"Bitrate: %lu kb/s\n"
-"Samplerate: %i Hz\n"
-"%s\n"
-"Error protection: %s\n"
-"Copyright: %s\n"
-"Original: %s\n"
-"Emphasis: %s\n"
-"%s%i frames\n"
-"Length: %i seconds\n"
-"File size: %i bytes"
-msgstr ""
-"MPEG %s, layer %i\n"
-"âÉÔÒÅÊÔ: %i ËÂ/Ó\n"
-"þÁÓÔÏÔÁ ÓÜÍÐÌÏ×: %i çÃ\n"
-"%s\n"
-"úÁÝÉÔÁ ÏÔ ÏÛÉÂÏË: %s\n"
-"ëÏÐÉÒÁÊÔ: %s\n"
-"ðÏÄÌÉÎÎÙÊ: %s\n"
-"áËÃÅÎÔ: %s\n"
-"%s%i ÆÒÅÊÍÏ×\n"
-"äÌÉÎÁ: %i ÓÅËÕÎÄ\n"
-"òÁÚÍÅÒ ÆÁÊÌÁ: %i ÂÁÊÔ"
-
-#: plugins/input/mp3/mp3.c:641
-msgid "approx. "
-msgstr "ÐÒÉÍÅÒÎÏ "
-
-#: plugins/input/mp3/mp3.c:963
-#, c-format
-msgid "Removing tag from file %s"
-msgstr "õÄÁÌÑÀ ÔÅÇ ÉÚ ÆÁÊÌÁ %s"
-
-#: plugins/input/mp3/mp3.c:1002
-msgid "Configure mp3 plugin"
-msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ ÐÌÁÇÉÎÁ mp3"
-
-#: plugins/input/mp3/mp3.c:1004
-msgid "&Quick length calculation"
-msgstr "âÙÓÔÒÏÅ ×ÙÞÉÓÌÅÎÉÅ ÄÌÉÎÙ (&q)"
-
-#: plugins/input/mp3/mp3.c:1035
-msgid "Remove ID3 tags"
-msgstr "õÄÁÌÉÔØ ÔÅÇÉ ID3"
-
-#: plugins/input/ogg/ogg.c:281
-msgid "Only regular files are supported forwriting info by ogg plugin"
-msgstr ""
-
-#: plugins/input/ogg/ogg.c:308 src/plist.c:273
-#, c-format
-msgid "Unable to open file %s"
-msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ %s"
-
-#: plugins/input/ogg/ogg.c:379
-#, fuzzy, c-format
-msgid ""
-"Nominal bitrate: %li kb/s\n"
-"Samplerate: %li Hz\n"
-"Channels: %i"
-msgstr ""
-"îÏÍÉÎÁÌØÎÙÊ ÂÉÔÒÅÊÔ: %i ËÂ/Ó\n"
-"þÁÓÔÏÔÁ ÓÜÍÐÌÏ×: %i çÃ\n"
-"þÉÓÌÏ ËÁÎÁÌÏ×: %i"
-
-#: plugins/input/ogg/ogg.c:420
-#, fuzzy, c-format
-msgid ""
-"Nominal bitrate: %li kb/s\n"
-"Samplerate: %li Hz\n"
-"Channels: %i\n"
-"Length: %i seconds\n"
-"File size: %i bytes"
-msgstr ""
-"îÏÍÉÎÁÌØÎÙÊ ÂÉÔÒÅÊÔ: %i ËÂ/Ó\n"
-"þÁÓÔÏÔÁ ÓÜÍÐÌÏ×: %i çÃ\n"
-"þÉÓÌÏ ËÁÎÁÌÏ×: %i\n"
-"äÌÉÎÁ: %i ÓÅËÕÎÄ\n"
-"òÁÚÍÅÒ ÆÁÊÌÁ: %i ÂÁÊÔ"
-
-#: plugins/input/ogg/ogg.c:450
-msgid "Configure OggVorbis plugin"
-msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ ÐÌÁÇÉÎÁ OggVorbis"
-
-#: plugins/input/ogg/ogg.c:452
-msgid "Always use &UTF-8"
-msgstr "÷ÓÅÇÄÁ ÉÓÐÏÌØÚÏ×ÁÔØ &UTF-8"
-
-#: plugins/input/ogg/vcedit.c:220
-msgid "Input truncated or empty."
-msgstr "÷×ÏÄ ÏÂÒÅÚÁÎ ÉÌÉ ÐÕÓÔ."
-
-#: plugins/input/ogg/vcedit.c:222
-msgid "Input is not an Ogg bitstream."
-msgstr "÷×ÏÄ ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÔÏËÏÍ Ogg."
-
-#: plugins/input/ogg/vcedit.c:239
-msgid "Error reading first page of Ogg bitstream."
-msgstr "ïÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÐÅÒ×ÏÊ ÓÔÒÁÎÉÃÙ ÐÏÔÏËÁ Ogg."
-
-#: plugins/input/ogg/vcedit.c:245
-msgid "Error reading initial header packet."
-msgstr "ïÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÎÁÞÁÌØÎÏÇÏ ÐÁËÅÔÁ ÚÁÇÏÌÏ×ËÁ."
-
-#: plugins/input/ogg/vcedit.c:251
-msgid "Ogg bitstream does not contain vorbis data."
-msgstr "ðÏÔÏË Ogg ÎÅ ÓÏÄÅÒÖÉÔ ÄÁÎÎÙÈ vorbis."
-
-#: plugins/input/ogg/vcedit.c:274
-msgid "Corrupt secondary header."
-msgstr "÷ÔÏÒÉÞÎÙÊ ÚÁÇÏÌÏ×ÏË ÐÏ×ÒÅÖÄÅÎ."
-
-#: plugins/input/ogg/vcedit.c:295
-msgid "EOF before end of vorbis headers."
-msgstr "ëÏÎÅÃ ÆÁÊÌÁ ÐÅÒÅÄ ËÏÎÃÏÍ ÚÁÇÏÌÏ×ËÏ× vorbis."
-
-#: plugins/input/ogg/vcedit.c:448
-msgid "Corrupt or missing data, continuing..."
-msgstr "äÁÎÎÙÅ ÐÏ×ÒÅÖÄÅÎÙ ÉÌÉ ÏÔÓÕÔÓÔ×ÕÀÔ, ÐÒÏÄÏÌÖÁÀ..."
-
-#: plugins/input/ogg/vcedit.c:487
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr "ïÛÉÂËÁ ÐÒÉ ÚÁÐÉÓÉ ÐÏÔÏËÁ. ÷ÙÈÏÄÎÏÊ ÐÏÔÏË ÐÏ×ÒÅÖÄÅÎ ÉÌÉ ÏÂÒÅÚÁÎ."
-
-#: plugins/input/wav/wav.c:257
-#, c-format
-msgid ""
-"File size: %i bytes\n"
-"Length: %i seconds\n"
-"Bits/sample: %i\n"
-"Format: PCM\n"
-"Channels: %i\n"
-"Samplerate: %i Hz\n"
-"Bytes/sec: %i\n"
-"Block align: %i"
-msgstr ""
-"òÁÚÍÅÒ ÆÁÌÁ: %i ÂÁÊÔ\n"
-"äÌÉÎÁ: %i ÓÅËÕÎÄ\n"
-"âÉÔ/ÓÜÍÐÌ: %i\n"
-"æÏÒÍÁÔ: PCM\n"
-"þÉÓÌÏ ËÁÎÁÌÏ×: %i\n"
-"þÁÓÔÏÔÁ ÓÜÍÐÌÏ×: %i\n"
-"âÁÊÔ/ÓÅË: %i\n"
-"÷ÙÒÁ×ÎÉ×ÁÎÉÅ ÂÌÏËÁ: %i"
-
-#: plugins/output/alsa/alsa.c:545
-msgid "Configure ALSA plugin"
-msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ ÐÌÁÇÉÎÁ alsa"
-
-#: plugins/output/alsa/alsa.c:546 plugins/output/oss/oss.c:181
-msgid "&Device: "
-msgstr "õÓÔÒÏÊÓÔ×Ï (&d): "
-
-#: plugins/output/disk_writer/writer.c:93
-#, c-format
-msgid "Unable to create file %s"
-msgstr "îÅ ÍÏÇÕ ÓÏÚÄÁÔØ ÆÁÊÌ %s"
-
-#: plugins/output/disk_writer/writer.c:316
-#, c-format
-msgid "Encoding: %s"
-msgstr ""
-
-#: plugins/output/disk_writer/writer.c:319
-#, fuzzy
-msgid "Encoder command failed"
-msgstr "ëÏÍÁÎÄÁ (&o): "
-
-#: plugins/output/disk_writer/writer.c:357
-msgid "Configure disk writer plugin"
-msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ ÐÌÁÇÉÎÁ disk writer"
-
-#: plugins/output/disk_writer/writer.c:358
-msgid "P&ath to store: "
-msgstr "ðÕÔØ Ë ËÁÔÁÌÏÇÕ (&a): "
-
-#: plugins/output/disk_writer/writer.c:360
-msgid "Encoder"
-msgstr ""
-
-#: plugins/output/disk_writer/writer.c:361
-msgid "&Enable encoder"
-msgstr ""
-
-#: plugins/output/disk_writer/writer.c:363
-msgid "F&ragment size: "
-msgstr ""
-
-#: plugins/output/disk_writer/writer.c:365
-#, fuzzy
-msgid "Encoder c&ommand: "
-msgstr "ëÏÍÁÎÄÁ (&o): "
-
-#: plugins/output/oss/oss.c:180
-msgid "Configure OSS plugin"
-msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ ÐÌÁÇÉÎÁ OSS"
-
-#: src/browser.c:90
-msgid "File browser"
-msgstr "âÒÁÕÚÅÒ ÆÁÊÌÏ×"
-
-#: src/browser.c:139
-#, c-format
-msgid "Current directory is %s\n"
-msgstr "ôÅËÕÝÉÊ ËÁÔÁÌÏÇ %s\n"
+msgstr "ÐÐµÑ Ð´ÐµÑÐµÐ¹\n"
 
-#: src/browser.c:176
-msgid "Enter name you want to search: "
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ, ËÏÔÏÒÏÅ ×Ù ÈÏÔÉÔÅ ÉÓËÁÔØ: "
-
-#: src/browser.c:623
-msgid "Select files matching pattern"
-msgstr "÷ÙÂÒÁÔØ ÆÁÊÌÙ, ÕÄÏ×ÌÅÔ×ÏÒÑÀÝÉÅ ÛÁÂÌÏÎÕ"
-
-#: src/browser.c:624
-msgid "Deselect files matching pattern"
-msgstr "óÎÑÔØ ×ÙÄÅÌÅÎÉÅ Ó ÆÁÊÌÏ×, ÕÄÏ×ÌÅÔ×ÏÒÑÀÝÉÈ ÛÁÂÌÏÎÕ"
-
-#: src/browser.c:626
-msgid "P&attern: "
-msgstr "ûÁÂÌÏÎ (&a): "
-
-#: src/browser.c:791
-msgid "File name"
-msgstr "éÍÑ ÆÁÊÌÁ"
-
-#: src/browser.c:797
-msgid "Title"
-msgstr "îÁÚ×ÁÎÉÅ"
-
-#: src/browser.c:803
-msgid "Artist"
-msgstr "éÓÐÏÌÎÉÔÅÌØ"
-
-#: src/browser.c:809
-msgid "Album"
-msgstr "áÌØÂÏÍ"
-
-#: src/browser.c:815
-msgid "Year"
-msgstr "çÏÄ"
-
-#: src/browser.c:821
-msgid "Genre"
-msgstr "öÁÎÒ"
-
-#: src/browser.c:827
-msgid "Track"
-msgstr "ôÒÅË"
-
-#: src/browser.c:833
-msgid "Time"
-msgstr "÷ÒÅÍÑ"
-
-#: src/browser.c:949
-msgid "Change directory"
-msgstr "óÍÅÎÉÔØ ËÁÔÁÌÏÇ"
+#: libmpfcwnd/wnd_repval.c:39
+msgid "Repeat value"
+msgstr "ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð¿Ð¾Ð²ÑÐ¾ÑÐ°"
 
-#: src/browser.c:950
-msgid "&Directory: "
-msgstr "ëÁÔÁÌÏÇ (&d): "
-
-#: src/eqwnd.c:77
-msgid "MPFC Equalizer"
-msgstr "üË×ÁÌÁÊÚÅÒ MPFC"
+#: libmpfcwnd/wnd_repval.c:41
+msgid "Enter count &value for the next command: "
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ ÑÑÐµÑÑÐ¸Ðº Ð¿Ð¾Ð²ÑÐ¾ÑÐµÐ½Ð¸Ð¹ Ð´Ð»Ñ ÑÐ»ÐµÐ´ÑÑÑÐµÐ¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ (&v): "
 
-#: src/eqwnd.c:214
-msgid "Load preset from a Winamp EQF file"
-msgstr "úÁÇÒÕÚÉÔØ ÐÒÅÓÅÔ ÉÚ ÆÁÊÌÁ Winamp EQF"
+#: libmpfcwnd/wnd_dialog.c:89
+msgid "OK"
+msgstr "OK"
 
-#: src/eqwnd.c:215 src/player.c:2174 src/player.c:2420
-msgid "&Name: "
-msgstr "éÍÑ (&n): "
+#: libmpfcwnd/wnd_dialog.c:91
+msgid "Cancel"
+msgstr "ÐÑÐ¼ÐµÐ½Ð°"
 
 #: src/help_screen.c:61
 msgid "MPFC Default Key Bindings"
-msgstr "óÔÁÎÄÁÒÔÎÙÅ ËÌÁ×ÉÛÉ MPFC"
+msgstr "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ MPFC"
 
-#: src/help_screen.c:62
-msgid "Equalizer Key Bindings"
-msgstr "ëÌÁ×ÉÛÉ ÜË×ÁÌÁÊÚÅÒÁ"
-
-#: src/help_screen.c:63
+#: src/help_screen.c:61
 msgid "File Browser Key Bindings"
-msgstr "ëÌÁ×ÉÛÉ ÆÁÊÌÏ×ÏÇÏ ÂÒÏÕÚÅÒÁ"
+msgstr "ÐÐ»Ð°Ð²Ð¸ÑÐ¸ ÑÐ°Ð¹Ð»Ð¾Ð²Ð¾Ð³Ð¾ Ð±ÑÐ¾ÑÐ·ÐµÑÐ°"
 
-#: src/help_screen.c:131
+#: src/help_screen.c:126
 msgid "Press <Space> to see next screen and <q> to exit\n"
-msgstr "îÁÖÍÉÔÅ <ðÒÏÂÅÌ>, ÞÔÏÂÙ Õ×ÉÄÅÔØ ÓÌÅÄÕÀÝÉÊ ÜËÒÁÎ, É <q>, ÞÔÏÂÙ ×ÙÊÔÉ\n"
+msgstr "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ <ÐÑÐ¾Ð±ÐµÐ»>, ÑÑÐ¾Ð±Ñ ÑÐ²Ð¸Ð´ÐµÑÑ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ð¹ ÑÐºÑÐ°Ð½, Ð¸ <q>, ÑÑÐ¾Ð±Ñ Ð²ÑÐ¹ÑÐ¸\n"
 
-#: src/help_screen.c:165
+#: src/help_screen.c:160
 msgid "q:\t\t Quit program"
-msgstr "q:\t\t ÷ÙÊÔÉ ÉÚ ÐÒÏÇÒÁÍÍÙ"
+msgstr "q:\t\t ÐÑÐ¹ÑÐ¸ Ð¸Ð· Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ"
 
-#: src/help_screen.c:166 src/help_screen.c:239
+#: src/help_screen.c:161 src/help_screen.c:234
 msgid "j or <Down>:\t Move one line down"
-msgstr "j ÉÌÉ <÷ÎÉÚ>:\t óÐÕÓÔÉÔØÓÑ ÎÁ ÏÄÎÕ ÓÔÒÏËÕ"
+msgstr "j Ð¸Ð»Ð¸ <ÐÐ½Ð¸Ð·>:\t Ð¡Ð¿ÑÑÑÐ¸ÑÑÑÑ Ð½Ð° Ð¾Ð´Ð½Ñ ÑÑÑÐ¾ÐºÑ"
 
-#: src/help_screen.c:167 src/help_screen.c:240
+#: src/help_screen.c:162 src/help_screen.c:235
 msgid "k or <Up>:\t Move one line up"
-msgstr "k ÉÌÉ <÷×ÅÒÈ>:\t ðÏÄÎÑÔØÓÑ ÎÁ ÏÄÎÕ ÓÔÒÏËÕ"
+msgstr "k Ð¸Ð»Ð¸ <ÐÐ²ÐµÑÑ>:\t ÐÐ¾Ð´Ð½ÑÑÑÑÑ Ð½Ð° Ð¾Ð´Ð½Ñ ÑÑÑÐ¾ÐºÑ"
 
-#: src/help_screen.c:168 src/help_screen.c:241
+#: src/help_screen.c:163 src/help_screen.c:236
 msgid "u or <PgUp>:\t Move one screen up"
-msgstr "u ÉÌÉ <PgUp>:\t ðÏÄÎÑÔØÓÑ ÎÁ ÏÄÉÎ ÜËÒÁÎ"
+msgstr "u Ð¸Ð»Ð¸ <PgUp>:\t ÐÐ¾Ð´Ð½ÑÑÑÑÑ Ð½Ð° Ð¾Ð´Ð¸Ð½ ÑÐºÑÐ°Ð½"
 
-#: src/help_screen.c:169 src/help_screen.c:242
+#: src/help_screen.c:164 src/help_screen.c:237
 msgid "d or <PgDn>:\t Move one screen down"
-msgstr "d ÉÌÉ <PgDn>:\t óÐÕÓÔÉÔØÓÑ ÎÁ ÏÄÉÎ ÜËÒÁÎ"
+msgstr "d Ð¸Ð»Ð¸ <PgDn>:\t Ð¡Ð¿ÑÑÑÐ¸ÑÑÑÑ Ð½Ð° Ð¾Ð´Ð¸Ð½ ÑÐºÑÐ°Ð½"
 
-#: src/help_screen.c:170
+#: src/help_screen.c:165
 msgid "gg:\t\t Move to play list begin"
-msgstr "gg:\t\t ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÐÌÅÊ-ÌÉÓÔÁ"
+msgstr "gg:\t\t ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑÑÑ Ð² Ð½Ð°ÑÐ°Ð»Ð¾ Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑÐ°"
 
-#: src/help_screen.c:171
+#: src/help_screen.c:166
 msgid "G:\t\t Move to play list end"
-msgstr "G:\t\t ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅÃ ÐÌÅÊ-ÌÉÓÔÁ"
+msgstr "G:\t\t ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑÑÑ Ð² ÐºÐ¾Ð½ÐµÑ Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑÐ°"
 
-#: src/help_screen.c:172
+#: src/help_screen.c:167
 msgid "<Number>G:\t Move to line <Number>"
-msgstr "<þÉÓÌÏ>G:\t ðÅÒÅÍÅÓÔÉÔØÓÑ ÎÁ ÓÔÒÏËÕ <þÉÓÌÏ>"
+msgstr "<Ð§Ð¸ÑÐ»Ð¾>G:\t ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑÑÑ Ð½Ð° ÑÑÑÐ¾ÐºÑ <Ð§Ð¸ÑÐ»Ð¾>"
 
-#: src/help_screen.c:173
+#: src/help_screen.c:168
 msgid "J:\t\t Move play list one line down"
-msgstr "J:\t\t ïÐÕÓÔÉÔØ ÐÌÅÊ-ÌÉÓÔ ÎÁ ÓÔÒÏËÕ"
+msgstr "J:\t\t ÐÐ¿ÑÑÑÐ¸ÑÑ Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑ Ð½Ð° ÑÑÑÐ¾ÐºÑ"
 
-#: src/help_screen.c:174
+#: src/help_screen.c:169
 msgid "K:\t\t Move play list one line up"
-msgstr "K:\t\t ðÏÄÎÑÔØ ÐÌÅÊ-ÌÉÓÔ ÎÁ ÓÔÒÏËÕ"
+msgstr "K:\t\t ÐÐ¾Ð´Ð½ÑÑÑ Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑ Ð½Ð° ÑÑÑÐ¾ÐºÑ"
 
-#: src/help_screen.c:175
+#: src/help_screen.c:170
 msgid "<Number>M:\t Move play list to line <Number>"
-msgstr "<þÉÓÌÏ>M:\t ðÅÒÅÍÅÓÔÉÔØ ÐÌÅÊ-ÌÉÓÔ × ÓÔÒÏËÕ <þÉÓÌÏ>"
+msgstr "<Ð§Ð¸ÑÐ»Ð¾>M:\t ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑ Ð² ÑÑÑÐ¾ÐºÑ <Ð§Ð¸ÑÐ»Ð¾>"
 
-#: src/help_screen.c:176
+#: src/help_screen.c:171
 msgid "<Ret>:\t\t Start playing"
-msgstr "<Ret>:\t\t îÁÞÁÔØ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÅ"
+msgstr "<Ret>:\t\t ÐÐ°ÑÐ°ÑÑ Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ"
 
-#: src/help_screen.c:177
+#: src/help_screen.c:172
 msgid "x:\t\t Play stopped song or start playing from begin"
-msgstr "x:\t\t ÷ÏÓÐÒÏÉÚ×ÏÄÉÔ ÏÓÔÁÎÏ×ÌÅÎÎÕÀ ÐÅÓÎÀ ÉÌÉ ÎÁÞÁÔØ ÓÎÁÞÁÌÁ"
+msgstr "x:\t\t ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÑÑÐ¸ Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÑ Ð¿ÐµÑÐ½Ñ Ð¸Ð»Ð¸ Ð½Ð°ÑÐ°ÑÑ ÑÐ½Ð°ÑÐ°Ð»Ð°"
 
-#: src/help_screen.c:179
+#: src/help_screen.c:174
 msgid "c:\t\t Pause/unpause"
-msgstr "c:\t\t ðÁÕÚÁ/ÐÒÏÄÏÌÖÅÎÉÅ"
+msgstr "c:\t\t ÐÐ°ÑÐ·Ð°/Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/help_screen.c:180
+#: src/help_screen.c:175
 msgid "v:\t\t Stop playing"
-msgstr "v:\t\t ïÓÔÁÎÏ×ÉÔØ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÅ"
+msgstr "v:\t\t ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ"
 
-#: src/help_screen.c:181
+#: src/help_screen.c:176
 msgid "b:\t\t Next song"
-msgstr "b:\t\t óÌÅÄÕÀÝÁÑ ÐÅÓÎÑ"
+msgstr "b:\t\t Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ Ð¿ÐµÑÐ½Ñ"
 
-#: src/help_screen.c:182
+#: src/help_screen.c:177
 msgid "z:\t\t Previous song"
-msgstr "z:\t\t ðÒÅÄÙÄÕÝÁÑ ÐÅÓÎÑ"
+msgstr "z:\t\t ÐÑÐµÐ´ÑÐ´ÑÑÐ°Ñ Ð¿ÐµÑÐ½Ñ"
 
-#: src/help_screen.c:183
+#: src/help_screen.c:178
 msgid "<:\t\t Scroll song 10 seconds back"
-msgstr "<:\t\t óÍÅÓÔÉÔØÓÑ ÎÁ 10 ÓÅËÕÎÄ ÎÁÚÁÄ"
+msgstr "<:\t\t Ð¡Ð¼ÐµÑÑÐ¸ÑÑÑÑ Ð½Ð° 10 ÑÐµÐºÑÐ½Ð´ Ð½Ð°Ð·Ð°Ð´"
 
-#: src/help_screen.c:184
+#: src/help_screen.c:179
 msgid ">:\t\t Scroll song 10 seconds forth"
-msgstr ">:\t\t óÍÅÓÔÉÔØÓÑ ÎÁ 10 ÓÅËÕÎÄ ×ÐÅÒÅÄ"
+msgstr ">:\t\t Ð¡Ð¼ÐµÑÑÐ¸ÑÑÑÑ Ð½Ð° 10 ÑÐµÐºÑÐ½Ð´ Ð²Ð¿ÐµÑÐµÐ´"
 
-#: src/help_screen.c:185
+#: src/help_screen.c:180
 msgid "<Number>gt:\t Go to <Number>th second in song"
-msgstr "<þÉÓÌÏ>gt:\t óÍÅÓÔÉÔØÓÑ Ë ÓÅËÕÎÄÅ <þÉÓÌÏ>"
+msgstr "<Ð§Ð¸ÑÐ»Ð¾>gt:\t Ð¡Ð¼ÐµÑÑÐ¸ÑÑÑÑ Ðº ÑÐµÐºÑÐ½Ð´Ðµ <Ð§Ð¸ÑÐ»Ð¾>"
 
-#: src/help_screen.c:186
+#: src/help_screen.c:181
 msgid "+:\t\t Increase volume"
-msgstr "+:\t\t õ×ÅÌÉÞÉÔØ ÇÒÏÍËÏÓÔØ"
+msgstr "+:\t\t Ð£Ð²ÐµÐ»Ð¸ÑÐ¸ÑÑ Ð³ÑÐ¾Ð¼ÐºÐ¾ÑÑÑ"
 
-#: src/help_screen.c:187
+#: src/help_screen.c:182
 msgid "-:\t\t Decrease volume"
-msgstr "-:\t\t õÍÅÎØÛÉÔØ ÇÒÏÍËÏÓÔØ"
+msgstr "-:\t\t Ð£Ð¼ÐµÐ½ÑÑÐ¸ÑÑ Ð³ÑÐ¾Ð¼ÐºÐ¾ÑÑÑ"
 
-#: src/help_screen.c:188
+#: src/help_screen.c:183
 msgid ":\t\t Increase balance"
-msgstr ":\t\t õ×ÅÌÉÞÉÔØ ÂÁÌÁÎÓ"
+msgstr ":\t\t Ð£Ð²ÐµÐ»Ð¸ÑÐ¸ÑÑ Ð±Ð°Ð»Ð°Ð½Ñ"
 
-#: src/help_screen.c:189
+#: src/help_screen.c:184
 msgid ":\t\t Decrease balance"
-msgstr ":\t\t õÍÅÎØÛÉÔØ ÂÁÌÁÎÓ"
+msgstr ":\t\t Ð£Ð¼ÐµÐ½ÑÑÐ¸ÑÑ Ð±Ð°Ð»Ð°Ð½Ñ"
 
-#: src/help_screen.c:190
+#: src/help_screen.c:185
 msgid "i:\t\t Song info editor"
-msgstr "i:\t\t òÅÄÁËÔÏÒ ÉÎÆÏÒÍÁÃÉÉ Ï ÐÅÓÎÅ"
+msgstr "i:\t\t Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð¾ Ð¿ÐµÑÐ½Ðµ"
 
-#: src/help_screen.c:191
+#: src/help_screen.c:186
 msgid "a:\t\t Add songs"
-msgstr "a:\t\t äÏÂÁ×ÉÔØ ÐÅÓÎÉ"
+msgstr "a:\t\t ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð¿ÐµÑÐ½Ð¸"
 
-#: src/help_screen.c:192
+#: src/help_screen.c:187
 msgid "B:\t\t Launch file browser"
-msgstr "B:\t\t ÷ÙÚ×ÁÔØ ÂÒÏÕÚÅÒ ÆÁÊÌÏ×"
+msgstr "B:\t\t ÐÑÐ·Ð²Ð°ÑÑ Ð±ÑÐ¾ÑÐ·ÐµÑ ÑÐ°Ð¹Ð»Ð¾Ð²"
 
-#: src/help_screen.c:193
+#: src/help_screen.c:188
+msgid "A:\t\t Audio output setup"
+msgstr "A:\t\t ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð°ÑÐ´Ð¸Ð¾ Ð²ÑÑÐ¾Ð´Ð°"
+
+#: src/help_screen.c:189
 msgid "r:\t\t Remove songs"
-msgstr "r:\t\t õÄÁÌÉÔØ ÐÅÓÎÉ"
+msgstr "r:\t\t Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð¿ÐµÑÐ½Ð¸"
 
-#: src/help_screen.c:194
+#: src/help_screen.c:190
 msgid "s:\t\t Save play list"
-msgstr "s:\t\t óÏÈÒÁÎÉÔØ ÐÌÅÊ-ÌÉÓÔ"
+msgstr "s:\t\t Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑ"
 
-#: src/help_screen.c:195
+#: src/help_screen.c:191
 msgid "S:\t\t Sort play list"
-msgstr "S:\t\t óÏÒÔÉÒÏ×ÁÔØ ÐÌÅÊ-ÌÉÓÔ"
+msgstr "S:\t\t Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑ"
 
-#: src/help_screen.c:196
+#: src/help_screen.c:192
 msgid "P:\t\t Launch plugins manager"
-msgstr "P:\t\t ÷ÙÚ×ÁÔØ ÍÅÎÅÄÖÅÒ ÐÌÁÇÉÎÏ×"
+msgstr "P:\t\t ÐÑÐ·Ð²Ð°ÑÑ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð²"
 
-#: src/help_screen.c:197
+#: src/help_screen.c:193
 msgid "V:\t\t Start visual mode"
-msgstr "V:\t\t ðÅÒÅÊÔÉ × ×ÉÚÕÁÌØÎÙÊ ÒÅÖÉÍ"
+msgstr "V:\t\t ÐÐµÑÐµÐ¹ÑÐ¸ Ð² Ð²Ð¸Ð·ÑÐ°Ð»ÑÐ½ÑÐ¹ ÑÐµÐ¶Ð¸Ð¼"
 
-#: src/help_screen.c:198
+#: src/help_screen.c:194
 msgid "C:\t\t Centrize view"
-msgstr "C:\t\t ãÅÎÔÒÉÒÏ×ÁÔØ ÜËÒÁÎ"
+msgstr "C:\t\t Ð¦ÐµÐ½ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÐºÑÐ°Ð½"
 
-#: src/help_screen.c:199
+#: src/help_screen.c:195
 msgid "/:\t\t Search"
-msgstr "/:\t\t ðÏÉÓË"
+msgstr "/:\t\t ÐÐ¾Ð¸ÑÐº"
 
-#: src/help_screen.c:200
+#: src/help_screen.c:196
 msgid "\\:\t\t Advanced search"
-msgstr "\\:\t\t ðÒÏÄ×ÉÎÕÔÙÊ ÐÏÉÓË"
+msgstr "\\:\t\t ÐÑÐ¾Ð´Ð²Ð¸Ð½ÑÑÑÐ¹ Ð¿Ð¾Ð¸ÑÐº"
 
-#: src/help_screen.c:201
+#: src/help_screen.c:197
 msgid "n:\t\t Go to next search match"
-msgstr "n:\t\t ðÅÒÅÊÔÉ Ë ÓÌÅÄÕÀÝÅÍÕ ÒÅÚÕÌØÔÁÔÕ ÐÏÉÓËÁ"
+msgstr "n:\t\t ÐÐµÑÐµÐ¹ÑÐ¸ Ðº ÑÐ»ÐµÐ´ÑÑÑÐµÐ¼Ñ ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÑ Ð¿Ð¾Ð¸ÑÐºÐ°"
 
-#: src/help_screen.c:202
+#: src/help_screen.c:198
 msgid "N:\t\t Go to previous search match"
-msgstr "N:\t\t ðÅÒÅÊÔÉ × ÐÒÅÄÙÄÕÝÅÍÕ ÒÅÚÕÌØÔÁÔÕ ÐÏÉÓËÁ"
-
-#: src/help_screen.c:203
-msgid "e:\t\t Launch equalizer window"
-msgstr "e:\t\t ÷ÙÚ×ÁÔØ ÏËÎÏ ÜË×ÁÌÁÊÚÅÒÁ"
+msgstr "N:\t\t ÐÐµÑÐµÐ¹ÑÐ¸ Ð² Ð¿ÑÐµÐ´ÑÐ´ÑÑÐµÐ¼Ñ ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÑ Ð¿Ð¾Ð¸ÑÐºÐ°"
 
-#: src/help_screen.c:204
+#: src/help_screen.c:199
 msgid "R:\t\t Set/unset shuffle play mode"
-msgstr "R:\t\t õÓÔÁÎÏÓÉÔØ/ÓÂÒÏÓÉÔØ ÓÌÕÞÁÊÎÙÊ ÒÅÖÉÍ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
+msgstr "R:\t\t Ð£ÑÑÐ°Ð½Ð¾ÑÐ¸ÑÑ/ÑÐ±ÑÐ¾ÑÐ¸ÑÑ ÑÐ»ÑÑÐ°Ð¹Ð½ÑÐ¹ ÑÐµÐ¶Ð¸Ð¼ Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ"
 
-#: src/help_screen.c:205
+#: src/help_screen.c:200
 msgid "L:\t\t Set/unset loop play mode"
-msgstr "L:\t\t õÓÔÁÎÏ×ÉÔØ/ÓÂÒÏÓÉÔØ ËÏÌØÃÅ×ÏÊ ÒÅÖÉÍ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
+msgstr "L:\t\t Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ/ÑÐ±ÑÐ¾ÑÐ¸ÑÑ ÐºÐ¾Ð»ÑÑÐµÐ²Ð¾Ð¹ ÑÐµÐ¶Ð¸Ð¼ Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ"
 
-#: src/help_screen.c:206
+#: src/help_screen.c:201
 msgid "o:\t\t Variables manager"
-msgstr "o:\t\t íÅÎÅÄÖÅÒ ÐÅÒÅÍÅÎÎÙÈ"
+msgstr "o:\t\t ÐÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½ÑÑ"
 
-#: src/help_screen.c:207
+#: src/help_screen.c:202
 msgid "O:\t\t Show logger window"
-msgstr "O:\t\t ðÏËÁÚÁÔØ ÏËÎÏ ÖÕÒÎÁÌÁ"
+msgstr "O:\t\t ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¾ÐºÐ½Ð¾ Ð¶ÑÑÐ½Ð°Ð»Ð°"
 
-#: src/help_screen.c:208
+#: src/help_screen.c:203
 msgid "U:\t\t Undo"
-msgstr "U:\t\t ïÔÍÅÎÉÔØ"
+msgstr "U:\t\t ÐÑÐ¼ÐµÐ½Ð¸ÑÑ"
 
-#: src/help_screen.c:209
+#: src/help_screen.c:204
 msgid "D:\t\t Redo"
-msgstr "D:\t\t ÷ÏÓÓÔÁÎÏ×ÉÔØ"
+msgstr "D:\t\t ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ"
 
-#: src/help_screen.c:210
+#: src/help_screen.c:205
 msgid "I:\t\t Reload songs information"
-msgstr "I:\t\t ðÅÒÅÚÁÇÒÕÚÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÐÅÓÎÑÈ"
+msgstr "I:\t\t ÐÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð¿ÐµÑÐ½ÑÑ"
 
-#: src/help_screen.c:211
+#: src/help_screen.c:206
 msgid "ps:\t\t Set play bounds"
-msgstr "ps:\t\t õÓÔÁÎÏ×ÉÔØ ÇÒÁÎÉÃÙ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
+msgstr "ps:\t\t Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð³ÑÐ°Ð½Ð¸ÑÑ Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ"
 
-#: src/help_screen.c:212
+#: src/help_screen.c:207
 msgid "p<Ret>:\t\t Set play bounds and play"
-msgstr "p<÷×ÏÄ>:\t õÓÔÁÎÏ×ÉÔØ ÇÒÁÎÉÃÙ É ÎÁÞÁÔØ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÅ"
+msgstr "p<ÐÐ²Ð¾Ð´>:\t Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð³ÑÐ°Ð½Ð¸ÑÑ Ð¸ Ð½Ð°ÑÐ°ÑÑ Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ"
 
-#: src/help_screen.c:213
+#: src/help_screen.c:208
 msgid "pc:\t\t Clear play bounds"
-msgstr "pc:\t\t óÂÒÏÓÉÔØ ÇÒÁÎÉÃÙ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
+msgstr "pc:\t\t Ð¡Ð±ÑÐ¾ÑÐ¸ÑÑ Ð³ÑÐ°Ð½Ð¸ÑÑ Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ"
 
-#: src/help_screen.c:214
+#: src/help_screen.c:209
 msgid "!:\t\t Execute command"
-msgstr "!:\t\t ÷ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ"
+msgstr "!:\t\t ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ"
 
-#: src/help_screen.c:215
+#: src/help_screen.c:210
 msgid "m<Letter>:\t Set mark <Letter>"
-msgstr "m<âÕË×Á>:\t õÓÔÁÎÏ×ÉÔØ ÍÅÔËÕ <âÕË×Á>"
+msgstr "m<ÐÑÐºÐ²Ð°>:\t Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¼ÐµÑÐºÑ <ÐÑÐºÐ²Ð°>"
 
-#: src/help_screen.c:216
+#: src/help_screen.c:211
 msgid "`<Letter>:\t Go to mark <Letter>"
-msgstr "`<âÕË×Á>:\t ðÅÒÅÊÔÉ Ë ÍÅÔËÅ <âÕË×Á>"
+msgstr "`<ÐÑÐºÐ²Ð°>:\t ÐÐµÑÐµÐ¹ÑÐ¸ Ðº Ð¼ÐµÑÐºÐµ <ÐÑÐºÐ²Ð°>"
 
-#: src/help_screen.c:217
+#: src/help_screen.c:212
 msgid "``:\t\t Go to previous position"
-msgstr "``:\t\t ðÅÒÅÊÔÉ Ë ÐÒÅÄÙÄÕÝÅÊ ÐÏÚÉÃÉÉ"
+msgstr "``:\t\t ÐÐµÑÐµÐ¹ÑÐ¸ Ðº Ð¿ÑÐµÐ´ÑÐ´ÑÑÐµÐ¹ Ð¿Ð¾Ð·Ð¸ÑÐ¸Ð¸"
 
-#: src/help_screen.c:218
+#: src/help_screen.c:213
 msgid "<Backspace>:\t Go to previous time"
-msgstr "<Backspace>:\t ðÅÒÅÊÔÉ Ë ÐÒÅÄÙÄÕÝÅÍÕ ×ÒÅÍÅÎÉ"
+msgstr "<Backspace>:\t ÐÐµÑÐµÐ¹ÑÐ¸ Ðº Ð¿ÑÐµÐ´ÑÐ´ÑÑÐµÐ¼Ñ Ð²ÑÐµÐ¼ÐµÐ½Ð¸"
 
-#: src/help_screen.c:220
+#: src/help_screen.c:215
 msgid "Window library bindings"
-msgstr "ëÌÁ×ÉÛÉ ÏËÏÎÎÏÊ ÂÉÂÌÉÏÔÅËÉ"
+msgstr "ÐÐ»Ð°Ð²Ð¸ÑÐ¸ Ð¾ÐºÐ¾Ð½Ð½Ð¾Ð¹ Ð±Ð¸Ð±Ð»Ð¸Ð¾ÑÐµÐºÐ¸"
 
-#: src/help_screen.c:221
+#: src/help_screen.c:216
 msgid "^l:\t\t Redisplay screen"
-msgstr "^l:\t\t ïÂÎÏ×ÉÔØ ÜËÒÁÎ"
+msgstr "^l:\t\t ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ ÑÐºÑÐ°Ð½"
 
-#: src/help_screen.c:222
+#: src/help_screen.c:217
 msgid "<Alt>-,:\t Set focus to previous window"
-msgstr "<Alt>-,:\t ðÅÒÅÍÅÓÔÉÔØ ÆÏËÕÓ Ë ÐÒÅÄÙÄÕÝÅÍÕ ÏËÎÕ"
+msgstr "<Alt>-,:\t ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÑÐ¾ÐºÑÑ Ðº Ð¿ÑÐµÐ´ÑÐ´ÑÑÐµÐ¼Ñ Ð¾ÐºÐ½Ñ"
 
-#: src/help_screen.c:223
+#: src/help_screen.c:218
 msgid "<Alt>-.:\t Set focus to next window"
-msgstr "<Alt>-.:\t ðÅÒÅÍÅÓÔÉÔØ ÆÏËÕÓ Ë ÓÌÅÄÕÀÝÅÍÕ ÏËÎÕ"
+msgstr "<Alt>-.:\t ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÑÐ¾ÐºÑÑ Ðº ÑÐ»ÐµÐ´ÑÑÑÐµÐ¼Ñ Ð¾ÐºÐ½Ñ"
 
-#: src/help_screen.c:224
+#: src/help_screen.c:219
 msgid "<Alt>-c:\t Close window"
-msgstr "<Alt>-c:\t úÁËÒÙÔØ ÏËÎÏ"
+msgstr "<Alt>-c:\t ÐÐ°ÐºÑÑÑÑ Ð¾ÐºÐ½Ð¾"
 
-#: src/help_screen.c:225
+#: src/help_screen.c:220
 msgid "<Alt>-m:\t Maximize/minimize window"
-msgstr "<Alt>-m:\t íÁËÓÉÍÉÚÉÒÏ×ÁÔØ/ÍÉÎÉÍÉÚÉÒÏ×ÁÔØ ÏËÎÏ"
+msgstr "<Alt>-m:\t ÐÐ°ÐºÑÐ¸Ð¼Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ/Ð¼Ð¸Ð½Ð¸Ð¼Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð¾ÐºÐ½Ð¾"
 
-#: src/help_screen.c:226
+#: src/help_screen.c:221
 msgid "<Alt>-p:\t Change window position"
-msgstr "<Alt>-p:\t éÚÍÅÎÉÔØ ÐÏÌÏÖÅÎÉÅ ÏËÎÁ"
+msgstr "<Alt>-p:\t ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¾ÐºÐ½Ð°"
 
-#: src/help_screen.c:227
+#: src/help_screen.c:222
 msgid "<Alt>-s:\t Change window size"
-msgstr "<Alt>-s:\t éÚÍÅÎÉÔØ ÒÁÚÍÅÒ ÏËÎÁ"
+msgstr "<Alt>-s:\t ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ°Ð·Ð¼ÐµÑ Ð¾ÐºÐ½Ð°"
 
-#: src/help_screen.c:228
+#: src/help_screen.c:223
 msgid "<Alt>-<letter>:\t Set focus to a dialog item marked by letter"
-msgstr "<Alt>-<ÂÕË×Á>:\t õÓÔÁÎÏ×ÉÔØ ÆÏËÕÓ ÎÁ ÐÕÎËÔ ÄÉÁÌÏÇÁ, ÐÏÍÅÞÅÎÎÙÊ ÂÕË×ÏÊ"
+msgstr "<Alt>-<Ð±ÑÐºÐ²Ð°>:\t Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÐ¾ÐºÑÑ Ð½Ð° Ð¿ÑÐ½ÐºÑ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð°, Ð¿Ð¾Ð¼ÐµÑÐµÐ½Ð½ÑÐ¹ Ð±ÑÐºÐ²Ð¾Ð¹"
 
-#: src/help_screen.c:230
+#: src/help_screen.c:225
 msgid "<Ctrl>-g:\t Close dialog window"
-msgstr "<Ctrl>-g:\t úÁËÒÙÔØ ÄÉÁÌÏÇ"
+msgstr "<Ctrl>-g:\t ÐÐ°ÐºÑÑÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³"
 
-#: src/help_screen.c:232 src/help_screen.c:254 src/help_screen.c:266
+#: src/help_screen.c:227 src/help_screen.c:249
 msgid "?:\t\t This help screen"
-msgstr "?:\t\t üÔÏÔ ÜËÒÁÎ ÐÏÍÏÝÉ"
+msgstr "?:\t\t ÐÑÐ¾Ñ ÑÐºÑÐ°Ð½ Ð¿Ð¾Ð¼Ð¾ÑÐ¸"
 
-#: src/help_screen.c:238
+#: src/help_screen.c:233
 msgid "q:\t\t Return to player"
-msgstr "q:\t\t ÷ÅÒÎÕÔØÓÑ Ë ÐÌÅÊÅÒÕ"
+msgstr "q:\t\t ÐÐµÑÐ½ÑÑÑÑÑ Ðº Ð¿Ð»ÐµÐ¹ÐµÑÑ"
 
-#: src/help_screen.c:243
+#: src/help_screen.c:238
 msgid "<Ret>:\t\t Go to the highlighted directory"
-msgstr "<Ret>:\t\t úÁÊÔÉ × ÐÏÄÓ×ÅÞÅÎÎÕÀ ÄÉÒÅËÔÏÒÉÀ"
+msgstr "<Ret>:\t\t ÐÐ°Ð¹ÑÐ¸ Ð² Ð¿Ð¾Ð´ÑÐ²ÐµÑÐµÐ½Ð½ÑÑ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÐ¸Ñ"
 
-#: src/help_screen.c:244
+#: src/help_screen.c:239
 msgid "h:\t\t Go to home directory"
-msgstr "h:\t\t úÁÊÔÉ × ÄÏÍÁÛÎÀÀ ÄÉÒÅËÔÏÒÉÀ"
+msgstr "h:\t\t ÐÐ°Ð¹ÑÐ¸ Ð² Ð´Ð¾Ð¼Ð°ÑÐ½ÑÑ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÐ¸Ñ"
 
-#: src/help_screen.c:245
+#: src/help_screen.c:240
 msgid "<Backspace>:\t Move to parent directory"
-msgstr "<Backspace>:\t úÁÊÔÉ × ÒÏÄÉÔÅÌØÓËÉÊ ËÁÔÁÌÏÇ"
+msgstr "<Backspace>:\t ÐÐ°Ð¹ÑÐ¸ Ð² ÑÐ¾Ð´Ð¸ÑÐµÐ»ÑÑÐºÐ¸Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/help_screen.c:246
+#: src/help_screen.c:241
 msgid "<Insert>:\t Select/deselect file"
-msgstr "<Insert>:\t õÓÔÁÎÏÓÉÔØ/ÓÎÑÔØ ×ÙÄÅÌÅÎÉÅ Ó ÆÁÊÌÁ"
+msgstr "<Insert>:\t Ð£ÑÑÐ°Ð½Ð¾ÑÐ¸ÑÑ/ÑÐ½ÑÑÑ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ñ ÑÐ°Ð¹Ð»Ð°"
 
-#: src/help_screen.c:247
+#: src/help_screen.c:242
 msgid "+:\t\t Select files matching a pattern"
-msgstr "+:\t\t ÷ÙÂÒÁÔØ ÆÁÊÌÙ, ÕÄÏ×ÌÅÔ×ÏÒÑÀÝÉÅ ÛÁÂÌÏÎÕ"
+msgstr "+:\t\t ÐÑÐ±ÑÐ°ÑÑ ÑÐ°Ð¹Ð»Ñ, ÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÑÑÐ¸Ðµ ÑÐ°Ð±Ð»Ð¾Ð½Ñ"
 
-#: src/help_screen.c:248
+#: src/help_screen.c:243
 msgid "-:\t\t Deselect files matching a pattern"
-msgstr "-:\t\t óÎÑÔØ ×ÙÄÅÌÅÎÉÅ Ó ÆÁÊÌÏ×, ÕÄÏ×ÌÅÔ×ÏÒÑÀÝÉÈ ÛÁÂÌÏÎÕ"
+msgstr "-:\t\t Ð¡Ð½ÑÑÑ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ñ ÑÐ°Ð¹Ð»Ð¾Ð², ÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÑÑÐ¸Ñ ÑÐ°Ð±Ð»Ð¾Ð½Ñ"
 
-#: src/help_screen.c:249
+#: src/help_screen.c:244
 msgid "a:\t\t Add selected files to playlist"
-msgstr "a:\t\t äÏÂÁ×ÉÔØ ×ÙÄÅÌÅÎÎÙÅ ÆÁÊÌÙ Ë ÐÌÅÊ-ÌÉÓÔÕ"
+msgstr "a:\t\t ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½ÑÐµ ÑÐ°Ð¹Ð»Ñ Ðº Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑÑ"
 
-#: src/help_screen.c:250
+#: src/help_screen.c:245
 msgid "r:\t\t Replace playlist files with the selected"
-msgstr "r:\t\t úÁÍÅÎÉÔØ ÆÁÊÌÙ × ÐÌÅÊ-ÌÉÓÔÅ ÎÁ ×ÙÂÒÁÎÎÙÅ"
+msgstr "r:\t\t ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ°Ð¹Ð»Ñ Ð² Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑÐµ Ð½Ð° Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ"
 
-#: src/help_screen.c:251
+#: src/help_screen.c:246
 msgid "c:\t\t Change directory"
-msgstr "c:\t\t óÍÅÎÉÔØ ËÁÔÁÌÏÇ"
+msgstr "c:\t\t Ð¡Ð¼ÐµÐ½Ð¸ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/help_screen.c:252
+#: src/help_screen.c:247
 msgid "i:\t\t Toggle song info mode"
-msgstr "i:\t\t ðÅÒÅËÌÀÞÉÔØÓÑ × ÒÅÖÉÍ ÉÎÆÏÒÍÁÃÉÉ Ï ÐÅÓÎÅ"
+msgstr "i:\t\t ÐÐµÑÐµÐºÐ»ÑÑÐ¸ÑÑÑÑ Ð² ÑÐµÐ¶Ð¸Ð¼ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð¾ Ð¿ÐµÑÐ½Ðµ"
 
-#: src/help_screen.c:253
+#: src/help_screen.c:248
 msgid "s:\t\t Toggle search mode"
-msgstr "s:\t\t ðÅÒÅËÌÀÞÉÔØÓÑ × ÒÅÖÉÍ ÐÏÉÓËÁ"
+msgstr "s:\t\t ÐÐµÑÐµÐºÐ»ÑÑÐ¸ÑÑÑÑ Ð² ÑÐµÐ¶Ð¸Ð¼ Ð¿Ð¾Ð¸ÑÐºÐ°"
 
-#: src/help_screen.c:260
-msgid "q or <Esc>:\t Return to player"
-msgstr "q or <Esc>:\t ÷ÅÒÎÕÔØÓÑ Ë ÐÌÅÊÅÒÕ"
+#: src/plist.c:629
+#, c-format
+msgid "%i/%i song; %i:%02i:%02i/%i:%02i:%02i"
+msgid_plural "%i/%i songs; %i:%02i:%02i/%i:%02i:%02i"
+msgstr0 "%i/%i Ð¿ÐµÑÐ½Ñ; %i:%02i:%02i/%i:%02i:%02i"
+msgstr1 "%i/%i Ð¿ÐµÑÐ½Ð¸; %i:%02i:%02i/%i:%02i:%02i"
+msgstr2 "%i/%i Ð¿ÐµÑÐµÐ½; %i:%02i:%02i/%i:%02i:%02i"
 
-#: src/help_screen.c:261
-msgid "h or <Left>:\t Move cursor left"
-msgstr "h ÉÌÉ <÷ÌÅ×Ï>:\t ðÅÒÅÍÅÓÔÉÔØ ËÕÒÓÏÒ ×ÌÅ×Ï"
+#: src/plist.c:1024
+#, c-format
+msgid ""
+"Unable to add '%s' because nesting level is too high. It is likely to be a "
+"recursive playlist"
+msgstr ""
+"ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ '%s', Ð¿Ð¾ÑÐ¾Ð¼Ñ ÑÑÐ¾ ÑÑÐ¾Ð²ÐµÐ½Ñ Ð²Ð»Ð¾Ð¶ÐµÐ½Ð½Ð¾ÑÑÐ¸ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð²ÑÑÐ¾Ðº. "
+"ÐÐµÑÐ¾ÑÑÐ½Ð¾, ÑÑÐ¾ ÑÐµÐºÑÑÑÐ¸Ð²Ð½ÑÐ¹ Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑ"
 
-#: src/help_screen.c:262
-msgid "l or <Right>:\t Move cursor right"
-msgstr "l ÉÌÉ <÷ÐÒÁ×Ï>:\t ðÅÒÅÍÅÓÔÉÔØ ËÕÒÓÏÒ ×ÐÒÁ×Ï"
+#: src/song.c:335
+#, c-format
+msgid "Failed to save info to file %s"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð² ÑÐ°Ð¹Ð» %s"
 
-#: src/help_screen.c:263
-msgid "j or <Down>:\t Move cursor down"
-msgstr "j ÉÌÉ <÷ÎÉÚ>:\t ïÐÕÓÔÉÔØ ËÕÒÓÏÒ"
+#: src/browser.c:93
+msgid "File browser"
+msgstr "ÐÑÐ°ÑÐ·ÐµÑ ÑÐ°Ð¹Ð»Ð¾Ð²"
 
-#: src/help_screen.c:264
-msgid "k or <Up>:\t Move cursor up"
-msgstr "k ÉÌÉ <÷×ÅÒÈ>:\t ðÏÄÎÑÔØ ËÕÒÓÏÒ"
+#: src/browser.c:142
+#, c-format
+msgid "Current directory is %s\n"
+msgstr "Ð¢ÐµÐºÑÑÐ¸Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ %s\n"
 
-#: src/help_screen.c:265
-msgid "p:\t\t Load Winamp EQF preset"
-msgstr "p:\t\t úÁÇÒÕÚÉÔØ ÐÒÅÓÅÔ Winamp EQF"
+#: src/browser.c:179
+msgid "Enter name you want to search: "
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ, ÐºÐ¾ÑÐ¾ÑÐ¾Ðµ Ð²Ñ ÑÐ¾ÑÐ¸ÑÐµ Ð¸ÑÐºÐ°ÑÑ: "
 
-#: src/logger_view.c:61
-msgid "Log"
-msgstr "öÕÒÎÁÌ"
+#: src/browser.c:646
+msgid "Select files matching pattern"
+msgstr "ÐÑÐ±ÑÐ°ÑÑ ÑÐ°Ð¹Ð»Ñ, ÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÑÑÐ¸Ðµ ÑÐ°Ð±Ð»Ð¾Ð½Ñ"
+
+#: src/browser.c:647
+msgid "Deselect files matching pattern"
+msgstr "Ð¡Ð½ÑÑÑ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ñ ÑÐ°Ð¹Ð»Ð¾Ð², ÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÑÑÐ¸Ñ ÑÐ°Ð±Ð»Ð¾Ð½Ñ"
+
+#: src/browser.c:649
+msgid "P&attern: "
+msgstr "Ð¨Ð°Ð±Ð»Ð¾Ð½ (&a): "
+
+#: src/browser.c:817
+msgid "File name"
+msgstr "ÐÐ¼Ñ ÑÐ°Ð¹Ð»Ð°"
 
-#: src/main.c:47
+#: src/browser.c:823
+msgid "Title"
+msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ"
+
+#: src/browser.c:829
+msgid "Artist"
+msgstr "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»Ñ"
+
+#: src/browser.c:835
+msgid "Album"
+msgstr "ÐÐ»ÑÐ±Ð¾Ð¼"
+
+#: src/browser.c:841
+msgid "Year"
+msgstr "ÐÐ¾Ð´"
+
+#: src/browser.c:847
+msgid "Genre"
+msgstr "ÐÐ°Ð½Ñ"
+
+#: src/browser.c:853
+msgid "Track"
+msgstr "Ð¢ÑÐµÐº"
+
+#: src/browser.c:859
+msgid "Time"
+msgstr "ÐÑÐµÐ¼Ñ"
+
+#: src/browser.c:964
+msgid "Change directory"
+msgstr "Ð¡Ð¼ÐµÐ½Ð¸ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³"
+
+#: src/browser.c:965
+msgid "&Directory: "
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³ (&d): "
+
+#: src/main.c:51
 #, c-format
 msgid ""
 "A fatal error occured during player initialization. See log for details\n"
 msgstr ""
-"÷Ï ×ÒÅÍÑ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÐÒÉÚÏÛÌÁ ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ. ðÏÓÍÏÔÒÉÔÅ × ÖÕÒÎÁÌ\n"
+"ÐÐ¾ Ð²ÑÐµÐ¼Ñ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° ÑÐ°ÑÐ°Ð»ÑÐ½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°. ÐÐ¾ÑÐ¼Ð¾ÑÑÐ¸ÑÐµ Ð² Ð¶ÑÑÐ½Ð°Ð»\n"
+
+#: src/logger_view.c:61
+msgid "Log"
+msgstr "ÐÑÑÐ½Ð°Ð»"
+
+#: src/server.c:63 src/server.c:73
+msgid "No enough memory!"
+msgstr "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸!"
 
-#: src/player.c:200
+#: src/server.c:81
+#, c-format
+msgid "Connection notification pipe create failed: %s"
+msgstr "ÐÐ¾ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¾Ð½Ð½ÑÐ¹ Ð¿Ð°Ð¹Ð° Ð½Ðµ ÑÐ¼Ð¾Ð³ Ð±ÑÑÑ ÑÐ¾Ð·Ð´Ð°Ð½: %s"
+
+#: src/server.c:133
+#, c-format
+msgid "Starting the server at port %d"
+msgstr "ÐÐ°Ð¿ÑÑÐº ÑÐµÑÐ²ÐµÑÐ° Ð½Ð° Ð¿Ð¾ÑÑÑ %d"
+
+#: src/server.c:140
+#, c-format
+msgid "Server socket creation failed: %s"
+msgstr "Ð¡ÐµÑÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¾ÐºÐµÑ Ð½Ðµ ÑÐ¼Ð¾Ð³ Ð±ÑÑÑ ÑÐ¾Ð·Ð´Ð°Ð½: %s"
+
+#: src/server.c:155
+#, c-format
+msgid "Server socket bind at port %d failed: %s"
+msgstr "Ð¡ÐµÑÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¾ÐºÐµÑ Ð½Ðµ ÑÐ¼Ð¾Ð³ Ð±ÑÑÑ Ð¿ÑÐ¸Ð²ÑÐ·Ð°Ð½ Ðº Ð¿Ð¾ÑÑÑ %d: %s"
+
+#: src/server.c:161
+#, c-format
+msgid "Server listening at port %d"
+msgstr "Ð¡ÐµÑÐ²ÐµÑ ÑÐ»ÑÑÐ°ÐµÑ Ð½Ð° Ð¿Ð¾ÑÑÑ %d"
+
+#: src/server.c:167
+#, c-format
+msgid "Server socket listen failed: %s"
+msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð¿ÑÐ¾ÑÐ»ÑÑÐ¸Ð²Ð°Ð½Ð¸Ð¸: %s"
+
+#: src/server.c:177
+#, c-format
+msgid "Server notification pipe create failed: %s"
+msgstr "ÐÐ¾ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¾Ð½Ð½ÑÐ¹ Ð¿Ð°Ð¹Ð¿ Ð½Ðµ ÑÐ¼Ð¾Ð³ Ð±ÑÑÑ ÑÐ¾Ð·Ð´Ð°Ð½: %s"
+
+#: src/server.c:187
+#, c-format
+msgid "Server thread create failed: %s"
+msgstr "Ð¡ÐµÑÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð¾ÑÐ¾Ðº Ð½Ðµ ÑÐ¼Ð¾Ð³ Ð±ÑÑÑ ÑÐ¾Ð·Ð´Ð°Ð½: %s"
+
+#: src/server.c:267
+#, c-format
+msgid "Server select failed: %s"
+msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð² Ð²ÑÐ·Ð¾Ð²Ðµ select Ð² ÑÐµÑÐ²ÐµÑÐ½Ð¾Ð¼ Ð¿Ð¾ÑÐ¾ÐºÐµ: %s"
+
+#: src/server.c:287
+#, c-format
+msgid "Server socket accept failed: %s"
+msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð² Ð²ÑÐ·Ð¾Ð²Ðµ accept Ð² ÑÐµÑÐ²ÐµÑÐ½Ð¾Ð¼ Ð¿Ð¾ÑÐ¾ÐºÐµ: %s"
+
+#: src/server.c:292
+msgid "Received a connection"
+msgstr "ÐÐ¾Ð»ÑÑÐµÐ½Ð¾ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ"
+
+#: src/server.c:306
+#, c-format
+msgid "Server connection thread create failed: %s"
+msgstr "ÐÐ»Ð¸ÐµÐ½ÑÑÐºÐ¸Ð¹ Ð¿Ð¾ÑÐ¾Ðº Ð½Ðµ ÑÐ¼Ð¾Ð³ Ð±ÑÑÑ ÑÐ¾Ð·Ð´Ð°Ð½: %s"
+
+#: src/server.c:386
+#, c-format
+msgid "Connection select failed: %s"
+msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð² Ð²ÑÐ·Ð¾Ð²Ðµ select Ð² ÐºÐ»Ð¸ÐµÐ½ÑÑÐºÐ¾Ð¼ Ð¿Ð¾ÑÐ¾ÐºÐµ: %s"
+
+#: src/server.c:425
+msgid "Closing connection"
+msgstr "ÐÐ°ÐºÑÑÑÐ¸Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ"
+
+#: src/player.c:191
+msgid "unable to parse player state"
+msgstr "Ð½Ðµ Ð¼Ð¾Ð³Ñ Ð¿ÑÐ¾ÑÐ¸ÑÐ°ÑÑ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ Ð¿Ð»ÐµÐ¹ÐµÑÐ°"
+
+#: src/player.c:278
 #, c-format
 msgid "Unable to initialize configuration"
-msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ËÏÎÆÉÇÕÒÁÃÉÀ"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ"
 
-#: src/player.c:208
+#: src/player.c:286
 #, c-format
 msgid "Unable to initialize log system"
-msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÖÕÒÎÁÌØÎÕÀ ÓÉÓÔÅÍÕ"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð¶ÑÑÐ½Ð°Ð»ÑÐ½ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ"
 
-#: src/player.c:213
+#: src/player.c:291
 #, c-format
 msgid ""
 "MPFC %s Log\n"
 "%s"
 msgstr ""
-"öÕÒÎÁÌ MPFC %s\n"
+"ÐÑÑÐ½Ð°Ð» MPFC %s\n"
 "%s"
 
-#: src/player.c:220 src/plist.c:305
+#: src/player.c:298
 msgid "No enough memory"
-msgstr "îÅÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ"
+msgstr "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸"
 
-#: src/player.c:242
+#: src/player.c:320
 msgid "Window system initialization failed"
-msgstr "ïËÏÎÎÁÑ ÓÉÓÔÅÍÁ ÎÅ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÎÁ"
+msgstr "ÐÐºÐ¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½Ð°"
 
-#: src/player.c:252
+#: src/player.c:337
 msgid "Unable to initialize play list window"
-msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÏËÎÏ ÐÌÅÊ-ÌÉÓÔÁ"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð¾ÐºÐ½Ð¾ Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑÐ°"
 
-#: src/player.c:268
+#: src/player.c:353
 msgid "Unable to initialize plugin manager"
-msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÍÅÎÅÄÖÅÒ ÐÌÁÇÉÎÏ×"
-
-#: src/player.c:279
-msgid "Unable to initialize VFS module"
-msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÍÏÄÕÌØ VFS"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð²"
 
-#: src/player.c:288
+#: src/player.c:364
 msgid "Unable to initialize info read/write thread"
-msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÐÏÔÏË ÞÔÅÎÉÑ/ÚÁÐÉÓÉ ÉÎÆÏÒÍÁÃÉÉ"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾ÑÐ¾Ðº ÑÑÐµÐ½Ð¸Ñ/Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸"
 
-#: src/player.c:297
+#: src/player.c:373
 msgid "Unable to initialize undo list"
-msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÓÐÉÓÏË ÏÔÍÅÎ"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¾ÑÐ¼ÐµÐ½"
 
-#: src/player.c:305
+#: src/player.c:381
 msgid "Play list initialization failed"
-msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÐÌÅÊ-ÌÉÓÔ"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑ"
 
-#: src/player.c:316
+#: src/player.c:392
 msgid "Unable to initialize set of files for play list"
-msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÎÁÂÏÒ ÆÁÊÌÏ× ÄÌÑ ÐÌÅÊ-ÌÉÓÔÁ"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð½Ð°Ð±Ð¾Ñ ÑÐ°Ð¹Ð»Ð¾Ð² Ð´Ð»Ñ Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑÐ°"
 
-#: src/player.c:338
+#: src/player.c:414
 msgid "Unable to initialize player thread"
-msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÐÏÔÏË ÐÌÅÊÅÒÁ"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾ÑÐ¾Ðº Ð¿Ð»ÐµÐ¹ÐµÑÐ°"
 
-#: src/player.c:365
+#: src/player.c:426
 msgid "Player initialized"
-msgstr "ðÌÅÊÅÒ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÎ"
+msgstr "ÐÐ»ÐµÐ¹ÐµÑ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½"
 
-#: src/player.c:384
+#: src/player.c:451
 msgid "Play list"
-msgstr "ðÌÅÊ-ÌÉÓÔ"
+msgstr "ÐÐ»ÐµÐ¹-Ð»Ð¸ÑÑ"
 
-#: src/player.c:504
+#: src/player.c:556
 msgid "Left MPFC"
-msgstr "÷ÙÛÌÉ ÉÚ MPFC"
+msgstr "ÐÑÑÐ»Ð¸ Ð¸Ð· MPFC"
 
-#: src/player.c:947 src/player.c:2967 src/player.c:3008
+#: src/player.c:707
+#, c-format
+msgid "creating directory %s\n"
+msgstr "ÑÐ¾Ð·Ð´Ð°Ñ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ %s\n"
+
+#: src/player.c:963 src/player.c:2883 src/player.c:2924
 #, c-format
 msgid "String `%s' not found"
-msgstr "óÔÒÏËÁ `%s' ÎÅ ÎÁÊÄÅÎÁ"
+msgstr "Ð¡ÑÑÐ¾ÐºÐ° `%s' Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð°"
 
-#: src/player.c:951 src/player.c:2971 src/player.c:3012
+#: src/player.c:967 src/player.c:2887 src/player.c:2928
 #, c-format
 msgid "String `%s' found at position %d"
-msgstr "óÔÒÏËÁ `%s' ÎÁÊÄÅÎÁ × ÐÏÚÉÃÉÉ %d"
+msgstr "Ð¡ÑÑÐ¾ÐºÐ° `%s' Ð½Ð°Ð¹Ð´ÐµÐ½Ð° Ð² Ð¿Ð¾Ð·Ð¸ÑÐ¸Ð¸ %d"
 
-#: src/player.c:1343
+#: src/player.c:1238
 msgid "SG Software Media Player For Console"
-msgstr "ðÌÅÊÅÒ ÄÌÑ ËÏÎÓÏÌÉ ÏÔ SG Software"
+msgstr "ÐÐ»ÐµÐ¹ÐµÑ Ð´Ð»Ñ ÐºÐ¾Ð½ÑÐ¾Ð»Ð¸ Ð¾Ñ SG Software"
 
-#: src/player.c:1346 src/player.c:1383
+#: src/player.c:1244 src/player.c:1285
 msgid "Shuffle"
-msgstr "óÌÕÞÁÊÎÏ"
+msgstr "Ð¡Ð»ÑÑÐ°Ð¹Ð½Ð¾"
 
-#: src/player.c:1347 src/player.c:1384
+#: src/player.c:1245 src/player.c:1286
 msgid "Loop"
-msgstr "ãÉËÌÉÞÅÓËÉ"
+msgstr "Ð¦Ð¸ÐºÐ»Ð¸ÑÐµÑÐºÐ¸"
 
-#: src/player.c:1367
+#: src/player.c:1265
 #, c-format
 msgid "version %s"
-msgstr "×ÅÒÓÉÑ %s"
+msgstr "Ð²ÐµÑÑÐ¸Ñ %s"
+
+#: src/player.c:1424 src/player.c:1833
+msgid "gstreamer: gst_element_seek returned FALSE"
+msgstr "gstreamer: gst_element_seek Ð²ÐµÑÐ½ÑÐ» FALSE"
+
+#: src/player.c:1523
+#, c-format
+msgid "setting volume to %lg%% (linear = %lg%%)"
+msgstr "Ð³ÑÐ¾Ð¼ÐºÐ¾ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð° Ð² %lg%% (Ð»Ð¸Ð½ÐµÐ¹Ð½Ð°Ñ = %lg%%)"
+
+#: src/player.c:1640
+#, c-format
+msgid "gstreamer error: %s"
+msgstr "Ð¾ÑÐ¸Ð±ÐºÐ° gstreamer: %s"
 
-#: src/player.c:1852
+#: src/player.c:1728
 #, c-format
-msgid "Input plugin for file %s failed"
-msgstr "÷ÈÏÄÎÏÊ ÐÌÁÇÉÎ ÏÂÌÏÍÉÌÓÑ Ó ÆÁÊÌÏÍ %s"
+msgid "Audio sink %s could not be created"
+msgstr "ÐÑÐ´Ð¸Ð¾ ÑÐ¸Ð½Ðº %s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÐ¾Ð·Ð´Ð°Ð½"
 
-#: src/player.c:1879
-msgid "Output plugin initialization failed"
-msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÐÌÁÇÉÎ"
+#: src/player.c:1781
+msgid "g_main_loop_new failed"
+msgstr "Ð¾ÑÐ¸Ð±ÐºÐ° Ð² g_main_loop_new"
 
-#: src/player.c:2095
+#: src/player.c:1788
+msgid "gstreamer: unable to create playbin"
+msgstr "gstreamer: Ð½Ðµ Ð¼Ð¾Ð³Ñ ÑÐ¾Ð·Ð´Ð°ÑÑ playbin"
+
+#: src/player.c:1811
+msgid "gst_pipeline_get_bus failed"
+msgstr "Ð¾ÑÐ¸Ð±ÐºÐ° Ð² gst_pipeline_get_bus"
+
+#: src/player.c:1888
+#, c-format
+msgid "stopping at time %lld(%lld) with end_time=%lld."
+msgstr "Ð¾ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð½Ð° Ð²ÑÐµÐ¼ÐµÐ½Ð¸ %lld(%lld) Ñ end_time=%lld."
+
+#: src/player.c:1952
 msgid "Add songs"
-msgstr "äÏÂÁ×ÉÔØ ÐÅÓÎÉ"
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð¿ÐµÑÐ½Ð¸"
 
-#: src/player.c:2096 src/player.c:2111
+#: src/player.c:1953 src/player.c:1967
 msgid "File &name: "
-msgstr "éÍÑ ÆÁÊÌÁ (&n): "
+msgstr "ÐÐ¼Ñ ÑÐ°Ð¹Ð»Ð° (&n): "
 
-#: src/player.c:2110
+#: src/player.c:1966
 msgid "Save play list"
-msgstr "óÏÈÒÁÎÉÔØ ÐÌÅÊ-ÌÉÓÔ"
+msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑ"
 
-#: src/player.c:2124
+#: src/player.c:1980
 msgid "Execute external command"
-msgstr "÷ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ"
+msgstr "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ"
 
-#: src/player.c:2125
+#: src/player.c:1981
 msgid "C&ommand: "
-msgstr "ëÏÍÁÎÄÁ (&o): "
+msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° (&o): "
 
-#: src/player.c:2139
+#: src/player.c:1995
 msgid "Sort play list"
-msgstr "óÏÒÔÉÒÏ×ÁÔØ ÐÌÅÊ-ÌÉÓÔ"
+msgstr "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑ"
 
-#: src/player.c:2140
+#: src/player.c:1996
 msgid "Sort by"
-msgstr "óÏÒÔÉÒÏ×ÁÔØ ÐÏ"
+msgstr "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾"
 
-#: src/player.c:2141 src/player.c:2449
+#: src/player.c:1997 src/player.c:2422
 msgid "&Title"
-msgstr "îÁÚ×ÁÎÉÅ (&t)"
+msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ (&t)"
 
-#: src/player.c:2142
+#: src/player.c:1998
 msgid "&File name"
-msgstr "éÍÑ ÆÁÊÌÁ (&f)"
+msgstr "ÐÐ¼Ñ ÑÐ°Ð¹Ð»Ð° (&f)"
 
-#: src/player.c:2143
+#: src/player.c:1999
 msgid "P&ath and file name"
-msgstr "ðÕÔØ É ÉÍÑ ÆÁÊÌÁ (&a)"
+msgstr "ÐÑÑÑ Ð¸ Ð¸Ð¼Ñ ÑÐ°Ð¹Ð»Ð° (&a)"
 
-#: src/player.c:2144 src/player.c:2455
+#: src/player.c:2000 src/player.c:2428
 msgid "T&rack"
-msgstr "ôÒÅË (&r)"
+msgstr "Ð¢ÑÐµÐº (&r)"
 
-#: src/player.c:2145
+#: src/player.c:2001
 msgid "&Only selected area"
-msgstr "ôÏÌØËÏ ×ÙÄÅÌÅÎÎÁÑ ÏÂÌÁÓÔØ (o)"
+msgstr "Ð¢Ð¾Ð»ÑÐºÐ¾ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½Ð°Ñ Ð¾Ð±Ð»Ð°ÑÑÑ (o)"
+
+#: src/player.c:2028 src/player.c:2303
+msgid "&Name: "
+msgstr "ÐÐ¼Ñ (&n): "
 
-#: src/player.c:2176
+#: src/player.c:2030
 msgid "&Artist: "
-msgstr "éÓÐÏÌÎÉÔÅÌØ (&a): "
+msgstr "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»Ñ (&a): "
 
-#: src/player.c:2178
+#: src/player.c:2032
 msgid "A&lbum: "
-msgstr "áÌØÂÏÍ (&l): "
+msgstr "ÐÐ»ÑÐ±Ð¾Ð¼ (&l): "
 
-#: src/player.c:2180
+#: src/player.c:2034
 msgid "&Year: "
-msgstr "çÏÄ (&y): "
+msgstr "ÐÐ¾Ð´ (&y): "
 
-#: src/player.c:2182
+#: src/player.c:2036
 msgid "&Track No: "
-msgstr "îÏÍÅÒ ÔÒÅËÁ (&t): "
+msgstr "ÐÐ¾Ð¼ÐµÑ ÑÑÐµÐºÐ° (&t): "
 
-#: src/player.c:2184
+#: src/player.c:2038
 msgid "C&omments: "
-msgstr "ëÏÍÍÅÎÔÁÒÉÉ (&o): "
+msgstr "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸ (&o): "
 
-#: src/player.c:2186
+#: src/player.c:2040
 msgid "&Genre: "
-msgstr "öÁÎÒ (&g): "
+msgstr "ÐÐ°Ð½Ñ (&g): "
 
-#: src/player.c:2189
+#: src/player.c:2043
+msgid "Full path: "
+msgstr "ÐÐ¾Ð»Ð½ÑÐ¹ Ð¿ÑÑÑ: "
+
+#: src/player.c:2046
 msgid "&Reload info"
-msgstr "ðÅÒÅÚÁÇÒÕÚÉÔØ ÉÎÆÏÒÍÁÃÉÀ (&r)"
+msgstr "ÐÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ (&r)"
 
-#: src/player.c:2252
+#: src/player.c:2138
 msgid "Write in&fo in all the selected songs"
-msgstr "úÁÐÉÓÁÔØ ×Ï ×ÓÅ ×ÙÄÅÌÅÎÎÙÅ ÐÅÓÎÉ (&a)"
+msgstr "ÐÐ°Ð¿Ð¸ÑÐ°ÑÑ Ð²Ð¾ Ð²ÑÐµ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½ÑÐµ Ð¿ÐµÑÐ½Ð¸ (&a)"
 
-#: src/player.c:2403
+#: src/player.c:2286
 msgid "Search"
-msgstr "ðÏÉÓË"
+msgstr "ÐÐ¾Ð¸ÑÐº"
 
-#: src/player.c:2404 src/player.c:2445
+#: src/player.c:2287 src/player.c:2418
 msgid "S&tring: "
-msgstr "óÔÒÏËÁ (&t): "
+msgstr "Ð¡ÑÑÐ¾ÐºÐ° (&t): "
 
-#: src/player.c:2419
+#: src/player.c:2302
 msgid "Variables manager"
-msgstr "íÅÎÅÄÖÅÒ ÐÅÒÅÍÅÎÎÙÈ"
+msgstr "ÐÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½ÑÑ"
 
-#: src/player.c:2423
+#: src/player.c:2306
 msgid "&Value: "
-msgstr "úÎÁÞÅÎÉÅ (&v): "
+msgstr "ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ (&v): "
 
-#: src/player.c:2426
+#: src/player.c:2309
 msgid "Vie&w current value"
-msgstr "ðÏÓÍÏÔÒÅÔØ ÔÅËÕÝÅÅ ÚÎÁÞÅÎÉÅ (.w)"
+msgstr "ÐÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ ÑÐµÐºÑÑÐµÐµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ (&w)"
 
-#: src/player.c:2428
+#: src/player.c:2311
 msgid "Operation"
-msgstr "ïÐÅÒÁÃÉÑ"
+msgstr "ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ"
 
-#: src/player.c:2429
+#: src/player.c:2312
 msgid "S&et"
-msgstr "õÓÔÁÎÏ×ÉÔØ (&e)"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ (&e)"
 
-#: src/player.c:2430
+#: src/player.c:2313
 msgid "&Add"
-msgstr "äÏÂÁ×ÉÔØ (&a)"
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ (&a)"
 
-#: src/player.c:2431
+#: src/player.c:2314
 msgid "&Remove"
-msgstr "õÄÁÌÉÔØ (&r)"
+msgstr "Ð£Ð´Ð°Ð»Ð¸ÑÑ (&r)"
+
+#: src/player.c:2352
+msgid "Audio output setup"
+msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð°ÑÐ´Ð¸Ð¾ Ð²ÑÑÐ¾Ð´Ð°"
+
+#: src/player.c:2353
+msgid "&Sink name: "
+msgstr "ÐÐ¼Ñ ÑÐ¸Ð½ÐºÐ° (&s): "
+
+#: src/player.c:2356
+msgid "&Device name: "
+msgstr "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ (&d): "
+
+#: src/player.c:2361
+msgid ""
+"\n"
+"You can specify GStreamer sink (e.g. alsasink) and \n"
+"device here. Device can only be set if sink is specified.\n"
+"If the sink is configured by some other properties, you can set \n"
+"them directly with gstreamer.audio-sink-params.* variables.\n"
+msgstr ""
+"\n"
+"ÐÐ´ÐµÑÑ ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐºÐ°Ð·Ð°ÑÑ GStreamer ÑÐ¸Ð½Ðº (Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ alsasink) Ð¸ \n"
+"ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾. Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾, ÑÐ¾Ð»ÑÐºÐ¾ ÐµÑÐ»Ð¸ ÑÐºÐ°Ð·Ð°Ð½ ÑÐ¸Ð½Ðº.\n"
+"ÐÑÐ»Ð¸ ÑÐ¸Ð½Ðº Ð¸Ð¼ÐµÐµÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ¸ÑÑÐµÐ¼ÑÐµ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð°, Ð¾Ð½Ð¸ \n"
+"Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð½Ð°Ð¿ÑÑÐ¼ÑÑ ÑÐµÑÐµÐ· Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½ÑÐµ gstreamer.audio-sink-params."
+"*\n"
 
-#: src/player.c:2444
+#: src/player.c:2386
+msgid "&Don't show this anymore"
+msgstr "ÐÐ¾Ð»ÑÑÐµ Ð½Ðµ Ð¿Ð¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ (&d)"
+
+#: src/player.c:2396
+msgid "Welcome"
+msgstr "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ"
+
+#: src/player.c:2397
+msgid ""
+"Welcome to MPFC, Music Player For Console!\n"
+"To close this window, press <Enter>, and then '?' to see key bindings.\n"
+"For more help please see the full documentation."
+msgstr ""
+"ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ Ð² MPFC!\n"
+"Ð§ÑÐ¾Ð±Ñ Ð·Ð°ÐºÑÑÑÑ ÑÑÐ¾ Ð¾ÐºÐ½Ð¾, Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ <Enter>, Ð° Ð·Ð°ÑÐµÐ¼ '?', ÑÑÐ¾Ð±Ñ ÑÐ²Ð¸Ð´ÐµÑÑ "
+"ÐºÐ»Ð°Ð²Ð¸ÑÐ¸.\n"
+"ÐÐ»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾Ð¹ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¾Ð±ÑÐ°ÑÐ¸ÑÐµÑÑ Ðº Ð¿Ð¾Ð»Ð½Ð¾Ð¹ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸."
+
+#: src/player.c:2405
+msgid "Error"
+msgstr "ÐÑÐ¸Ð±ÐºÐ°"
+
+#: src/player.c:2417
 msgid "Advanced search"
-msgstr "ðÒÏÄ×ÉÎÕÔÙÊ ÐÏÉÓË"
+msgstr "ÐÑÐ¾Ð´Ð²Ð¸Ð½ÑÑÑÐ¹ Ð¿Ð¾Ð¸ÑÐº"
 
-#: src/player.c:2448
+#: src/player.c:2421
 msgid "Search in"
-msgstr "éÓËÁÔØ ×"
+msgstr "ÐÑÐºÐ°ÑÑ Ð²"
 
-#: src/player.c:2450
+#: src/player.c:2423
 msgid "&Name"
-msgstr "éÍÑ (&n)"
+msgstr "ÐÐ¼Ñ (&n)"
 
-#: src/player.c:2451
+#: src/player.c:2424
 msgid "&Artist"
-msgstr "éÓÐÏÌÎÉÔÅÌØ (&a)"
+msgstr "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»Ñ (&a)"
 
-#: src/player.c:2452
+#: src/player.c:2425
 msgid "A&lbum"
-msgstr "áÌØÂÏÍ (&l)"
+msgstr "ÐÐ»ÑÐ±Ð¾Ð¼ (&l)"
 
-#: src/player.c:2453
+#: src/player.c:2426
 msgid "&Year"
-msgstr "çÏÄ (&y)"
+msgstr "ÐÐ¾Ð´ (&y)"
 
-#: src/player.c:2454
+#: src/player.c:2427
 msgid "&Genre"
-msgstr "öÁÎÒ (&g)"
+msgstr "ÐÐ°Ð½Ñ (&g)"
 
-#: src/player.c:2456
+#: src/player.c:2429
 msgid "C&omment"
-msgstr "ëÏÍÍÅÎÔÁÒÉÉ (&o)"
+msgstr "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸ (&o)"
 
-#: src/player.c:2470
+#: src/player.c:2443
 #, c-format
 msgid "Removed %d song"
 msgid_plural "Removed %d songs"
-msgstr0 "õÄÁÌÅÎÁ %d ÐÅÓÎÑ"
-msgstr1 "õÄÁÌÅÎÏ %d ÐÅÓÎÉ"
-msgstr2 "õÄÁÌÅÎÏ %d ÐÅÓÅÎ"
+msgstr0 "Ð£Ð´Ð°Ð»ÐµÐ½Ð° %d Ð¿ÐµÑÐ½Ñ"
+msgstr1 "Ð£Ð´Ð°Ð»ÐµÐ½Ð¾ %d Ð¿ÐµÑÐ½Ð¸"
+msgstr2 "Ð£Ð´Ð°Ð»ÐµÐ½Ð¾ %d Ð¿ÐµÑÐµÐ½"
 
-#: src/player.c:2478
+#: src/player.c:2451
 msgid "Reload info"
-msgstr "ðÅÒÅÚÁÇÒÕÚÉÔØ ÉÎÆÏÒÍÁÃÉÀ"
+msgstr "ÐÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ"
 
-#: src/player.c:2479
+#: src/player.c:2452
 msgid "&Only in selected area"
-msgstr "ôÏÌØËÏ × ×ÙÄÅÌÅÎÎÏÊ ÏÂÌÁÓÔÉ (&o)"
+msgstr "Ð¢Ð¾Ð»ÑÐºÐ¾ Ð² Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ð¹ Ð¾Ð±Ð»Ð°ÑÑÐ¸ (&o)"
 
-#: src/player.c:2492
+#: src/player.c:2465
 msgid "Run/stop test"
-msgstr "úÁÐÕÓÔÉÔØ/ÏÓÔÁÎÏ×ÉÔØ ÔÅÓÔ"
+msgstr "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ/Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÐµÑÑ"
 
-#: src/player.c:2493
+#: src/player.c:2466
 msgid "Tests"
-msgstr "ôÅÓÔÙ"
+msgstr "Ð¢ÐµÑÑÑ"
 
-#: src/player.c:2494
+#: src/player.c:2467
 msgid "Test &1. Window library perfomance"
-msgstr "ôÅÓÔ &1. ðÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔØ ÏËÏÎÎÏÊ ÂÉÂÌÉÏÔÅËÉ"
+msgstr "Ð¢ÐµÑÑ &1. ÐÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ Ð¾ÐºÐ¾Ð½Ð½Ð¾Ð¹ Ð±Ð¸Ð±Ð»Ð¸Ð¾ÑÐµÐºÐ¸"
 
-#: src/player.c:2496
+#: src/player.c:2469
 msgid "&Stop job"
-msgstr "ïÓÔÁÎÏ×ÉÔØ ÚÁÄÁÞÕ (&s)"
+msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð·Ð°Ð´Ð°ÑÑ (&s)"
 
-#: src/player.c:2539
-msgid "Input"
-msgstr "÷ÈÏÄÎÙÅ"
+#: src/player.c:2509
+msgid "Playlist"
+msgstr "ÐÐ»ÐµÐ¹-Ð»Ð¸ÑÑ"
 
-#: src/player.c:2540
-msgid "&Input"
-msgstr "÷ÈÏÄÎÙÅ (&i)"
+#: src/player.c:2510
+msgid "&Playlist"
+msgstr "ÐÐ»ÐµÐ¹-Ð»Ð¸ÑÑ (&p)"
 
-#: src/player.c:2543
-msgid "Output"
-msgstr "÷ÙÈÏÄÎÙÅ"
-
-#: src/player.c:2544
-msgid "&Output"
-msgstr "÷ÙÈÏÄÎÙÅ (&o)"
-
-#: src/player.c:2547
-msgid "Effect"
-msgstr "üÆÆÅËÔÙ"
-
-#: src/player.c:2548
-msgid "&Effect"
-msgstr "üÆÆÅËÔÙ (&e)"
-
-#: src/player.c:2551
-#, fuzzy
+#: src/player.c:2513
 msgid "General"
-msgstr "öÁÎÒ"
+msgstr "ÐÐ±ÑÐ¸Ðµ"
 
-#: src/player.c:2552
-#, fuzzy
+#: src/player.c:2514
 msgid "&General"
-msgstr "öÁÎÒ (&g)"
-
-#: src/player.c:2555
-msgid "Charset"
-msgstr "ëÏÄÉÒÏ×ËÉ"
-
-#: src/player.c:2556
-msgid "C&harset"
-msgstr "ëÏÄÉÒÏ×ËÉ (&h)"
+msgstr "ÐÐ±ÑÐ¸Ðµ (&g)"
 
-#: src/player.c:2561
+#: src/player.c:2519
 msgid "Plugins manager"
-msgstr "íÅÎÅÄÖÅÒ ÐÌÁÇÉÎÏ×"
+msgstr "ÐÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð²"
 
-#: src/player.c:2621
-msgid "Effect is ena&bled"
-msgstr "üÆÆÅËÔ ×ËÌÀÞÅÎ (&b)"
-
-#: src/player.c:2631
+#: src/player.c:2571
 msgid "&Description: "
-msgstr "ïÐÉÓÁÎÉÅ (&d): "
+msgstr "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ (&d): "
 
-#: src/player.c:2635
+#: src/player.c:2575
 msgid "&Author: "
-msgstr "á×ÔÏÒ (&a): "
+msgstr "ÐÐ²ÑÐ¾Ñ (&a): "
 
-#: src/player.c:2638
+#: src/player.c:2578
 msgid "Con&figure"
-msgstr "ëÏÎÆÉÇÕÒÉÒÏ×ÁÔØ (&f)"
+msgstr "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ (&f)"
 
-#: src/player.c:2645 src/player.c:2690
-#, fuzzy
+#: src/player.c:2585 src/player.c:2627
 msgid "S&tart"
-msgstr "õÓÔÁÎÏ×ÉÔØ (&e)"
+msgstr "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ (&t)"
 
-#: src/player.c:2689
-#, fuzzy
+#: src/player.c:2626
 msgid "S&top"
-msgstr "õÓÔÁÎÏ×ÉÔØ (&e)"
+msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ (&t)"
 
-#: src/player.c:2720
+#: src/player.c:2657
 #, c-format
 msgid "Play list saved to %s"
-msgstr "ðÌÅÊ-ÌÉÓÔ ÓÏÈÒÁÎÅÎ × %s"
+msgstr "ÐÐ»ÐµÐ¹-Ð»Ð¸ÑÑ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½ Ð² %s"
 
-#: src/player.c:2723
-#, fuzzy, c-format
+#: src/player.c:2660
+#, c-format
 msgid "Unable to save play list to %s (try naming it as a .m3u file)"
-msgstr "îÅ ÍÏÇÕ ÓÏÈÒÁÎÉÔØ ÐÌÅÊ-ÌÉÓÔ × %s"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¿Ð»ÐµÐ¹-Ð»Ð¸ÑÑ Ð² %s"
 
-#: src/player.c:2734
+#: src/player.c:2671
 msgid ""
 "\n"
 "&#x1b;0;32;40mPress enter to continue"
 msgstr ""
 "\n"
-"&#x1b;0;32;40mîÁÖÍÉÔÅ enter, ÞÔÏÂÙ ÐÒÏÄÏÌÖÉÔØ"
+"&#x1b;0;32;40mÐÐ°Ð¶Ð¼Ð¸ÑÐµ enter, ÑÑÐ¾Ð±Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ"
 
-#: src/player.c:2743
+#: src/player.c:2680
 msgid "Command execution failed"
-msgstr ""
+msgstr "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ"
 
-#: src/player.c:2751
+#: src/player.c:2688
 msgid "Writing to console failed"
-msgstr ""
-
-#: src/plist.c:195
-#, c-format
-msgid "Unable to read %s file"
-msgstr "îÅ ÍÏÇÕ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ %s"
-
-#: src/plist.c:283
-#, c-format
-msgid "%s: missing play list header"
-msgstr "%s: ÏÔÓÕÔÓÔ×ÕÅÔ ÚÁÇÏÌÏ×ÏË ÐÌÅÊ-ÌÉÓÔÁ"
-
-#: src/plist.c:294
-#, c-format
-msgid "%s: missing `numberofentries' tag"
-msgstr "%s: ÏÔÓÕÔÓÔ×ÕÅÔ ÔÅÇ `numberofentries'"
-
-#: src/plist.c:899
-#, c-format
-msgid "%i/%i song; %i:%02i:%02i/%i:%02i:%02i"
-msgid_plural "%i/%i songs; %i:%02i:%02i/%i:%02i:%02i"
-msgstr0 "%i/%i ÐÅÓÎÑ; %i:%02i:%02i/%i:%02i:%02i"
-msgstr1 "%i/%i ÐÅÓÎÉ; %i:%02i:%02i/%i:%02i:%02i"
-msgstr2 "%i/%i ÐÅÓÅÎ; %i:%02i:%02i/%i:%02i:%02i"
-
-#: src/song.c:259
-#, c-format
-msgid "Failed to save info to file %s"
-msgstr "îÅ ÍÏÇÕ ÓÏÈÒÁÎÉÔØ ÉÎÆÏÒÍÁÃÉÀ × ÆÁÊÌ %s"
-
-#~ msgid "Repeat value"
-#~ msgstr "úÎÁÞÅÎÉÅ ÐÏ×ÔÏÒÁ"
-
-#~ msgid "Enter count &value for the next command: "
-#~ msgstr "÷×ÅÄÉÔÅ ÞÉÓÌÏ ÐÏ×ÔÏÒÅÎÉÊ ÄÌÑ ÓÌÅÄÕÀÝÅÊ ËÏÍÁÎÄÙ (&v): "
-
-#~ msgid "Configure echo plugin"
-#~ msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ ÐÌÁÇÉÎÁ echo"
-
-#~ msgid "&Delay: "
-#~ msgstr "úÁÄÅÒÖËÁ (&d): "
-
-#~ msgid "&Volume: "
-#~ msgstr "çÒÏÍËÏÓÔØ (&v): "
-
-#~ msgid "&Feedback: "
-#~ msgstr "ïÂÒÁÔÎÁÑ Ó×ÑÚØ (&f)"
-
-#~ msgid "Enable s&urround"
-#~ msgstr "òÁÚÒÅÛÉÔØ ÏÂßÅÍÎÏÅ Ú×ÕÞÁÎÉÅ (&u)"
-
-#~ msgid "Microphone"
-#~ msgstr "íÉËÒÏÆÏÎ"
-
-#~ msgid "Line-in"
-#~ msgstr "ìÉÎÅÊÎÙÊ ×ÈÏÄ"
-
-#~ msgid "Audio CD"
-#~ msgstr "Audio CD"
-
-#~ msgid "Configure ESD plugin"
-#~ msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ ÐÌÁÇÉÎÁ esd"
-
-#~ msgid "Unable to initialize song adder thread"
-#~ msgstr "îÅ ÍÏÇÕ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÐÏÔÏË ÄÏÂÁ×ÌÅÎÉÑ ÐÅÓÅÎ"
-
-#~ msgid "P:\t\t Reload plugins"
-#~ msgstr "P:\t\t ðÅÒÅÚÁÇÒÕÚÉÔØ ÐÌÁÇÉÎÙ"
+msgstr "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿Ð¸ÑÐ°ÑÑ Ð½Ð° ÐºÐ¾Ð½ÑÐ¾Ð»Ñ"

mpfc-1.3.8.1.tar.bz2/src/.mpfcrc -> mpfc-2.0.tar.bz2/src/.mpfcrc Changed

mpfc-1.3.8.1.tar.bz2/src/Makefile.am -> mpfc-2.0.tar.bz2/src/Makefile.am Changed

@@ -1,18 +1,21 @@
 bin_PROGRAMS = mpfc
 mpfc_SOURCES = main.c types.h player.c player.h \
+					server.c server.h server_client.c server_client.h \
+			        rd_with_notify.c rd_with_notify.h \
 					plist.c plist.h song.c song.h util.h \
+					json_helpers.h json_helpers.c metadata_io.c metadata_io.h \
 					cfg.h song_info.h history.c history.h undo.c undo.h \
 					info_rw_thread.h info_rw_thread.c \
 					help_screen.h help_screen.c \
-					eqwnd.c eqwnd.h browser.c browser.h test.c test.h vfs.h \
+					browser.c browser.h test.c test.h \
 					logger.h logger_view.c logger_view.h plugin.h \
-					command.h xconvert.c xconvert.h main_types.h
+					command.h main_types.h file_utils.c file_utils.h
 EXTRA_DIST = .mpfcrc
 
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" \
 	   -DSYSCONFDIR=\"$(sysconfdir)\" @DEFS@
-INCLUDES = -I$(top_builddir)/libmpfcwnd/
+AM_CPPFLAGS = -I$(top_srcdir)/libmpfcwnd/ @GSTREAMER_CFLAGS@ @GSTREAMER_AUDIO_CFLAGS@ @TAGLIB_CFLAGS@ @JSON_CFLAGS@ @CURSES_CFLAGS@
 mpfc_LDADD = $(top_builddir)/libmpfc/libmpfc.la \
 			 $(top_builddir)/libmpfcwnd/libmpfcwnd.la \
-			 @COMMON_LIBS@ @PTHREAD_LIBS@ @DL_LIBS@ @MATH_LIBS@
+			 @GSTREAMER_LIBS@ @GSTREAMER_AUDIO_LIBS@ @TAGLIB_LIBS@ @JSON_LIBS@ @COMMON_LIBS@ @PTHREAD_LIBS@ @DL_LIBS@ @MATH_LIBS@

mpfc-1.3.8.1.tar.bz2/src/Makefile.in -> mpfc-2.0.tar.bz2/src/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,9 +80,28 @@
 host_triplet = @host@
 bin_PROGRAMS = mpfc$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -47,37 +110,86 @@
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_mpfc_OBJECTS = main.$(OBJEXT) player.$(OBJEXT) plist.$(OBJEXT) \
-	song.$(OBJEXT) history.$(OBJEXT) undo.$(OBJEXT) \
-	info_rw_thread.$(OBJEXT) help_screen.$(OBJEXT) eqwnd.$(OBJEXT) \
+am_mpfc_OBJECTS = main.$(OBJEXT) player.$(OBJEXT) server.$(OBJEXT) \
+	server_client.$(OBJEXT) rd_with_notify.$(OBJEXT) \
+	plist.$(OBJEXT) song.$(OBJEXT) json_helpers.$(OBJEXT) \
+	metadata_io.$(OBJEXT) history.$(OBJEXT) undo.$(OBJEXT) \
+	info_rw_thread.$(OBJEXT) help_screen.$(OBJEXT) \
 	browser.$(OBJEXT) test.$(OBJEXT) logger_view.$(OBJEXT) \
-	xconvert.$(OBJEXT)
+	file_utils.$(OBJEXT)
 mpfc_OBJECTS = $(am_mpfc_OBJECTS)
 mpfc_DEPENDENCIES = $(top_builddir)/libmpfc/libmpfc.la \
 	$(top_builddir)/libmpfcwnd/libmpfcwnd.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(mpfc_SOURCES)
 DIST_SOURCES = $(mpfc_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
-ASOUND_LIBS = @ASOUND_LIBS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,10 +200,10 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CHARSET_PLUGINS = @CHARSET_PLUGINS@
 COMMON_LIBS = @COMMON_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURSES_CFLAGS = @CURSES_CFLAGS@
 CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
@@ -106,28 +218,26 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EFFECT_PLUGINS = @EFFECT_PLUGINS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GENERAL_PLUGINS = @GENERAL_PLUGINS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC2 = @GLIBC2@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GPM_LIBS = @GPM_LIBS@
 GREP = @GREP@
+GSTREAMER_AUDIO_CFLAGS = @GSTREAMER_AUDIO_CFLAGS@
+GSTREAMER_AUDIO_LIBS = @GSTREAMER_AUDIO_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
-ICU_LIBS = @ICU_LIBS@
-INPUT_PLUGINS = @INPUT_PLUGINS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -137,30 +247,31 @@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSON_CFLAGS = @JSON_CFLAGS@
+JSON_LIBS = @JSON_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
 LIBOBJS = @LIBOBJS@
 LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTLIBC = @LTLIBC@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
-MAD_LIBS = @MAD_LIBS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIBS = @MATH_LIBS@
@@ -172,10 +283,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGG_LIBS = @OGG_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
-OUTPUT_PLUGINS = @OUTPUT_PLUGINS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -184,6 +293,10 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLIST_PLUGINS = @PLIST_PLUGINS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -193,15 +306,16 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
+TAGLIB_LIBS = @TAGLIB_LIBS@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
 WOE32DLL = @WOE32DLL@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -255,19 +369,22 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 mpfc_SOURCES = main.c types.h player.c player.h \
+					server.c server.h server_client.c server_client.h \
+			        rd_with_notify.c rd_with_notify.h \
 					plist.c plist.h song.c song.h util.h \
+					json_helpers.h json_helpers.c metadata_io.c metadata_io.h \
 					cfg.h song_info.h history.c history.h undo.c undo.h \
 					info_rw_thread.h info_rw_thread.c \
 					help_screen.h help_screen.c \
-					eqwnd.c eqwnd.h browser.c browser.h test.c test.h vfs.h \
+					browser.c browser.h test.c test.h \
 					logger.h logger_view.c logger_view.h plugin.h \
-					command.h xconvert.c xconvert.h main_types.h
+					command.h main_types.h file_utils.c file_utils.h
 
 EXTRA_DIST = .mpfcrc
-INCLUDES = -I$(top_builddir)/libmpfcwnd/
+AM_CPPFLAGS = -I$(top_srcdir)/libmpfcwnd/ @GSTREAMER_CFLAGS@ @GSTREAMER_AUDIO_CFLAGS@ @TAGLIB_CFLAGS@ @JSON_CFLAGS@ @CURSES_CFLAGS@
 mpfc_LDADD = $(top_builddir)/libmpfc/libmpfc.la \
 			 $(top_builddir)/libmpfcwnd/libmpfcwnd.la \
-			 @COMMON_LIBS@ @PTHREAD_LIBS@ @DL_LIBS@ @MATH_LIBS@
+			 @GSTREAMER_LIBS@ @GSTREAMER_AUDIO_LIBS@ @TAGLIB_LIBS@ @JSON_LIBS@ @COMMON_LIBS@ @PTHREAD_LIBS@ @DL_LIBS@ @MATH_LIBS@
 
 all: all-am
 
@@ -282,9 +399,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/Makefile
+	  $(AUTOMAKE) --foreign src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -305,14 +422,19 @@
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1 } \
@@ -333,7 +455,8 @@
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -346,9 +469,10 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-mpfc$(EXEEXT): $(mpfc_OBJECTS) $(mpfc_DEPENDENCIES) 
+
+mpfc$(EXEEXT): $(mpfc_OBJECTS) $(mpfc_DEPENDENCIES) $(EXTRA_mpfc_DEPENDENCIES) 
 	@rm -f mpfc$(EXEEXT)
-	$(LINK) $(mpfc_OBJECTS) $(mpfc_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(mpfc_OBJECTS) $(mpfc_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -357,39 +481,43 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/browser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eqwnd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/help_screen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/history.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info_rw_thread.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json_helpers.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger_view.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metadata_io.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rd_with_notify.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server_client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/song.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/undo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xconvert.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -397,26 +525,15 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -428,15 +545,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -445,6 +558,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -496,10 +624,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -583,19 +716,19 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

mpfc-1.3.8.1.tar.bz2/src/browser.c -> mpfc-2.0.tar.bz2/src/browser.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. File browser functions implementation.
- * $Id: browser.c 307 2011-03-13 11:58:47Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -21,12 +21,15 @@
  */
 
 #include <stdlib.h>
-#include <glob.h>
+#include <fnmatch.h>
+#include <dirent.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include "types.h"
 #include "browser.h"
 #include "help_screen.h"
+#include "metadata_io.h"
 #include "player.h"
 #include "plist.h"
 #include "song_info.h"
@@ -201,7 +204,7 @@
 	else if (key >= ' ' && key <= 0xFF)
 	{
 		struct browser_list_item *item;
-		char *str;
+		const char *str;
 
 		fb->m_search_strfb->m_search_str_len ++ = key;
 		fb->m_search_strfb->m_search_str_len = 0;
@@ -450,61 +453,23 @@
 	}
 } /* End of 'fb_move_cursor' function */
 
-/* Reload directory files list */
-void fb_load_files( browser_t *fb )
-{
-	glob_t gl;
-	int i;
-	char patternMAX_FILE_NAME;
-
-	assert(fb);
-
-	/* Free current files list */
-	fb_free_files(fb);
-
-	/* Add link to parent directory */
-	fb->m_files = (struct browser_list_item *)malloc(sizeof(*fb->m_files));
-	fb->m_num_files = 0;
-
-	/* Find files */
-	vfs_glob(player_vfs, fb->m_cur_dir, fb_glob_handler, fb, 1,
-			VFS_GLOB_NOPATTERN | VFS_GLOB_RETURN_DIRS | 
-			VFS_GLOB_RETURN_SPEC_LINKS | VFS_GLOB_AT_LEVEL_ONLY);
-
-	/* Load info if we are in info mode */
-	if (fb->m_info_mode)
-		fb_load_info(fb);
-} /* End of 'fb_load_files' function */
-
-/* Free files list */
-void fb_free_files( browser_t *fb )
-{
-	int i;
-
-	if (fb == NULL || fb->m_files == NULL)
-		return;
-
-	for ( i = 0; i < fb->m_num_files; i ++ )
-	{
-		free(fb->m_filesi.m_full_name);
-		si_free(fb->m_filesi.m_info);
-	}
-	free(fb->m_files);
-	fb->m_files = NULL;
-	fb->m_num_files = 0;
-} /* End of 'fb_free_files' function */
-
 /* Add a file to list */
-void fb_add_file( browser_t *fb, vfs_file_t *file )
+static void fb_add_file( browser_t *fb, char *name )
 {
 	struct browser_list_item *item;
 	bool_t isdir = FALSE;
-	int i;
 	assert(fb);
-	assert(file);
+
+	char *full_name = util_strcat(fb->m_cur_dir, name, NULL);
+	struct stat st;
+	if (stat(full_name, &st))
+	{
+		free(full_name);
+		return;
+	}
 	
 	/* Get file type */
-	if (S_ISDIR(file->m_stat.st_mode))
+	if (S_ISDIR(st.st_mode))
 		isdir = TRUE;
 
 	/* Rellocate memory for files list */
@@ -514,6 +479,7 @@
 	/* If we have a directory - insert it before normal files */
 	if (isdir)
 	{
+		int i;
 		for ( i = 0; i < fb->m_num_files; i ++ )
 			if (!(fb->m_filesi.m_type & FB_ITEM_DIR))
 			{
@@ -528,8 +494,8 @@
 
 	/* Set file data */
 	item->m_type = isdir ? FB_ITEM_DIR : 0;
-	item->m_full_name = strdup(file->m_full_name);
-	item->m_name = item->m_full_name + (file->m_short_name - file->m_full_name);
+	item->m_full_name = full_name;
+	item->m_name = util_short_name(full_name);
 	item->m_y = -1;
 	item->m_info = NULL;
 	item->m_len = 0;
@@ -538,6 +504,63 @@
 	fb->m_num_files ++;
 } /* End of 'fb_add_file' function */
 
+/* Reload directory files list */
+void fb_load_files( browser_t *fb )
+{
+	assert(fb);
+
+	/* Free current files list */
+	fb_free_files(fb);
+
+	/* Add link to parent directory */
+	fb->m_files = (struct browser_list_item *)malloc(sizeof(*fb->m_files));
+	fb->m_num_files = 0;
+
+	/* Find files */
+	struct dirent **namelist;
+	int n = scandir(fb->m_cur_dir, &namelist, NULL, alphasort);
+	if (n >= 0)
+	{
+		for ( int i = 0; i < n; ++i )
+		{
+			char *name = namelisti->d_name;
+
+			/* Filter */
+			if (strcmp(name, "..") && name0 == '.')
+				goto next;
+			
+			/* Add this file */
+			fb_add_file(fb, name);
+
+		next:
+			free(namelisti);
+		}
+		free(namelist);
+	}
+
+	/* Load info if we are in info mode */
+	if (fb->m_info_mode)
+		fb_load_info(fb);
+} /* End of 'fb_load_files' function */
+
+/* Free files list */
+void fb_free_files( browser_t *fb )
+{
+	int i;
+
+	if (fb == NULL || fb->m_files == NULL)
+		return;
+
+	for ( i = 0; i < fb->m_num_files; i ++ )
+	{
+		free(fb->m_filesi.m_full_name);
+		si_free(fb->m_filesi.m_info);
+	}
+	free(fb->m_files);
+	fb->m_files = NULL;
+	fb->m_num_files = 0;
+} /* End of 'fb_free_files' function */
+
 /* Go to the directory under cursor */
 void fb_go_to_dir( browser_t *fb )
 {
@@ -675,7 +698,12 @@
 	if (fb == NULL)
 		return;
 
-	util_strncpy(fb->m_cur_dir, dir, sizeof(fb->m_cur_dir));
+	/* Handle tilde expansion */
+	if (dir0 == '~' && (dir1 == 0 || dir1 == '/'))
+		snprintf(fb->m_cur_dir, sizeof(fb->m_cur_dir),
+				"%s%s", getenv("HOME"), dir + 1);
+	else
+		util_strncpy(fb->m_cur_dir, dir, sizeof(fb->m_cur_dir));
 	if (fb->m_cur_dirstrlen(fb->m_cur_dir) - 1 != '/')
 		strcat(fb->m_cur_dir, "/");
 	fb_load_files(fb);
@@ -707,7 +735,6 @@
 	{
 		struct browser_list_item *item = &fb->m_filesi;
 		char *ext;
-		in_plugin_t *inp;
 
 		/* Don't load info if it is already loaded */
 		if (item->m_info != NULL && item->m_len)
@@ -718,13 +745,12 @@
 
 		/* Determine file type and its associated plugin */
 		ext = util_extension(item->m_name);
-		inp = pmng_search_format(player_pmng, item->m_name, ext);
-		if (inp == NULL)
+		if (!pmng_search_format(player_pmng, item->m_name, ext))
 			continue;
 
 		/* Load info */
 		si_free(item->m_info);
-		item->m_info = inp_get_info(inp, item->m_full_name, &item->m_len);
+		item->m_info = md_get_info(item->m_full_name, NULL, &item->m_len);
 	}
 } /* End of 'fb_load_info' function */
 
@@ -833,12 +859,12 @@
 			wnd_printf(wnd, 0, right, _("Time"));
 		else
 			wnd_printf(wnd, 0, right, "%d:%02d", 
-					item->m_len / 60, item->m_len % 60);
+					TIME_TO_SECONDS(item->m_len) / 60, TIME_TO_SECONDS(item->m_len) % 60);
 		break;
 	}
 	wnd_move(wnd, WND_MOVE_ADVANCE, right, WND_MOVE_DONT_CHANGE);
 	if (next_size > 0)
-		wnd_putchar(wnd, 0, ACS_VLINE);
+		wnd_put_special(wnd, WND_ACS_CODE(WACS_VLINE));
 } /* End of 'fb_print_info_col' function */
 
 /* Show help screen */
@@ -929,17 +955,6 @@
 	cfg_set_var(list, "kbind.help", "?");
 } /* End of 'fb_class_set_default_styles' function */
 
-/* Handle glob */
-void fb_glob_handler( vfs_file_t *file, void *data )
-{
-	/* Filter */
-	if (strcmp(file->m_short_name, "..") && file->m_short_name0 == '.')
-		return;
-	
-	/* Add this file */
-	fb_add_file((browser_t *)data, file);
-} /* End of 'fb_glob_handler' function */
-
 /* Launch change directory dialog */
 void fb_cd_dialog( browser_t *fb )
 {
@@ -949,8 +964,7 @@
 	dlg = dialog_new(WND_OBJ(fb), _("Change directory"));
 	eb = filebox_new_with_label(WND_OBJ(dlg->m_vbox), _("&Directory: "), 
 			"dir", "", 'd', 50);
-	eb->m_vfs = player_vfs;
-	eb->m_flags |= (FILEBOX_ONLY_DIRS | FILEBOX_NOPATTERN);
+	eb->m_flags |= FILEBOX_ONLY_DIRS;
 	EDITBOX_OBJ(eb)->m_history = player_hist_listsPLAYER_HIST_FB_CD;
 	wnd_msg_add_handler(WND_OBJ(dlg), "ok_clicked", fb_on_cd);
 	dialog_arrange_children(dlg);

mpfc-1.3.8.1.tar.bz2/src/browser.h -> mpfc-2.0.tar.bz2/src/browser.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Interface for file browser functions.
- * $Id: browser.h 229 2005-02-21 18:36:59Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -24,8 +24,8 @@
 #define __SG_MPFC_BROWSER_H__
 
 #include "types.h"
+#include "main_types.h"
 #include "song_info.h"
-#include "vfs.h"
 #include "wnd.h"
 
 /* File browser window type */
@@ -40,10 +40,10 @@
 	/* Directory contents */
 	struct browser_list_item
 	{
-		char *m_name;
+		const char *m_name;
 		char *m_full_name;
 		song_info_t *m_info;
-		int m_len;
+		song_time_t m_len;
 		int m_y;
 		byte m_type;
 
@@ -117,9 +117,6 @@
 /* Reload directory files list */
 void fb_load_files( browser_t *fb );
 
-/* Add a file to list */
-void fb_add_file( browser_t *fb, vfs_file_t *file );
-
 /* Free files list */
 void fb_free_files( browser_t *fb );
 
@@ -174,9 +171,6 @@
 /* Set browser class default styles */
 void fb_class_set_default_styles( cfg_node_t *list );
 
-/* Handle glob */
-void fb_glob_handler( vfs_file_t *file, void *data );
-
 #endif
 
 /* End of 'browser.h' file */

mpfc-1.3.8.1.tar.bz2/src/cfg.h -> mpfc-2.0.tar.bz2/src/cfg.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Interface for configuration handling.
- * $Id: cfg.h 242 2005-12-02 20:50:55Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -132,18 +132,18 @@
 #define CFG_VAR_HANDLER(node)		(CFG_VAR(node)->m_handler)
 
 /* Create a new configuration list */
-cfg_node_t *cfg_new_list( cfg_node_t *parent, char *name, 
+cfg_node_t *cfg_new_list( cfg_node_t *parent, const char *name, 
 		cfg_set_default_values_t set_def, dword flags, int hash_size );
 
 /* Create a new variable */
-cfg_node_t *cfg_new_var_full( cfg_node_t *parent, char *name, dword flags, 
+cfg_node_t *cfg_new_var_full( cfg_node_t *parent, const char *name, dword flags, 
 		char *value, cfg_var_handler_t handler, void *handler_data );
 #define cfg_new_var(parent, name, flags, value, handler) \
 	cfg_new_var_full(parent, name, flags, value, handler, NULL)
 
 /* Create a new node and leave node type specific information unset 
  * (don't use this function directly; use previous two instead) */
-cfg_node_t *cfg_new_node( cfg_node_t *parent, char *name, dword flags );
+cfg_node_t *cfg_new_node( cfg_node_t *parent, const char *name, dword flags );
 
 /* Insert a node into the list */
 void cfg_insert_node( cfg_node_t *list, cfg_node_t *node );
@@ -158,41 +158,41 @@
 void cfg_var_free_operations( cfg_node_t *node );
 
 /* Search for the node */
-cfg_node_t *cfg_search_node( cfg_node_t *parent, char *name );
+cfg_node_t *cfg_search_node( cfg_node_t *parent, const char *name );
 
 /* Apply operation to variable value */
-char *cfg_var_apply_op( cfg_node_t *node, char *value, cfg_var_op_t op );
+char *cfg_var_apply_op( cfg_node_t *node, const char *value, cfg_var_op_t op );
 
 /* Full version of variable value setting */
-void cfg_set_var_full( cfg_node_t *parent, char *name, char *val, 
+void cfg_set_var_full( cfg_node_t *parent, const char *name, char const *val, 
 		cfg_var_op_t op );
 
 /* Set variable value */
-void cfg_set_var( cfg_node_t *parent, char *name, char *val );
+void cfg_set_var( cfg_node_t *parent, const char *name, const char *val );
 
 /* Set variable integer value */
-void cfg_set_var_int( cfg_node_t *parent, char *name, int val );
+void cfg_set_var_int( cfg_node_t *parent, const char *name, int val );
 
 /* Set variable integer float */
-void cfg_set_var_float( cfg_node_t *parent, char *name, float val );
+void cfg_set_var_float( cfg_node_t *parent, const char *name, float val );
 
 /* Set variable pointer value */
-void cfg_set_var_ptr( cfg_node_t *parent, char *name, void *val );
+void cfg_set_var_ptr( cfg_node_t *parent, const char *name, void *val );
 
 /* Get variable value */
-char *cfg_get_var( cfg_node_t *parent, char *name );
+char *cfg_get_var( cfg_node_t *parent, const char *name );
 
 /* Get variable integer value */
-int cfg_get_var_int( cfg_node_t *parent, char *name );
+int cfg_get_var_int( cfg_node_t *parent, const char *name );
 
 /* Get variable float value */
-float cfg_get_var_float( cfg_node_t *parent, char *name );
+float cfg_get_var_float( cfg_node_t *parent, const char *name );
 
 /* Get variable pointer value */
-void *cfg_get_var_ptr( cfg_node_t *parent, char *name );
+void *cfg_get_var_ptr( cfg_node_t *parent, const char *name );
 
 /* Set variable's handler */
-void cfg_set_var_handler( cfg_node_t *parent, char *name, 
+void cfg_set_var_handler( cfg_node_t *parent, const char *name, 
 		cfg_var_handler_t handler, void *handler_data );
 
 /* Setters/getters for some other types */
@@ -202,17 +202,17 @@
 	((bool_t)cfg_get_var_int(parent, name))
 
 /* Find the real parent of node */
-cfg_node_t *cfg_find_real_parent( cfg_node_t *parent, char *name, 
-		char **real_name );
+cfg_node_t *cfg_find_real_parent( cfg_node_t *parent, const char *name, 
+		const char **real_name );
 
 /* Search list for a child node (name given is the exact name, without dots) */
-cfg_node_t *cfg_search_list( cfg_node_t *list, char *name );
+cfg_node_t *cfg_search_list( cfg_node_t *list, const char *name );
 
 /* Call variable handler */
 bool_t cfg_call_var_handler( bool_t after, cfg_node_t *node, char *value );
 
 /* Calculate string hash value */
-int cfg_calc_hash( char *str, int table_size );
+int cfg_calc_hash( const char *str, int table_size );
 
 /*
  * Configuration list iteration functions
@@ -242,13 +242,13 @@
  */
 
 /* Read configuration file */
-void cfg_rcfile_read( cfg_node_t *list, char *name );
+void cfg_rcfile_read( cfg_node_t *list, const char *name );
 
 /* Read one line from the configuration file */
 void cfg_rcfile_parse_line( cfg_node_t *list, char *str );
 
 /* Save a node to file */
-void cfg_rcfile_save_node( FILE *fd, cfg_node_t *node, char *prefix );
+void cfg_rcfile_save_node( FILE *fd, cfg_node_t *node, const char *prefix );
 
 #endif

mpfc-1.3.8.1.tar.bz2/src/command.h -> mpfc-2.0.tar.bz2/src/command.h Changed

mpfc-2.0.tar.bz2/src/file_utils.c Added

@@ -0,0 +1,131 @@
+/******************************************************************
+ * Copyright (C) 2003 - 2012 by SG Software.
+ *
+ * SG MPFC. Filesystem utility functions.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <dirent.h>
+#include "file_utils.h"
+
+static bool_t fu_file_type_recc( const char *name, bool_t *is_dir, int rec_level )
+{
+	struct stat st;
+	if (stat(name, &st))
+		return FALSE;
+
+	if (S_ISREG(st.st_mode))
+	{
+		(*is_dir) = FALSE;
+		return TRUE;
+	}
+	else if (S_ISDIR(st.st_mode))
+	{
+		(*is_dir) = TRUE;
+		return TRUE;
+	}
+	else if (S_ISLNK(st.st_mode))
+	{
+		/* Cyclic link? */
+		if (rec_level > 10)
+			return FALSE;
+
+		char linked_nameMAX_FILE_NAME;
+		if (readlink(name, linked_name, sizeof(linked_name)) < 0)
+			return FALSE;
+		return fu_file_type_recc(linked_name, is_dir, rec_level + 1);
+	}
+
+	/* Special file which we are not interested in */
+	return FALSE;
+} 
+
+/* Determine file type (regular or directory) resolving symlinks */
+bool_t fu_file_type(const char *name, bool_t *is_dir)
+{
+	return fu_file_type_recc(name, is_dir, 0);
+}
+
+/* Open a directory */
+fu_dir_t *fu_opendir(const char *name)
+{
+	fu_dir_t *dir = (fu_dir_t *)malloc(sizeof(fu_dir_t));
+
+	if (!(dir->m_dir = opendir(name)))
+	{
+		free(dir);
+		return NULL;
+	}
+
+	/* Allocate dirent */
+	if (!(dir->m_dirent = (struct dirent *)malloc(offsetof(struct dirent, d_name) +
+			pathconf(name, _PC_NAME_MAX) + 1)))
+	{
+		closedir(dir->m_dir);
+		free(dir);
+		return NULL;
+	}
+
+	return dir;
+}
+
+/* Read directory entry */
+struct dirent *fu_readdir(fu_dir_t *dir)
+{
+	struct dirent *de_result;
+	if (readdir_r(dir->m_dir, dir->m_dirent, &de_result))
+		return NULL;
+	if (!de_result)
+		return NULL;
+	return de_result;
+}
+
+/* Close directory */
+void fu_closedir(fu_dir_t *dir)
+{
+	if (!dir)
+		return;
+	closedir(dir->m_dir);
+	free(dir->m_dirent);
+	free(dir);
+}
+
+/* Is this a '.' or '..' ? */
+bool_t fu_is_special_dir(const char *name)
+{
+	return (name0 == '.' &&
+			(name1 == 0 || 
+			 (name1 == '.' && name2 == 0)));
+}
+
+/* Does path have a prefix? */
+bool_t fu_is_prefixed(const char *name)
+{
+	const char *p = strchr(name, '/');
+	return (p && p != name && *(p - 1) == ':' && *(p + 1) == '/');
+}
+
+/* End of 'file_utils.h' file */
+
+

mpfc-2.0.tar.bz2/src/file_utils.h Added

@@ -0,0 +1,57 @@
+/******************************************************************
+ * Copyright (C) 2003 - 2012 by SG Software.
+ *
+ * SG MPFC. Interface for filesystem utility functions.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#ifndef __SG_MPFC_FILE_UTILS_H__
+#define __SG_MPFC_FILE_UTILS_H__
+
+#include <sys/types.h>
+#include <dirent.h>
+#include "types.h"
+
+/* Determine file type (regular or directory) resolving symlinks */
+bool_t fu_file_type(const char *name, bool_t *is_dir);
+
+typedef struct
+{
+	DIR *m_dir;
+	struct dirent *m_dirent;
+} fu_dir_t;
+
+/* Open a directory */
+fu_dir_t *fu_opendir(const char *name);
+
+/* Read directory entry */
+struct dirent *fu_readdir(fu_dir_t *dir);
+
+/* Close directory */
+void fu_closedir(fu_dir_t *dir);
+
+/* Is this a '.' or '..' ? */
+bool_t fu_is_special_dir(const char *name);
+
+/* Does path have a prefix? */
+bool_t fu_is_prefixed(const char *name);
+
+#endif
+
+/* End of 'file_utils.h' file */
+

mpfc-1.3.8.1.tar.bz2/src/help_screen.c -> mpfc-2.0.tar.bz2/src/help_screen.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Help screen functions implementation.
- * $Id: help_screen.c 229 2005-02-21 18:36:59Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -58,9 +58,7 @@
 	
 	/* Initialize window part */
 	if (!wnd_construct(wnd, parent, type == HELP_PLAYER ? 
-				_("MPFC Default Key Bindings") : (type == HELP_EQWND ?
-					_("Equalizer Key Bindings") : 
-					_("File Browser Key Bindings")), 
+				_("MPFC Default Key Bindings") : _("File Browser Key Bindings"), 
 				0, 0, 0, 0, WND_FLAG_FULL_BORDER | WND_FLAG_MAXIMIZED))
 		return FALSE;
 
@@ -84,9 +82,6 @@
 	case HELP_BROWSER:
 		help_init_browser(help);
 		break;
-	case HELP_EQWND:
-		help_init_eqwnd(help);
-		break;
 	}
 	help->m_type = type;
 	return TRUE;
@@ -190,6 +185,7 @@
 	help_add(help, _("i:\t\t Song info editor"));
 	help_add(help, _("a:\t\t Add songs"));
 	help_add(help, _("B:\t\t Launch file browser"));
+	help_add(help, _("A:\t\t Audio output setup"));
 	help_add(help, _("r:\t\t Remove songs"));
 	help_add(help, _("s:\t\t Save play list"));
 	help_add(help, _("S:\t\t Sort play list"));
@@ -200,7 +196,6 @@
 	help_add(help, _("\\:\t\t Advanced search"));
 	help_add(help, _("n:\t\t Go to next search match"));
 	help_add(help, _("N:\t\t Go to previous search match"));
-	help_add(help, _("e:\t\t Launch equalizer window"));
 	help_add(help, _("R:\t\t Set/unset shuffle play mode"));
 	help_add(help, _("L:\t\t Set/unset loop play mode"));
 	help_add(help, _("o:\t\t Variables manager"));
@@ -254,18 +249,6 @@
 	help_add(help, _("?:\t\t This help screen"));
 } /* End of 'help_init_browser' function */
 
-/* Initialize help screen in equalizer window mode */
-void help_init_eqwnd( help_screen_t *help )
-{
-	help_add(help, _("q or <Esc>:\t Return to player"));
-	help_add(help, _("h or <Left>:\t Move cursor left"));
-	help_add(help, _("l or <Right>:\t Move cursor right"));
-	help_add(help, _("j or <Down>:\t Move cursor down"));
-	help_add(help, _("k or <Up>:\t Move cursor up"));
-	help_add(help, _("p:\t\t Load Winamp EQF preset"));
-	help_add(help, _("?:\t\t This help screen"));
-} /* End of 'help_init_eqwnd' function */
-
 /* Initialize help screen class */
 wnd_class_t *help_class_init( wnd_global_data_t *global )
 {

mpfc-1.3.8.1.tar.bz2/src/help_screen.h -> mpfc-2.0.tar.bz2/src/help_screen.h Changed

mpfc-1.3.8.1.tar.bz2/src/history.c -> mpfc-2.0.tar.bz2/src/history.c Changed

mpfc-1.3.8.1.tar.bz2/src/history.h -> mpfc-2.0.tar.bz2/src/history.h Changed

mpfc-1.3.8.1.tar.bz2/src/info_rw_thread.c -> mpfc-2.0.tar.bz2/src/info_rw_thread.c Changed

mpfc-1.3.8.1.tar.bz2/src/info_rw_thread.h -> mpfc-2.0.tar.bz2/src/info_rw_thread.h Changed

mpfc-2.0.tar.bz2/src/json_helpers.c Added

@@ -0,0 +1,102 @@
+/******************************************************************
+ * Copyright (C) 2013 by SG Software.
+ *
+ * SG MPFC. Convenience functions for JSON handling.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#include "json_helpers.h"
+
+const char *js_get_string( JsonObject *obj, char *key, char *def )
+{
+	JsonNode *node = json_object_get_member(obj, key);
+	if (!node)
+		return def;
+	if (!JSON_NODE_HOLDS_VALUE(node))
+		return def;
+	return json_node_get_string(node);
+}
+
+int64_t js_get_int( JsonObject *obj, char *key, int64_t def )
+{
+	JsonNode *node = json_object_get_member(obj, key);
+	if (!node)
+		return def;
+	if (!JSON_NODE_HOLDS_VALUE(node))
+		return def;
+	return json_node_get_int(node);
+}
+
+double js_get_double( JsonObject *obj, char *key, double def )
+{
+	JsonNode *node = json_object_get_member(obj, key);
+	if (!node)
+		return def;
+	if (!JSON_NODE_HOLDS_VALUE(node))
+		return def;
+	if (json_node_get_value_type(node) == G_TYPE_INT64)
+		return json_node_get_int(node);
+	else
+		return json_node_get_double(node);
+}
+
+JsonObject *js_get_obj( JsonObject *obj, char *key )
+{
+	JsonNode *node = json_object_get_member(obj, key);
+	if (!node)
+		return NULL;
+	if (!JSON_NODE_HOLDS_OBJECT(node))
+		return NULL;
+	return json_node_get_object(node);
+}
+
+JsonArray *js_get_array( JsonObject *obj, char *key )
+{
+	JsonNode *node = json_object_get_member(obj, key);
+	if (!node)
+		return NULL;
+	if (!JSON_NODE_HOLDS_ARRAY(node))
+		return NULL;
+	return json_node_get_array(node);
+}
+
+JsonNode *js_make_node( JsonObject *obj )
+{
+	JsonNode *node = json_node_new(JSON_NODE_OBJECT);
+	json_node_take_object(node, obj);
+	return node;
+}
+
+JsonNode *js_make_array_node( JsonArray *array )
+{
+	JsonNode *node = json_node_new(JSON_NODE_ARRAY);
+	json_node_take_array(node, array);
+	return node;
+}
+
+char *js_to_string( JsonNode *node, size_t *len )
+{
+	JsonGenerator *gen = json_generator_new();
+	json_generator_set_root(gen, node);
+	char *res = json_generator_to_data(gen, len);
+	g_object_unref(gen);
+	return res;
+}
+
+/* End of 'json_helpers.c' file */
+

mpfc-2.0.tar.bz2/src/json_helpers.h Added

@@ -0,0 +1,43 @@
+/******************************************************************
+ * Copyright (C) 2013 by SG Software.
+ *
+ * SG MPFC. Convenience functions for JSON handling.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#ifndef __SG_MPFC_JSON_HELPERS_H__
+#define __SG_MPFC_JSON_HELPERS_H__
+
+#include <json-glib/json-glib.h>
+
+/* Object member accessors */
+const char *js_get_string( JsonObject *obj, char *key, char *def );
+int64_t js_get_int( JsonObject *obj, char *key, int64_t def );
+double js_get_double( JsonObject *obj, char *key, double def );
+JsonObject *js_get_obj( JsonObject *obj, char *key );
+JsonArray *js_get_array( JsonObject *obj, char *key );
+
+JsonNode *js_make_node( JsonObject *obj );
+JsonNode *js_make_array_node( JsonArray *array );
+
+char *js_to_string( JsonNode *node, size_t *len );
+
+#endif
+
+/* End of 'json_helpers.h' file */
+

mpfc-1.3.8.1.tar.bz2/src/logger.h -> mpfc-2.0.tar.bz2/src/logger.h Changed

mpfc-1.3.8.1.tar.bz2/src/logger_view.c -> mpfc-2.0.tar.bz2/src/logger_view.c Changed

mpfc-1.3.8.1.tar.bz2/src/logger_view.h -> mpfc-2.0.tar.bz2/src/logger_view.h Changed

mpfc-1.3.8.1.tar.bz2/src/main.c -> mpfc-2.0.tar.bz2/src/main.c Changed

mpfc-1.3.8.1.tar.bz2/src/main_types.h -> mpfc-2.0.tar.bz2/src/main_types.h Changed

@@ -26,40 +26,40 @@
 #include <pthread.h>
 #include "types.h"
 #include "types.h"
-#include "file.h"
-#include "inp.h"
 #include "mystring.h"
 #include "song_info.h"
-#include "vfs.h"
 
 /* Song flags */
 typedef enum
 {
 	SONG_SCHEDULE = 1 << 0,
 	SONG_INFO_READ = 1 << 1,
-	SONG_INFO_WRITE = 1 << 2
+	SONG_INFO_WRITE = 1 << 2,
+	SONG_STATIC_INFO = 1 << 3
 } song_flags_t;
 
+typedef int64_t song_time_t;
+
 /* Song type */
 typedef struct tag_song_t
 {
 	/* Song title */
 	str_t *m_title;
 
-	/* Song full name (i.e. with plugin prefix if it was specified) */
-	char *m_full_name;
+	/* Full name in an URI form (with prefix and escaped special symbols) */
+	char *m_fullname;
 
-	/* File name without plugin prefix. This is used for the most part */
-	char *m_file_name;
+	/* Real file name (might be null if the song has been created from an URI) */
+	char *m_filename;
 
-	/* Short name and file extension */
-	char *m_short_name, *m_file_ext;
+	/* Sliced song length */
+	song_time_t m_len;
 
-	/* Song length */
-	int m_len;
+	/* Full song length */
+	song_time_t m_full_len;
 
 	/* Song start and end (for projected songs) */
-	int m_start_time, m_end_time;
+	song_time_t m_start_time, m_end_time;
 
 	/* Song information */
 	song_info_t *m_info;
@@ -73,16 +73,26 @@
 	/* Default title (used when no info is found) */
 	char *m_default_title;
 
-	/* Song we are redirected to */
-	struct tag_song_t *m_redirect;
-
-	/* Input plugin being used to play this song */
-	in_plugin_t *m_inp;
-
 	/* Song mutex */
 	pthread_mutex_t m_mutex;
 } song_t;
 
+static inline int TIME_TO_SECONDS(song_time_t x) { return x / 1000000000LL; }
+static inline song_time_t SECONDS_TO_TIME(int x) { return x * 1000000000LL; }
+
+/* Metadata for making a song 
+ * All these fields are optional */
+typedef struct tag_song_metadata_t
+{
+	const char *m_title;
+	song_time_t m_len;
+	song_info_t *m_song_info;
+	song_time_t m_start_time;
+	song_time_t m_end_time;
+} song_metadata_t;
+
+#define SONG_METADATA_EMPTY { NULL, -1, NULL, -1, -1 }
+
 /* Play list type */
 typedef struct
 {
@@ -120,17 +130,20 @@
 typedef struct
 {
 	/* Current song playing time */
-	int m_cur_time;
+	song_time_t m_cur_time;
 
 	/* Current audio parameters */
-	int m_bitrate, m_freq, m_stereo;
+	int m_bitrate, m_freq, m_channels, m_depth;
 
 	/* Player status */
 	int m_status;
 
-	/* Current volume and balance */
-	int m_volume;
-	int m_balance;
+	/* Current volume */
+#define VOLUME_MIN 0.
+#define VOLUME_DEF 1.
+#define VOLUME_MAX 10.
+#define VOLUME_STEP 0.05
+	double m_volume;
 } player_context_t;
 
 #endif

mpfc-2.0.tar.bz2/src/metadata_io.c Added

@@ -0,0 +1,289 @@
+/******************************************************************
+ * Copyright (C) 2003 - 2013 by SG Software.
+ *
+ * SG MPFC. Load and save song info.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <gst/gst.h>
+#include <tag_c.h>
+#include "metadata_io.h"
+#include "util.h"
+	
+/* Get song information using gstreamer */
+static song_info_t *md_get_info_gst( const char *full_name, song_time_t *len )
+{
+	GstElement *pipe = NULL;
+	song_info_t *si = NULL;
+
+	/* Create decoding pipeline */
+	pipe = gst_element_factory_make("playbin", "play");
+	if (!pipe)
+		goto finally;
+	GstElement *sink = gst_element_factory_make("fakesink", NULL);
+	if (!sink)
+		goto finally;
+	g_object_set(G_OBJECT(pipe), "audio-sink", sink, NULL);
+	g_object_set(G_OBJECT(pipe), "uri", full_name, NULL);
+	GstElement *videosink = gst_element_factory_make("fakesink", "videosink");
+	g_object_set(G_OBJECT(pipe), "video-sink", videosink, NULL);
+	gst_element_set_state(pipe, GST_STATE_PAUSED);
+
+	si = si_new();
+
+	/* Listen on the bus for tag messages */
+	for ( ;; )
+	{
+		GstMessage *msg = gst_bus_timed_pop_filtered(GST_ELEMENT_BUS(pipe),
+				GST_CLOCK_TIME_NONE,
+				GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_TAG | GST_MESSAGE_ERROR);
+		if (!msg)
+			break;
+		if (GST_MESSAGE_TYPE(msg) != GST_MESSAGE_TAG)
+		{
+			gst_message_unref(msg);
+			break;
+		}
+
+		GstTagList *tags = NULL;
+		gst_message_parse_tag(msg, &tags);
+		if (tags)
+		{
+			gchar *val;
+			if (gst_tag_list_get_string(tags, GST_TAG_TITLE, &val))
+			{
+				si_set_name(si, val);
+				g_free(val);
+			}
+			if (gst_tag_list_get_string(tags, GST_TAG_ARTIST, &val))
+			{
+				si_set_artist(si, val);
+				g_free(val);
+			}
+			if (gst_tag_list_get_string(tags, GST_TAG_ALBUM, &val))
+			{
+				si_set_album(si, val);
+				g_free(val);
+			}
+			if (gst_tag_list_get_string(tags, GST_TAG_COMMENT, &val))
+			{
+				si_set_comments(si, val);
+				g_free(val);
+			}
+			if (gst_tag_list_get_string(tags, GST_TAG_GENRE, &val))
+			{
+				si_set_genre(si, val);
+				g_free(val);
+			}
+
+			GDate *date;
+			if (gst_tag_list_get_date(tags, GST_TAG_DATE, &date))
+			{
+				char year100 = "";
+				char *p = year;
+				size_t sz = sizeof(year);
+
+				GDateYear y = g_date_get_year(date);
+				if (g_date_valid_year(y))
+				{
+					size_t len = snprintf(p, sz, "%d", y);
+
+					GDateMonth m = g_date_get_month(date);
+					if (g_date_valid_month(m))
+					{
+						p += len;
+						sz -= len;
+						len = snprintf(p, sz, "/%02d", m);
+
+						GDateDay d = g_date_get_day(date);
+						if (g_date_valid_day(d))
+						{
+							p += len;
+							sz -= len;
+							snprintf(p, sz, "/%02d", d);
+						}
+					}
+				}
+				si_set_year(si, year);
+				g_date_free(date);
+			}
+
+			GstDateTime *dt;
+			if (gst_tag_list_get_date_time(tags, GST_TAG_DATE_TIME, &dt))
+			{
+				char year100 = "";
+				char *p = year;
+				size_t sz = sizeof(year);
+
+				if (gst_date_time_has_year(dt))
+				{
+					gint y = gst_date_time_get_year(dt);
+					size_t len = snprintf(p, sz, "%d", y);
+
+					if (gst_date_time_has_month(dt))
+					{
+						gint m = gst_date_time_get_month(dt);
+						p += len;
+						sz -= len;
+						len = snprintf(p, sz, "/%02d", m);
+
+						if (gst_date_time_has_day(dt))
+						{
+							GDateDay d = gst_date_time_get_day(dt);
+							p += len;
+							sz -= len;
+							snprintf(p, sz, "/%02d", d);
+						}
+					}
+				}
+				si_set_year(si, year);
+
+				gst_date_time_unref(dt);
+			}
+
+			unsigned track;
+			if (gst_tag_list_get_uint(tags, GST_TAG_TRACK_NUMBER, &track))
+			{
+				char trackstr20;
+				snprintf(trackstr, sizeof(trackstr), "%02d", track);
+				si_set_track(si, trackstr);
+			}
+
+
+			gst_tag_list_free(tags);
+		}
+
+		gst_message_unref(msg);
+	}
+
+	for ( int i = 0; i < 5; i++ )
+	{
+		/* Get song length */
+		gint64 gst_len;
+		if (gst_element_query_duration(pipe, GST_FORMAT_TIME, &gst_len))
+		{
+			(*len) = gst_len;
+			break;
+		}
+
+		/* Try again */
+		util_wait();
+	}
+
+finally:
+	if (pipe)
+	{
+		gst_element_set_state(pipe, GST_STATE_NULL);
+		gst_object_unref(pipe);
+	}
+	return si;
+} /* End of 'md_get_info_gst' function */
+	
+/* Get song information using taglib */
+static song_info_t *md_get_info_taglib( const char *file_name, song_time_t *len )
+{
+	TagLib_File *file = taglib_file_new(file_name);
+	if (!file)
+		return NULL;
+	if (!taglib_file_is_valid(file))
+	{
+		taglib_file_free(file);
+		return NULL;
+	}
+
+	TagLib_Tag *tag = taglib_file_tag(file);
+
+	song_info_t *si = si_new();
+	si_set_name(si, taglib_tag_title(tag));
+	si_set_artist(si, taglib_tag_artist(tag));
+	si_set_album(si, taglib_tag_album(tag));
+	si_set_comments(si, taglib_tag_comment(tag));
+	si_set_genre(si, taglib_tag_genre(tag));
+
+	unsigned year = taglib_tag_year(tag);
+	if (year > 0)
+	{
+		char y32;
+		snprintf(y, sizeof(y), "%d", year);
+		si_set_year(si, y);
+	}
+
+	unsigned track = taglib_tag_track(tag);
+	if (track > 0)
+	{
+		char t32;
+		snprintf(t, sizeof(t), "%d", track);
+		si_set_track(si, t);
+	}
+
+	(*len) = SECONDS_TO_TIME(taglib_audioproperties_length(taglib_file_audioproperties(file)));
+
+	taglib_tag_free_strings();
+	taglib_file_free(file);
+	return si;
+} /* End of 'md_get_info_taglib' function */
+	
+/* Get song information function */
+song_info_t *md_get_info( const char *file_name, const char *full_uri, song_time_t *len )
+{
+	(*len) = 0;
+	
+	if (file_name)
+	{
+		song_info_t *si = md_get_info_taglib(file_name, len);
+		if (si)
+			return si;
+	}
+
+	if (full_uri)
+		return md_get_info_gst(full_uri, len);
+	return NULL;
+} /* End of 'md_get_info' function */
+
+/* Save song information function */
+bool_t md_save_info( const char *file_name, song_info_t *info )
+{
+	TagLib_File *file = taglib_file_new(file_name);
+	if (!file)
+		return FALSE;
+
+	TagLib_Tag *tag = taglib_file_tag(file);
+
+	taglib_tag_set_title(tag, info->m_name);
+	taglib_tag_set_artist(tag, info->m_artist);
+	taglib_tag_set_album(tag, info->m_album);
+	taglib_tag_set_comment(tag, info->m_comments);
+	taglib_tag_set_genre(tag, info->m_genre);
+
+	long year = strtol(info->m_year, NULL, 10);
+	if (year >= 0 && year < LONG_MAX)
+		taglib_tag_set_year(tag, year);
+
+	long track = strtol(info->m_track, NULL, 10);
+	if (track >= 0 && track < LONG_MAX)
+		taglib_tag_set_track(tag, track);
+
+	bool_t saved = taglib_file_save(file);
+	taglib_file_free(file);
+	return saved;
+} /* End of 'md_save_info' function */
+
+/* End of 'metadata_io.c' file */
+

mpfc-2.0.tar.bz2/src/metadata_io.h Added

@@ -0,0 +1,39 @@
+/******************************************************************
+ * Copyright (C) 2003 - 2013 by SG Software.
+ *
+ * SG MPFC. Load and save song info.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#ifndef __SG_MPFC_METADATA_IO_H__
+#define __SG_MPFC_METADATA_IO_H__
+
+#include "types.h"
+#include "main_types.h"
+#include "song_info.h"
+
+/* Get song information function */
+song_info_t *md_get_info( const char *file_name, const char *full_uri, song_time_t *len );
+	
+/* Save song information function */
+bool_t md_save_info( const char *file_name, song_info_t *info );
+	
+#endif
+
+/* End of 'metadata_io.h' file */
+

mpfc-1.3.8.1.tar.bz2/src/mystring.h -> mpfc-2.0.tar.bz2/src/mystring.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Interface for string management functions.
- * $Id: mystring.h 229 2005-02-21 18:36:59Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -31,70 +31,99 @@
 	/* String data */
 	char *m_data;
 
-	/* String length */
+	/* String length in bytes */
 	int m_len;
 
 	/* Amount of memory allocated for string and size of allocation portion */
 	int m_allocated, m_portion_size;
+
+	/* Multibyte UTF-8 sequence insertion state */
+	int m_bytes_to_complete;
+	int m_utf8_seq_len;
+
+	/* Cached string width. -1 if not initialized */
+	int m_width;
 } str_t;
 
 /* Get string length */
-#define STR_LEN(str) ((str)->m_len)
+#define STR_BYTE_LEN(str) ((str)->m_len)
 
 /* Convert string to (char *) */
 #define STR_TO_CPTR(str) ((str)->m_data)
-
-/* Get string character at the specified position */
-#define STR_AT(str, pos) ((str)->m_datapos)
+#define STR_AT(str, i) (STR_TO_CPTR(str)i)
 
 /* Create a new string */
-str_t *str_new( char *s );
+str_t *str_new( const char *s );
 
 /* Duplicate string */
-str_t *str_dup( str_t *s );
+str_t *str_dup( const str_t *s );
 
 /* Free string */
 void str_free( str_t *str );
  
+/* Clear string */
+void str_clear( str_t *str );
+
 /* Copy string from (char *) */
-str_t *str_copy_cptr( str_t *dest, char *src );
+str_t *str_copy_cptr( str_t *dest, const char *src );
 
 /* Copy string */
-str_t *str_copy( str_t *dest, str_t *src );
+str_t *str_copy( str_t *dest, const str_t *src );
 
 /* Concatenate string with (char *) */
-str_t *str_cat_cptr( str_t *dest, char *src );
+str_t *str_cat_cptr( str_t *dest, const char *src );
 
 /* Concatenate strings */
-str_t *str_cat( str_t *dest, str_t *src );
+str_t *str_cat( str_t *dest, const str_t *src );
 
-/* Insert a character to string */
-void str_insert_char( str_t *str, char ch, int index );
+/* Insert a character into string 
+ * Returns number of inserted screen positions
+ * If string becomes temporarily inconsistent (because incomplete utf-8 sequence
+ * has been inserted) return value is negative */
+int str_insert_char( str_t *str, char ch, int index );
 
 /* Delete a character from string */
-char str_delete_char( str_t *str, int index );
+bool_t str_delete_char( str_t *str, int index, bool_t before );
 
 /* Replace all characters 'from' to 'to' */
 void str_replace_char( str_t *str, char from, char to );
 
 /* Insert a (char *) */
-str_t *str_insert_cptr( str_t *dest, char *src, int index );
+str_t *str_insert_cptr( str_t *dest, const char *src, int index );
 
 /* Insert a string */
-str_t *str_insert_str( str_t *dest, str_t *src, int index );
+str_t *str_insert_str( str_t *dest, const str_t *src, int index );
 
 /* Extract a substring */
-str_t *str_substring( str_t *str, int start, int end );
+str_t *str_substring( const str_t *str, int start, int end );
 
 /* Extract a substring from (char *) */
-str_t *str_substring_cptr( char *str, int start, int end );
+str_t *str_substring_cptr( const char *str, int start, int end );
 
 /* Formatted print */
-int str_printf( str_t *str, char *fmt, ... );
+int str_printf( str_t *str, const char *fmt, ... );
 
 /* Escape the special symbols (assuming that string is a file name) */
 void str_fn_escape_specs( str_t *str, bool_t escape_slashes );
 
+/* Decode multibyte sequence at the given position */
+wchar_t str_wchar_at( str_t *str, unsigned pos, int *nbytes );
+
+/* Calculate display width of the string */
+int str_calc_width( str_t *str );
+
+/* Get display width of the string */
+static inline int str_width( str_t *str )
+{
+	if (str->m_width >= 0)
+		return str->m_width;
+	return str_calc_width(str);
+}
+
+/* Skip 'delta' displayable positions from byte_pos
+ * sym_pos may be updated by a different delta if wide symbols are encountered */
+void str_skip_positions( str_t *str, int *byte_pos, int *sym_pos, int delta );
+
 #endif
 
 /* End of 'mystring.h' file */

mpfc-1.3.8.1.tar.bz2/src/player.c -> mpfc-2.0.tar.bz2/src/player.c Changed

@@ -1,8 +1,8 @@
 /******************************************************************
- * Copyright (C) 2003 - 2005 by SG Software.
+ * Copyright (C) 2003 - 2013 by SG Software.
  *
  * SG MPFC. Main player functions implementation.
- * $Id: player.c 308 2011-03-13 12:16:29Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -26,26 +26,28 @@
 #include <sys/soundcard.h>
 #include <stdio.h>
 #include <stdlib.h>
-#define __USE_GNU
 #include <string.h>
 #include <unistd.h>
+#include <gst/gst.h>
+#include <gst/audio/streamvolume.h>
+#include <gst/audio/audio.h>
+#include <json-glib/json-glib.h>
 #include "types.h"
 #include "browser.h"
 #include "cfg.h"
 #include "command.h"
-#include "eqwnd.h"
-#include "file.h"
 #include "help_screen.h"
+#include "json_helpers.h"
 #include "logger.h"
 #include "logger_view.h"
 #include "main_types.h"
 #include "player.h"
 #include "plist.h"
 #include "pmng.h"
+#include "server.h"
 #include "test.h"
 #include "undo.h"
 #include "util.h"
-#include "vfs.h"
 #include "wnd.h"
 #include "wnd_button.h"
 #include "wnd_checkbox.h"
@@ -58,7 +60,9 @@
 #include "wnd_multiview_dialog.h"
 #include "wnd_radio.h"
 #include "wnd_root.h"
-#include "xconvert.h"
+#include "wnd_repval.h"
+#include "info_rw_thread.h"
+#include "genp.h"
 
 /*****
  *
@@ -89,25 +93,18 @@
 /* Player termination flag */
 volatile bool_t player_end_thread = FALSE;
 
-/* Timer thread ID */
-pthread_t player_timer_tid = 0;
-
 /* Timer termination flag */
-volatile bool_t player_end_timer = FALSE;
 volatile bool_t player_end_track = FALSE;
 
 /* Player context */
 player_context_t *player_context = NULL;
 
-/* Has equalizer value changed */
-bool_t player_eq_changed = FALSE;
+bool_t player_end_of_stream = FALSE;
+GstElement *player_pipeline = NULL;
 
 /* Edit boxes history lists */
 editbox_history_t *player_hist_listsPLAYER_NUM_HIST_LISTS;
 
-/* Current input plugin */
-in_plugin_t *player_inp = NULL;
-
 /* Undo list */
 undo_list_t *player_ul = NULL;
 
@@ -126,10 +123,8 @@
 int player_last_pos = -1;
 
 /* Last position in song */
-int player_last_song = -1, player_last_song_time = -1;
-
-#define PLAYER_STEREO 1
-#define PLAYER_MONO 2
+int player_last_song = -1;
+song_time_t player_last_song_time = -1;
 
 /* Plugins manager */
 pmng_t *player_pmng = NULL;
@@ -137,6 +132,7 @@
 /* User configuration file name */
 char player_cfg_fileMAX_FILE_NAME = "";
 char player_cfg_autosave_fileMAX_FILE_NAME = "";
+char player_cfg_dirMAX_FILE_NAME = "";
 
 /* Previous file browser session directory name */
 char player_fb_dirMAX_FILE_NAME = "";
@@ -155,10 +151,7 @@
 logger_view_t *player_logview = NULL;
 
 /* Standard value for edit boxes width */
-#define PLAYER_EB_WIDTH	50
-
-/* VFS data */
-vfs_t *player_vfs = NULL;
+#define PLAYER_EB_WIDTH	(2 * WND_WIDTH(player_wnd) / 3)
 
 /* enqueued songs */
 int queued_songsPLAYER_MAX_ENQUEUED;
@@ -167,9 +160,16 @@
 /* Main thread ID */
 pthread_t player_main_tid = 0; 
 
-/* Output plugin used to play current song (this is not the same as
- * pmng->m_cur_out */
-out_plugin_t *player_cur_outp = NULL;
+#define VOLUME_SLIDER_RANGE (VOLUME_DEF * 2)
+
+/* Forward decls */
+static void player_info_dialog_set_if_readonly( dialog_t *dlg );
+static bool_t player_handle_var_title_format( cfg_node_t *var, char *value, void *data );
+static bool_t player_handle_color_scheme( cfg_node_t *var, char *value, void *data );
+static bool_t player_handle_kbind_scheme( cfg_node_t *var, char *value, void *data );
+static void player_audio_setup_dlg( void );
+static void player_welcome_dialog( void );
+static void player_utf8_dialog( void );
 
 /*****
  *
@@ -177,6 +177,80 @@
  *
  *****/
 
+/* Load player state */
+static void player_load_state( void )
+{
+	char *fname = util_strcat(getenv("HOME"), "/.mpfc/state", NULL);
+	if (!fname)
+		goto finally_fname;
+
+	/* Parse */
+	JsonParser *parser = json_parser_new();
+	if (!json_parser_load_from_file(parser, fname, NULL))
+	{
+		logger_error(player_log, 1, _("unable to parse player state"));
+		goto finally_fname;
+	}
+
+	JsonNode *root_node = json_parser_get_root(parser);
+	if (!root_node || !JSON_NODE_HOLDS_OBJECT(root_node))
+		goto finally_js;
+	JsonObject *js_root = json_node_get_object(root_node);
+
+	/* Load playlist */
+	JsonArray *js_plist = js_get_array(js_root, "plist");
+	if (js_plist)
+		plist_import_from_json(player_plist, js_plist);
+
+	/* Start playing from last stop */
+	if (cfg_get_var_int(cfg_list, "play-from-stop"))
+	{
+		logger_debug(player_log, "Playing from stop");
+		player_context->m_status = js_get_int(js_root, "player-status", PLAYER_STATUS_STOPPED);
+		player_start = js_get_int(js_root, "player-start", 0) - 1;
+		player_end = js_get_int(js_root, "player-end", 0) - 1;
+		if (player_context->m_status != PLAYER_STATUS_STOPPED)
+			player_play(js_get_int(js_root, "cur-song", -1),
+					js_get_int(js_root, "cur-time", 0));
+		player_context->m_volume = js_get_double(js_root, "volume", VOLUME_DEF);
+	}
+
+finally_js:
+	g_object_unref(parser);
+
+finally_fname:
+	free(fname);
+}
+
+/* Save player state */
+static void player_save_state( void )
+{
+	JsonObject *js_root = json_object_new();
+
+	/* Save playlist */
+	if (player_plist && cfg_get_var_int(cfg_list, "save-playlist-on-exit"))
+	{
+		json_object_set_array_member(js_root, "plist", plist_export_to_json(player_plist));
+	}
+
+	/* Save player state */
+	json_object_set_int_member(js_root, "cur-song", player_plist->m_cur_song);
+	json_object_set_int_member(js_root, "cur-time", player_context->m_cur_time);
+	json_object_set_int_member(js_root, "player-status", player_context->m_status);
+	json_object_set_int_member(js_root, "player-start", player_start + 1);
+	json_object_set_int_member(js_root, "player-end", player_end + 1);
+	json_object_set_double_member(js_root, "volume", player_context->m_volume);
+
+	/* Save to a file */
+	JsonGenerator *gen = json_generator_new();
+	json_generator_set_root(gen, js_make_node(js_root));
+	char *fname = util_strcat(getenv("HOME"), "/.mpfc/state", NULL);
+	json_generator_to_file(gen, fname, NULL);
+
+	/* Save some stuff through the cfg system */
+	player_save_cfg();
+}
+
 /* Initialize player */
 bool_t player_init( int argc, char *argv )
 {
@@ -184,17 +258,21 @@
 	plist_set_t *set;
 	time_t t;
 	char *str_time;
+	bool_t is_utf8 = TRUE;
 
 	/* Set signal handlers */
 	player_main_tid = pthread_self();
 	signal(SIGINT, player_handle_signal);
 	signal(SIGTERM, player_handle_signal);
+	signal(SIGPIPE, player_handle_signal);
 	
 	/* Initialize configuration */
+	snprintf(player_cfg_dir, sizeof(player_cfg_dir), 
+			"%s/.mpfc", getenv("HOME"));
 	snprintf(player_cfg_file, sizeof(player_cfg_file), 
-			"%s/.mpfc/mpfcrc", getenv("HOME"));
+			"%s/mpfcrc", player_cfg_dir);
 	snprintf(player_cfg_autosave_file, sizeof(player_cfg_autosave_file), 
-			"%s/.mpfc/autosave", getenv("HOME"));
+			"%s/autosave", player_cfg_dir);
 	if (!player_init_cfg())
 	{
 		fprintf(stderr, _("Unable to initialize configuration"));
@@ -223,10 +301,10 @@
 	player_context->m_cur_time = 0;
 	player_context->m_bitrate = 0;
 	player_context->m_freq = 0;
-	player_context->m_stereo = 0;
+	player_context->m_depth = 0;
+	player_context->m_channels = 0;
 	player_context->m_status = PLAYER_STATUS_STOPPED;
-	player_context->m_volume = 0;
-	player_context->m_balance = 0;
+	player_context->m_volume = VOLUME_DEF;
 
 	/* Parse command line */
 	logger_debug(player_log, "In player_init");
@@ -244,6 +322,13 @@
 	}
 	wnd_msg_add_handler(wnd_root, "destructor", player_root_destructor);
 
+	/* Check that we have an utf8 locale */
+	if (!util_check_utf8_mode())
+	{
+		is_utf8 = FALSE;
+		logger_fatal(player_log, 0, "Your locale is not UTF-8! Text handling will work incorrectly");
+	}
+
 	/* Initialize play list window */
 	logger_debug(player_log, "Initializing play list window");
 	player_wnd = WND_OBJ(player_wnd_new(wnd_root));
@@ -271,15 +356,6 @@
 	player_pmng->m_player_wnd = player_wnd;
 	player_pmng->m_player_context = player_context;
 
-	/* Initialize VFS */
-	logger_debug(player_log, "Initializing VFS");
-	player_vfs = vfs_init(player_pmng);
-	if (player_vfs == NULL)
-	{
-		logger_fatal(player_log, 0, _("Unable to initialize VFS module"));
-		return FALSE;
-	}
-
 	/* Initialize info read/write thread */
 	logger_debug(player_log, "Initializing info read/write thread");
 	if (!irw_init())
@@ -324,7 +400,7 @@
 	/* Load saved play list if files list is empty */
 	logger_debug(player_log, "Adding list.m3u");
 	if (!player_num_files)
-		plist_add(player_plist, "~/.mpfc/list.m3u");
+		player_load_state();
 
 	/* Initialize history lists */
 	logger_debug(player_log, "Initializing history");
@@ -339,30 +415,21 @@
 		return FALSE;
 	}
 
-	/* Get volume */
-	player_read_volume();
-
 	/* Initialize marks */
 	for ( i = 0; i < PLAYER_NUM_MARKS; i ++ )
 		player_marksi = -1;
 
-	/* Initialize equalizer */
-	player_eq_changed = FALSE;
-
-	/* Start playing from last stop */
-	if (cfg_get_var_int(cfg_list, "play-from-stop") && !player_num_files)
-	{
-		logger_debug(player_log, "Playing from stop");
-		player_context->m_status = cfg_get_var_int(cfg_list, "player-status");
-		player_start = cfg_get_var_int(cfg_list, "player-start") - 1;
-		player_end = cfg_get_var_int(cfg_list, "player-end") - 1;
-		if (player_context->m_status != PLAYER_STATUS_STOPPED)
-			player_play(cfg_get_var_int(cfg_list, "cur-song"),
-					cfg_get_var_int(cfg_list, "cur-time"));
-	}
+	/* Start server */
+	server_start();
 
 	/* Exit */
 	logger_message(player_log, 0, _("Player initialized"));
+
+	/* Show startup dialogs */
+	if (!is_utf8)
+		player_utf8_dialog();
+	player_welcome_dialog();
+
 	return TRUE;
 } /* End of 'player_init' function */
 
@@ -396,7 +463,6 @@
 	wnd_msg_add_handler(wnd, "mouse_mdown", player_on_mouse_mdown);
 	wnd_msg_add_handler(wnd, "mouse_ldouble", player_on_mouse_ldouble);
 	wnd_msg_add_handler(wnd, "user", player_on_user);
-	wnd_msg_add_handler(wnd, "command", player_on_command);
 
 	/* Set fields */
 	wnd->m_cursor_hidden = TRUE;
@@ -409,21 +475,13 @@
 {
 	logger_debug(player_log, "In player_root_destructor");
 
-	/* Save information about place in song where we stop */
-	logger_debug(player_log, "Saving position to configuration");
-	cfg_set_var_int(cfg_list, "cur-song", 
-			player_plist->m_cur_song);
-	cfg_set_var_int(cfg_list, "cur-time", player_context->m_cur_time);
-	cfg_set_var_int(cfg_list, "player-status", player_context->m_status);
-	cfg_set_var_int(cfg_list, "player-start", player_start + 1);
-	cfg_set_var_int(cfg_list, "player-end", player_end + 1);
-	player_save_cfg();
+	/* Save player state */
+	player_save_state();
 	
 	/* End playing thread */
 	logger_debug(player_log, "Doing irw_free");
 	irw_free();
 	logger_debug(player_log, "Setting next song to NULL");
-	inp_set_next_song(player_inp, NULL);
 	if (player_tid)
 	{
 		logger_debug(player_log, "Stopping player thread");
@@ -451,6 +509,9 @@
 
 	logger_debug(player_log, "In player_deinit");
 
+	/* Stop server */
+	server_stop();
+
 	/* Uninitialize plugin manager */
 	logger_debug(player_log, "Doing pmng_free");
 	pmng_free(player_pmng);
@@ -475,13 +536,6 @@
 	/* Destroy all objects */
 	if (player_plist != NULL)
 	{
-		/* Save play list */
-		if (cfg_get_var_int(cfg_list, "save-playlist-on-exit"))
-		{
-			logger_debug(player_log, "Saving play list");
-			plist_save(player_plist, "~/.mpfc/list.m3u");
-		}
-		
 		logger_debug(player_log, "Destroying play list");
 		plist_free(player_plist);
 		player_plist = NULL;
@@ -489,8 +543,6 @@
 	logger_debug(player_log, "Freeing undo information");
 	undo_free(player_ul);
 	player_ul = NULL;
-	logger_debug(player_log, "Freeing VFS");
-	vfs_free(player_vfs);
 	if (player_context != NULL)
 	{
 		free(player_context);
@@ -621,8 +673,6 @@
 	cfg_new_var(cfg_list, "player-end", CFG_NODE_RUNTIME, NULL, NULL);
 	cfg_new_var(cfg_list, "title-format", 0, NULL, 
 			player_handle_var_title_format);
-	cfg_new_var(cfg_list, "output-plugin", 0, NULL, 
-			player_handle_var_outp);
 	cfg_new_var(cfg_list, "color-scheme", 0, NULL,
 			player_handle_color_scheme);
 	cfg_new_var(cfg_list, "kbind-scheme", 0, NULL, 
@@ -632,11 +682,9 @@
 	log_file = util_strcat(getenv("HOME"), "/.mpfc/log", NULL);
 	cfg_set_var(cfg_list, "log-file", log_file);
 	free(log_file);
-	cfg_set_var(cfg_list, "output-plugin", "oss");
 	cfg_set_var_int(cfg_list, "save-playlist-on-exit", 1);
 	cfg_set_var_int(cfg_list, "play-from-stop", 1);
 	cfg_set_var(cfg_list, "lib-dir", LIBDIR"/mpfc");
-	cfg_set_var_bool(cfg_list, "equalizer.enable-on-change", TRUE);
 	cfg_set_var_bool(cfg_list, "autosave-plugins-params", TRUE);
 	cfg_set_var_bool(cfg_list, "search-nocase", TRUE);
 	cfg_set_var_bool(cfg_list, "view-follows-cur-song", TRUE);
@@ -652,31 +700,31 @@
 /* Save some variables to file */
 void player_save_cfg( void )
 {
-	FILE *fd;
-	char *names = 
-	{ 
-		"cur-song", "cur-time", "player-status", "player-start", "player-end",
-		"equalizer"
-	};
-	int num_vars = sizeof(names) / sizeof(*names), i;
+	/* See if ~/.mpfc/ directory exists */
+	DIR *dir = opendir(player_cfg_dir);
+	if (!dir)
+	{
+		logger_message(player_log, 1, _("creating directory %s\n"), player_cfg_dir);
+		mkdir(player_cfg_dir, 0770);
+	}
+	else
+		closedir(dir);
 
 	/* Open file */
-	fd = fopen(player_cfg_autosave_file, "wt");
+	FILE *fd = fopen(player_cfg_autosave_file, "wt");
 	if (fd == NULL)
 		return;
 
-	/* Save the vars */
-	for ( i = 0; i < num_vars; i ++ )
-	{
-		cfg_node_t *node = cfg_search_node(cfg_list, namesi);
-		if (node == NULL)
-			continue;
-		cfg_rcfile_save_node(fd, node, NULL);
-	}
-
 	/* Save plugins parameters if need */
 	if (cfg_get_var_bool(cfg_list, "autosave-plugins-params"))
+	{
 		cfg_rcfile_save_node(fd, cfg_search_node(cfg_list, "plugins"), NULL);
+		cfg_rcfile_save_node(fd, cfg_search_node(cfg_list, "gstreamer"), NULL);
+	}
+
+	/* Save 'dont_show' values for startup information dialogs */
+	cfg_rcfile_save_node(fd, cfg_search_node(cfg_list, "dont_show"), NULL);
+
 	fclose(fd);
 } /* End of 'player_save_cfg' function */
 
@@ -709,17 +757,15 @@
 /* Handle action */
 wnd_msg_retcode_t player_on_action( wnd_t *wnd, char *action, int repval )
 {
-	int was_pos;
-	int was_song, was_time;
 	bool_t long_jump = FALSE;
 	int rp;
 
 	/* Clear message string */
 	player_msg = NULL;
 
-	was_pos = player_plist->m_sel_end;
-	was_song = player_plist->m_cur_song;
-	was_time = player_context->m_cur_time;
+	int was_pos = player_plist->m_sel_end;
+	int was_song = player_plist->m_cur_song;
+	song_time_t was_time = player_context->m_cur_time;
 
 	if (repval > 0)
 		rp = repval;
@@ -734,8 +780,7 @@
 	/* Queue up a song */
 	else if (!strcasecmp(action, "queue"))
 	{
-		if(num_queued_songs < PLAYER_MAX_ENQUEUED)
-			queued_songsnum_queued_songs++ = player_plist->m_sel_end;
+		player_queue_song();
 	}
 	/* Show help screen */
 	else if (!strcasecmp(action, "help"))
@@ -788,47 +833,42 @@
 	/* Seek song forward */
 	else if (!strcasecmp(action, "time_fw"))
 	{
-		player_seek((rp == 0) ? 10 : 10 * rp, TRUE);
+		player_seek(SECONDS_TO_TIME((rp == 0) ? 10 : 10 * rp), TRUE);
 	}
 	/* Seek song backward */
 	else if (!strcasecmp(action, "time_bw"))
 	{
-		player_seek((rp == 0) ? -10 : -10 * rp, TRUE);
+		player_seek(SECONDS_TO_TIME((rp == 0) ? -10 : -10 * rp), TRUE);
 	}
 	/* Long seek song forward */
 	else if (!strcasecmp(action, "time_long_fw"))
 	{
-		player_seek((rp == 0) ? 60 : 60 * rp, TRUE);
+		player_seek(SECONDS_TO_TIME((rp == 0) ? 60 : 60 * rp), TRUE);
 	}
 	/* Long seek song backwards */
 	else if (!strcasecmp(action, "time_long_bw"))
 	{
-		player_seek((rp == 0) ? -60 : -60 * rp, TRUE);
+		player_seek(SECONDS_TO_TIME((rp == 0) ? -60 : -60 * rp), TRUE);
 	}
 	/* Seek to any position */
 	else if (!strcasecmp(action, "time_move"))
 	{
-		player_seek((rp == 0) ? 0 : rp, FALSE);
+		player_seek(SECONDS_TO_TIME((rp == 0) ? 0 : rp), FALSE);
 	}
 	/* Increase volume */
 	else if (!strcasecmp(action, "vol_fw"))
 	{
-		player_set_vol((rp == 0) ? 5 : 5 * rp, TRUE);
+		player_set_vol((rp == 0) ? VOLUME_STEP : VOLUME_STEP * rp, TRUE);
 	}
 	/* Decrease volume */
 	else if (!strcasecmp(action, "vol_bw"))
 	{
-		player_set_vol((rp == 0) ? -5 : -5 * rp, TRUE);
-	}
-	/* Increase balance */
-	else if (!strcasecmp(action, "bal_fw"))
-	{
-		player_set_bal((rp == 0) ? 5 : 5 * rp, TRUE);
+		player_set_vol((rp == 0) ? -VOLUME_STEP : -VOLUME_STEP * rp, TRUE);
 	}
-	/* Decrease balance */
-	else if (!strcasecmp(action, "bal_bw"))
+	/* Set volume to default */
+	else if (!strcasecmp(action, "vol_def"))
 	{
-		player_set_bal((rp == 0) ? -5 : -5 * rp, TRUE);
+		player_set_vol(VOLUME_DEF, FALSE);
 	}
 	/* Centrize view */
 	else if (!strcasecmp(action, "centrize"))
@@ -844,12 +884,7 @@
 	/* Resume playing */
 	else if (!strcasecmp(action, "play"))
 	{
-		if (player_context->m_status == PLAYER_STATUS_PAUSED)
-		{
-			inp_resume(player_inp);
-			outp_resume(player_cur_outp);
-		}
-		else
+		if (player_context->m_status != PLAYER_STATUS_PAUSED)
 			player_play(player_plist->m_cur_song, 0);
 		player_context->m_status = PLAYER_STATUS_PLAYING;
 
@@ -858,39 +893,20 @@
 	/* Pause */
 	else if (!strcasecmp(action, "pause"))
 	{
-		if (player_context->m_status == PLAYER_STATUS_PLAYING)
-		{
-			player_context->m_status = PLAYER_STATUS_PAUSED;
-			inp_pause(player_inp);
-			outp_pause(player_cur_outp);
-		}
-		else if (player_context->m_status == PLAYER_STATUS_PAUSED)
-		{
-			player_context->m_status = PLAYER_STATUS_PLAYING;
-			inp_resume(player_inp);
-			outp_resume(player_cur_outp);
-		}
-
-		pmng_hook(player_pmng, "player-status");
+		player_pause_resume();
 	}
 	/* Stop */
 	else if (!strcasecmp(action, "stop"))
 	{
-		player_context->m_status = PLAYER_STATUS_STOPPED;
-		player_end_play(FALSE);
-		player_plist->m_cur_song = was_song;
-		pmng_hook(player_pmng, "player-status");
+		player_stop();
 	}
 	/* Play song */
 	else if (!strcasecmp(action, "start_play"))
 	{
 		if (player_plist->m_len > 0)
 		{
-			player_context->m_status = PLAYER_STATUS_PLAYING;
-			player_play(player_plist->m_sel_end, 0);
+			player_start_play(player_plist->m_sel_end, 0);
 		}
-
-		pmng_hook(player_pmng, "player-status");
 	}
 	/* Go to next song */
 	else if (!strcasecmp(action, "next"))
@@ -952,11 +968,6 @@
 					player_plist->m_sel_end);
 		long_jump = TRUE;
 	}
-	/* Show equalizer dialog */
-	else if (!strcasecmp(action, "equalizer"))
-	{
-		eqwnd_new(wnd_root);
-	}
 	/* Set/unset shuffle mode */
 	else if (!strcasecmp(action, "shuffle"))
 	{
@@ -974,6 +985,11 @@
 	{
 		player_var_manager();
 	}
+	/* Audio output setup */
+	else if (!strcasecmp(action, "audio_setup"))
+	{
+		player_audio_setup_dlg();
+	}
 	/* Move play list down */
 	else if (!strcasecmp(action, "plist_down"))
 	{
@@ -1127,18 +1143,10 @@
 	else if (y == PLAYER_SLIDER_VOL_Y && x >= PLAYER_SLIDER_VOL_X &&
 				x <= PLAYER_SLIDER_VOL_X + PLAYER_SLIDER_VOL_W)
 	{
-		player_set_vol((x - PLAYER_SLIDER_VOL_X) * 100 / 
+		player_set_vol((x - PLAYER_SLIDER_VOL_X) * VOLUME_SLIDER_RANGE / 
 				PLAYER_SLIDER_VOL_W, FALSE);
 		wnd_invalidate(wnd);
 	}
-	/* Set balance */
-	else if (y == PLAYER_SLIDER_BAL_Y && x >= PLAYER_SLIDER_BAL_X &&
-				x <= PLAYER_SLIDER_BAL_X + PLAYER_SLIDER_BAL_W)
-	{
-		player_set_bal((x - PLAYER_SLIDER_BAL_X) * 100 / 
-				PLAYER_SLIDER_BAL_W, FALSE);
-		wnd_invalidate(wnd);
-	}
 	/* Set time */
 	else if (y == PLAYER_SLIDER_TIME_Y && x >= PLAYER_SLIDER_TIME_X &&
 				x <= PLAYER_SLIDER_TIME_X + PLAYER_SLIDER_TIME_W)
@@ -1211,119 +1219,6 @@
 	return WND_MSG_RETCODE_OK;
 } /* End of 'player_on_user' function */
 
-/* Handle command message */
-wnd_msg_retcode_t player_on_command( wnd_t *wnd, char *cmd, 
-		cmd_params_list_t *params )
-{
-	logger_debug(player_log, "got message %s", cmd);
-
-	/* Clear play list */
-	if (!strcmp(cmd, "plist-clear"))
-	{
-		player_plist->m_sel_start = 0;
-		player_plist->m_sel_end = player_plist->m_len;
-		plist_rem(player_plist);
-	}
-	/* Add a file to play list */
-	else if (!strcmp(cmd, "plist-add"))
-	{
-		char *name = cmd_next_string_param(params);
-		if (name != NULL)
-		{
-			plist_add(player_plist, name);
-			free(name);
-
-			if (cmd_check_next_param(params))
-			{
-				int pos = cmd_next_int_param(params);
-				plist_move(player_plist, player_plist->m_len - 1, FALSE);
-				plist_move_sel(player_plist, pos, FALSE);
-			}
-		}
-	}
-	/* Delete song from play list */
-	else if (!strcmp(cmd, "plist-del"))
-	{
-		int index = cmd_next_int_param(params);
-		if (index >= 0 && index < player_plist->m_len)
-		{
-			plist_move(player_plist, index, FALSE);
-			plist_rem(player_plist);
-		}
-	}
-	/* Play track */
-	else if (!strcmp(cmd, "play"))
-	{
-		int track = cmd_next_int_param(params);
-		player_context->m_status = PLAYER_STATUS_PLAYING;
-		player_play(track, 0);
-	}
-	/* Seek to time in current song */
-	else if (!strcmp(cmd, "seek"))
-	{
-		int value = cmd_next_int_param(params);
-		int relative = cmd_next_int_param(params);
-		player_seek(value, relative);
-	}
-	/* Set option */
-	else if (!strcmp(cmd, "cfg"))
-	{
-		char *name = cmd_next_string_param(params);
-		char *value = cmd_next_string_param(params);
-		if (name != NULL)
-		{
-			if (value != NULL)
-				cfg_set_var(cfg_list, name, value);
-			else 
-				cfg_set_var_bool(cfg_list, name, TRUE);
-		}
-	}
-	/* Set volume */
-	else if (!strcmp(cmd, "set-volume"))
-	{
-		player_context->m_volume = cmd_next_int_param(params);
-		player_update_vol();
-	}
-	/* Set balance */
-	else if (!strcmp(cmd, "set-balance"))
-	{
-		player_context->m_balance = cmd_next_int_param(params);
-		player_update_vol();
-	}
-	/* Set volume with both channels specification */
-	else if (!strcmp(cmd, "set-volume-full"))
-	{
-		int left = cmd_next_int_param(params);
-		int right = cmd_next_int_param(params);
-		if (left < 0)
-			left = 0;
-		else if (left > 100)
-			left = 100;
-		if (right < 0)
-			right = 0;
-		else if (right > 100)
-			right = 100;
-		outp_set_volume(player_cur_outp, left, right);
-		player_read_volume();
-	}
-	/* Simulate an action */
-	else if (!strcmp(cmd, "action"))
-	{
-		char *action;
-
-		action = cmd_next_string_param(params);
-		logger_debug(player_log, "action is %s", action);
-		if (action != NULL)
-		{
-			int repval = cmd_next_int_param(params);
-			logger_debug(player_log, "repval is %d", repval);
-			wnd_msg_send(player_wnd, "action", wnd_msg_action_new(action, repval));
-			free(action);
-		}
-	}
-	return WND_MSG_RETCODE_OK;
-} /* End of 'player_on_command' function */
-
 /* Display player function */
 wnd_msg_retcode_t player_on_display( wnd_t *wnd )
 {
@@ -1341,14 +1236,17 @@
 		wnd_move(wnd, 0, 0, 0);
 		wnd_apply_style(wnd, "about-style");
 		wnd_printf(wnd, 0, 0, _("SG Software Media Player For Console"));
+
+		/* Set root title */
+		wnd_set_global_title(wnd, "MPFC");
 		
 		/* Print shuffle mode */
 		shuffle_str = _("Shuffle");
 		loop_str = _("Loop");
 		if (cfg_get_var_int(cfg_list, "shuffle-play"))
 		{
-			wnd_move(wnd, 0, WND_WIDTH(wnd) - strlen(shuffle_str) - 
-					strlen(loop_str) - 2, 0);
+			wnd_move(wnd, 0, WND_WIDTH(wnd) - utf8_width(shuffle_str) - 
+					utf8_width(loop_str) - 2, 0);
 			wnd_apply_style(wnd, "play-modes-style");
 			wnd_printf(wnd, 0, 0, shuffle_str);
 		}
@@ -1356,7 +1254,7 @@
 		/* Print loop mode */
 		if (cfg_get_var_int(cfg_list, "loop-play"))
 		{
-			wnd_move(wnd, 0, WND_WIDTH(wnd) - strlen(loop_str) - 1, 0);
+			wnd_move(wnd, 0, WND_WIDTH(wnd) - utf8_width(loop_str) - 1, 0);
 			wnd_apply_style(wnd, "play-modes-style");
 			wnd_printf(wnd, 0, 0, loop_str);
 		}
@@ -1368,7 +1266,6 @@
 	}
 	else
 	{
-		int t;
 		bool_t show_rem;
 		char *shuffle_str, *loop_str;
 		
@@ -1379,13 +1276,18 @@
 		wnd_printf(wnd, WND_PRINT_ELLIPSES, WND_WIDTH(wnd) - 1, "%s", 
 				STR_TO_CPTR(s->m_title));
 
+		/* Set root title */
+		char *root_title = util_strcat("MPFC :: ", STR_TO_CPTR(s->m_title), NULL);
+		wnd_set_global_title(wnd, root_title);
+		free(root_title);
+		
 		/* Print shuffle mode */
 		shuffle_str = _("Shuffle");
 		loop_str = _("Loop");
 		if (cfg_get_var_int(cfg_list, "shuffle-play"))
 		{
-			wnd_move(wnd, 0, WND_WIDTH(wnd) - strlen(shuffle_str) - 
-					strlen(loop_str) - 2, 0);
+			wnd_move(wnd, 0, WND_WIDTH(wnd) - utf8_width(shuffle_str) - 
+					utf8_width(loop_str) - 2, 0);
 			wnd_apply_style(wnd, "play-modes-style");
 			wnd_printf(wnd, 0, 0, shuffle_str);
 		}
@@ -1393,19 +1295,20 @@
 		/* Print loop mode */
 		if (cfg_get_var_int(cfg_list, "loop-play"))
 		{
-			wnd_move(wnd, 0, WND_WIDTH(wnd) - strlen(loop_str) - 1, 0);
+			wnd_move(wnd, 0, WND_WIDTH(wnd) - utf8_width(loop_str) - 1, 0);
 			wnd_apply_style(wnd, "play-modes-style");
 			wnd_printf(wnd, 0, 0, loop_str);
 		}
 
 		/* Print current time */
-		t = (show_rem = cfg_get_var_int(cfg_list, "show-time-remaining")) ? 
+		song_time_t t = (show_rem = cfg_get_var_int(cfg_list, "show-time-remaining")) ? 
 			s->m_len - player_context->m_cur_time : player_context->m_cur_time;
+		int ts = TIME_TO_SECONDS(t);
+		int l = TIME_TO_SECONDS(s->m_len);
 		wnd_move(wnd, 0, 0, 1);
 		wnd_apply_style(wnd, "time-style");
 		wnd_printf(wnd, 0, 0, "%s%i:%02i/%i:%02i\n", 
-				show_rem ? "-" : "", t / 60, t % 60,
-				s->m_len / 60, s->m_len % 60);
+				show_rem ? "-" : "", ts / 60, ts % 60, l / 60, l % 60);
 	}
 
 	/* Display current audio parameters */
@@ -1415,21 +1318,36 @@
 		aparams_ptr += sprintf(aparams_ptr, "%d kbps ", player_context->m_bitrate);
 	if (player_context->m_freq)
 		aparams_ptr += sprintf(aparams_ptr, "%d Hz ", player_context->m_freq);
-	if (player_context->m_stereo)
-		aparams_ptr += sprintf(aparams_ptr, "%s", 
-				(player_context->m_stereo == player_context->m_stereo) ? "stereo" : "mono");
-	wnd_move(wnd, 0, PLAYER_SLIDER_BAL_X - strlen(aparams) - 1, 
-			PLAYER_SLIDER_BAL_Y);
+	if (player_context->m_depth)
+		aparams_ptr += sprintf(aparams_ptr, "%db ", player_context->m_depth);
+	if (player_context->m_channels)
+	{
+		switch (player_context->m_channels)
+		{
+		case 1:
+			aparams_ptr += sprintf(aparams_ptr, "Mono");
+			break;
+		case 2:
+			aparams_ptr += sprintf(aparams_ptr, "Stereo");
+			break;
+		case 4:
+			aparams_ptr += sprintf(aparams_ptr, "Quadro");
+			break;
+		default:
+			aparams_ptr += sprintf(aparams_ptr, "%d-chan", player_context->m_channels);
+			break;
+		}
+	}
+	wnd_move(wnd, 0, WND_WIDTH(player_wnd) - utf8_width(aparams) - 1, 
+			PLAYER_SLIDER_VOL_Y - 1);
 	wnd_apply_style(wnd, "audio-params-style");
 	wnd_printf(wnd, 0, 0, "%s", aparams);
 
 	/* Display various slidebars */
-	player_display_slider(wnd, PLAYER_SLIDER_BAL_X, PLAYER_SLIDER_BAL_Y,
-			PLAYER_SLIDER_BAL_W, player_context->m_balance, 100.);
 	player_display_slider(wnd, PLAYER_SLIDER_TIME_X, PLAYER_SLIDER_TIME_Y, 
-			PLAYER_SLIDER_TIME_W, player_context->m_cur_time, (s == NULL) ? 0 : s->m_len);
+			PLAYER_SLIDER_TIME_W, player_context->m_cur_time, (s == NULL) ? -1 : s->m_len);
 	player_display_slider(wnd, PLAYER_SLIDER_VOL_X, PLAYER_SLIDER_VOL_Y,
-			PLAYER_SLIDER_VOL_W, player_context->m_volume, 100.);
+			PLAYER_SLIDER_VOL_W, player_context->m_volume, VOLUME_SLIDER_RANGE);
 	
 	/* Display play list */
 	plist_display(player_plist, wnd);
@@ -1446,19 +1364,17 @@
 
 /* Display slider */
 void player_display_slider( wnd_t *wnd, int x, int y, int width, 
-		int pos, int range )
+		double pos, double range )
 {
-	int i, slider_pos;
-	
 	wnd_move(wnd, 0, x, y);
-	slider_pos = (range) ? (pos * width / range) : 0;
+	int slider_pos = (range >= 0) ? (pos * width / range) : 0;
 	wnd_apply_style(wnd, "slider-style");
-	for ( i = 0; i <= width; i ++ )
+	for ( int i = 0; i <= width; i ++ )
 	{
 		if (i == slider_pos)
 			wnd_putchar(wnd, 0, 'O');
 		else 
-			wnd_putchar(wnd, 0,  '=');
+			wnd_put_special(wnd, WND_ACS_CODE(WACS_HLINE));
 	}
 } /* End of 'player_display_slider' function */
 
@@ -1486,33 +1402,36 @@
  *****/
 
 /* Seek song */
-void player_seek( int sec, bool_t rel )
+void player_seek( song_time_t val, bool_t rel )
 {
-	song_t *s;
-	int new_time;
-	
 	if (player_plist->m_cur_song == -1)
 		return;
 
-	s = player_plist->m_listplayer_plist->m_cur_song;
-	if (s->m_redirect != NULL)
-		s = s->m_redirect;
+	song_t *s = player_plist->m_listplayer_plist->m_cur_song;
 
-	new_time = (rel ? (player_context->m_cur_time + sec) : sec);
+	song_time_t new_time = (rel ? (player_context->m_cur_time + val) : val);
 	if (new_time < 0)
 		new_time = 0;
 	else if (new_time > s->m_len)
 		new_time = s->m_len;
 
 	player_save_time();
-	inp_seek(song_get_inp(s, NULL), player_translate_time(s, new_time, TRUE));
+	guint64 tm = player_translate_time(s, new_time, TRUE);
+	logger_debug(player_log, "gstreamer: seeking to time %lld", tm);
+	if (!gst_element_seek(player_pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
+			GST_SEEK_TYPE_SET, tm, GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE))
+	{
+		logger_error(player_log, 1, _("gstreamer: gst_element_seek returned FALSE"));
+	}
 	player_context->m_cur_time = new_time;
 	wnd_invalidate(player_wnd);
-	logger_debug(player_log, "after player_seek timer is %d", player_context->m_cur_time);
+	logger_debug(player_log, "after player_seek timer is %lld", player_context->m_cur_time);
+
+	pmng_hook(player_pmng, "player-status");
 } /* End of 'player_seek' function */
 
 /* Play song */
-void player_play( int song, int start_time )
+void player_play( int song, song_time_t start_time )
 {
 	song_t *s;
 
@@ -1528,8 +1447,7 @@
 	}
 
 	/* Start new playing thread */
-	cfg_set_var(cfg_list, "cur-song-name", 
-			util_short_name(s->m_file_name));
+	cfg_set_var(cfg_list, "cur-song-name", song_get_short_name(s));
 	cfg_set_var(cfg_list, "cur-song-title", STR_TO_CPTR(s->m_title));
 	player_plist->m_cur_song = song;
 	player_context->m_cur_time = start_time;
@@ -1553,12 +1471,9 @@
 	int was_song = player_plist->m_cur_song;
 	
 	player_save_time();
-	outp_resume(player_cur_outp);
 	player_plist->m_cur_song = -1;
 	player_end_track = TRUE;
 //	player_context->m_status = PLAYER_STATUS_STOPPED;
-	while (player_timer_tid)
-		util_wait();
 	if (!rem_cur_song)
 		player_plist->m_cur_song = was_song;
 	cfg_set_var(cfg_list, "cur-song-name", "");
@@ -1571,8 +1486,6 @@
 	int next_track;
 	
 	next_track = player_skip_songs(1, FALSE);
-	inp_set_next_song(player_inp, next_track >= 0 ?
-		player_plist->m_listnext_track->m_file_name : NULL);
 	player_set_track(next_track);
 } /* End of 'player_next_track' function */
 
@@ -1587,79 +1500,32 @@
 } /* End of 'player_set_track' function */
 
 /* Set volume */
-void player_set_vol( int vol, bool_t rel )
+void player_set_vol( double vol, bool_t rel )
 {
 	player_context->m_volume = (rel) ? player_context->m_volume + vol : vol;
-	if (player_context->m_volume < 0)
-		player_context->m_volume = 0;
-	else if (player_context->m_volume > 100)
-		player_context->m_volume = 100;
+	if (player_context->m_volume < VOLUME_MIN)
+		player_context->m_volume = VOLUME_MIN;
+	else if (player_context->m_volume > VOLUME_MAX)
+		player_context->m_volume = VOLUME_MAX;
 	player_update_vol();
 
 	pmng_hook(player_pmng, "volume");
 } /* End of 'player_set_vol' function */
 
-/* Set balance */
-void player_set_bal( int bal, bool_t rel )
-{
-	player_context->m_balance = (rel) ? player_context->m_balance + bal : bal;
-	if (player_context->m_balance < 0)
-		player_context->m_balance = 0;
-	else if (player_context->m_balance > 100)
-		player_context->m_balance = 100;
-	player_update_vol();
-
-	pmng_hook(player_pmng, "balance");
-} /* End of 'player_set_bal' function */
-
 /* Update volume */
 void player_update_vol( void )
 {
-	int l, r;
-
-	if (player_context->m_balance < 50)
+	if (player_pipeline)
 	{
-		l = player_context->m_volume;
-		r = player_context->m_volume * 
-			player_context->m_balance / 50;
+		gdouble v = player_context->m_volume;
+		gdouble conv = gst_stream_volume_convert_volume(
+				GST_STREAM_VOLUME_FORMAT_CUBIC, GST_STREAM_VOLUME_FORMAT_LINEAR, v);
+		logger_message(player_log, 1, _("setting volume to %lg%% (linear = %lg%%)"),
+				v * 100, conv * 100);
+		g_object_set(G_OBJECT(player_pipeline), "volume", conv, NULL);
 	}
-	else
-	{
-		r = player_context->m_volume;
-		l = player_context->m_volume * 
-			(100 - player_context->m_balance) / 50;
-	}
-	outp_set_volume(player_pmng->m_cur_out, l, r);
 } /* End of 'player_update_vol' function */
 
-/* Read volume from plugin */
-void player_read_volume( void )
-{
-	int l, r;
-
-	logger_debug(player_log, "Getting volume");
-	outp_set_mixer_type(player_pmng->m_cur_out, PLUGIN_MIXER_DEFAULT);
-	outp_get_volume(player_pmng->m_cur_out, &l, &r);
-	if (l == 0 && r == 0)
-	{
-		player_context->m_volume = 0;
-		player_context->m_balance = 0;
-	}
-	else
-	{
-		if (l > r)
-		{
-			player_context->m_volume = l;
-			player_context->m_balance = r * 50 / l;
-		}
-		else
-		{
-			player_context->m_volume = r;
-			player_context->m_balance = 100 - l * 50 / r;
-		}
-	}
-} /* End of 'player_read_volume' function */
-
 /* Skip some songs */
 int player_skip_songs( int num, bool_t play )
 {
@@ -1723,89 +1589,154 @@
 	return song;
 } /* End of 'player_skip_songs' function */
 
-/* Stop timer thread */
-void player_stop_timer( void )
+/* Translate projected song time to real time */
+song_time_t player_translate_time( song_t *s, song_time_t t, bool_t virtual2real )
 {
-	if (player_timer_tid != 0)
+	if (s == NULL || s->m_start_time < 0)
+		return t;
+	return (virtual2real ? s->m_start_time + t : t - s->m_start_time);
+} /* End of 'player_translate_time' function */
+
+/* Handle a TAG message */
+static void player_handle_tag_msg( GstMessage *msg )
+{
+	GstTagList *tags = NULL;
+	gst_message_parse_tag(msg, &tags);
+	if (!tags)
+		return;
+
+	/* We are looking for bitrate changes.
+	 * Actually it seems gstreamer doesn't report _current_ bitrate so
+	 * this will be constant for a track */
+	unsigned bitrate;
+	if (gst_tag_list_get_uint(tags, GST_TAG_BITRATE, &bitrate))
 	{
-		player_end_timer = TRUE;
-		pthread_join(player_timer_tid, NULL);
-		logger_debug(player_log, "Timer thread terminated");
-		player_end_timer = FALSE;
-		player_timer_tid = 0;
-		player_context->m_cur_time = 0;
+		bitrate /= 1000;
+		if (player_context->m_bitrate != bitrate)
+		{
+			player_context->m_bitrate = bitrate;
+			wnd_invalidate(player_wnd);
+		}
 	}
-} /* End of 'player_stop_timer' function */
+	gst_tag_list_free(tags);
+} /* End of 'player_handle_tag_msg' function */
 
-/* Timer thread function */
-void *player_timer_func( void *arg )
+/* GStreamer bus message handler */
+static gboolean player_gst_bus_call( GstBus *bus, GstMessage *msg, gpointer data )
 {
-	time_t t = time(NULL);
-	song_t *s = (song_t *)arg;
+	gchar *debug;
+	GError *error;
 
-	/* Start zero timer count */
-//	player_context->m_cur_time = 0;
-
-	/* Timer loop */
-	while (!player_end_timer)
+	switch (GST_MESSAGE_TYPE(msg))
 	{
-		time_t new_t = time(NULL);
-		struct timespec tv;
-		int tm;
+	case GST_MESSAGE_EOS:
+		logger_debug(player_log, "gstreamer: EOS message arrived");
+		player_end_of_stream = TRUE;
+		break;
+	case GST_MESSAGE_ERROR:
+		gst_message_parse_error(msg, &error, &debug);
+		g_free(debug);
 
-		/* Update timer */
-		if (player_context->m_status == PLAYER_STATUS_PAUSED)
-		{
-			t = new_t;
+		logger_error(player_log, 1, _("gstreamer error: %s"), error->message);
+		g_error_free(error);
+		break;
+
+	case GST_MESSAGE_TAG:
+		player_handle_tag_msg(msg);
+		break;
+	}
+
+	return TRUE;
+} /* End of 'player_gst_bus_call' function */
+
+/* Handle audio caps setting */
+static void player_on_caps_set(GObject *obj, GParamSpec *pspec, gpointer user_data)
+{
+	GstCaps *caps = gst_pad_get_current_caps(GST_PAD(obj));
+	if (!caps)
+		return;
+
+	GstAudioInfo info;
+	gst_audio_info_init(&info);
+	if (gst_audio_info_from_caps(&info, caps))
+	{
+		int rate = GST_AUDIO_INFO_RATE(&info);
+		int channels = GST_AUDIO_INFO_CHANNELS(&info);
+		int depth = GST_AUDIO_INFO_DEPTH(&info);
+		if (player_context->m_freq != rate ||
+				player_context->m_channels != channels ||
+				player_context->m_depth != depth)
+		{
+			player_context->m_freq = rate;
+			player_context->m_channels = channels;
+			player_context->m_depth = depth;
+			wnd_invalidate(player_wnd);
 		}
-		else
-		{	
-			tm = inp_get_cur_time(player_inp);
-			if (tm < 0)
-			{
-				if (new_t > t)
-				{
-					player_context->m_cur_time += (new_t - t);
-					t = new_t;
-					logger_debug(player_log, "get_cur_time failed. setting time to %d", 
-							player_context->m_cur_time);
-					pmng_hook(player_pmng, "player-time");
-					wnd_invalidate(player_wnd);
-				}
-			}
-			else 
+	}
+
+	gst_caps_unref(caps);
+} /* End of 'player_on_caps_set' function */
+
+/* Handle 'audio-changed' signal */
+static void player_on_audio_changed( GstElement *playbin, gpointer user_data )
+{
+	GstPad *pad = NULL;
+	g_signal_emit_by_name(playbin, "get-audio-pad", 0, &pad);
+	if (!pad)
+		return;
+	g_signal_connect(pad, "notify::caps", (GCallback)player_on_caps_set, NULL);
+} /* End of 'player_on_audio_changed' function */
+
+/* Player thread function */
+bool_t player_set_audio_sink( void )
+{
+	char *audio_sink_name = cfg_get_var(cfg_list, "gstreamer.audio-sink");
+	if (audio_sink_name && *audio_sink_name)
+	{
+		GstElement *sink = gst_element_factory_make(audio_sink_name, "sink");
+		if (sink)
+		{
+			cfg_node_t *cfg_node = cfg_search_node(cfg_list, "gstreamer.audio-sink-params");
+			if (cfg_node)
 			{
-				tm = player_translate_time(s, tm, FALSE);
-				if (tm - player_context->m_cur_time)
+				cfg_list_iterator_t iter = cfg_list_begin_iteration(cfg_node);
+				for ( ;; )
 				{
-					player_context->m_cur_time = tm;
-					pmng_hook(player_pmng, "player-time");
-					wnd_invalidate(player_wnd);
+					cfg_node_t *cfg_node = cfg_list_iterate(&iter);
+					if (!cfg_node)
+						break;
+
+					if (CFG_NODE_IS_VAR(cfg_node))
+					{
+						char *name = cfg_node->m_name;
+						char *val = CFG_VAR_VALUE(cfg_node);
+
+						if (val && *val)
+						{
+							logger_debug(player_log, "gstreamer: setting audio sink param %s to %s",
+									name, val);
+							g_object_set(G_OBJECT(sink), name, val, NULL);
+						}
+					}
 				}
 			}
+			logger_debug(player_log, "gstreamer: setting audio sink to %s", audio_sink_name);
+			g_object_set(G_OBJECT(player_pipeline), "audio-sink", sink, NULL);
+		}
+		else
+		{
+			logger_error(player_log, 1, _("Audio sink %s could not be created"), 
+					audio_sink_name);
+			return FALSE;
 		}
-		util_wait();
 	}
 
-	player_context->m_cur_time = 0;
-	player_end_timer = FALSE;
-	player_timer_tid = 0;
-	return NULL;
-} /* End of 'player_timer_func' function */
-
-/* Translate projected song time to real time */
-int player_translate_time( song_t *s, int t, bool_t virtual2real )
-{
-	if (s == NULL || s->m_start_time < 0)
-		return t;
-	return (virtual2real ? s->m_start_time + t : t - s->m_start_time);
-} /* End of 'player_translate_time' function */
+	return TRUE;
+}
 
 /* Player thread function */
 void *player_thread( void *arg )
 {
-	bool_t no_outp = FALSE;
-	
 	logger_debug(player_log, "In player_thread");
 
 	/* Main loop */
@@ -1815,16 +1746,12 @@
 		int ch = 0, freq = 0, real_ch = 0, real_freq = 0;
 		dword fmt = 0, real_fmt = 0;
 		song_info_t si;
-		in_plugin_t *inp;
-		int was_pfreq, was_pbr, was_pstereo;
-		int disp_count;
 		dword in_flags, out_flags;
-		file_t *fd = NULL;
-		struct x_convert_buffers *convert_buf;
-		convert_func_t fmt_convert_func;
-		convert_channel_func_t chan_convert_func;
-		convert_freq_func_t freq_convert_func;
 		bool_t song_finished;
+		GMainLoop *loop = NULL;
+		GstBus *bus = NULL;
+		int was_status;
+		char *uri = NULL;
 
 		/* Skip to next iteration if there is nothing to play */
 		if (player_plist->m_cur_song < 0 || 
@@ -1836,221 +1763,150 @@
 
 		/* Play track */
 		s = player_plist->m_listplayer_plist->m_cur_song;
-		song_played = (s->m_redirect == NULL) ? s : s->m_redirect;
+		song_played = s;
 		//player_context->m_status = PLAYER_STATUS_PLAYING;
 		player_end_track = FALSE;
 	
-		logger_debug(player_log, "Playing track %s", s->m_full_name);
-
-		/* Start playing */
-		logger_debug(player_log, "Starting input plugin");
-		inp = song_get_inp(s, &fd);
-		if (!inp_start(inp, song_played->m_file_name, fd))
-		{
-			player_next_track();
-			logger_error(player_log, 0,
-					_("Input plugin for file %s failed"), song_played->m_file_name);
-			wnd_invalidate(player_wnd);
-			continue;
-		}
-		logger_debug(player_log, "start time is %d", song_played->m_start_time);
-		if (player_context->m_cur_time > 0 || song_played->m_start_time > -1)
-			inp_seek(inp, player_translate_time(song_played, player_context->m_cur_time, TRUE));
-		in_flags = inp_get_flags(inp);
-		out_flags = outp_get_flags(player_pmng->m_cur_out);
-		no_outp = (in_flags & INP_OWN_OUT) || 
-			((in_flags & INP_OWN_SOUND) && !(out_flags & OUTP_NO_SOUND));
-
-		/* Set proper mixer type */
-		logger_debug(player_log, "Setting mixer type");
-		outp_set_mixer_type(player_pmng->m_cur_out, inp_get_mixer_type(inp));
+		logger_debug(player_log, "Playing track %s", s->m_fullname);
 
 		/* Get song length and information */
 		logger_debug(player_log, "Updating song info");
 		song_update_info(s);
 
-		/* Start output plugin */
-		logger_debug(player_log, "Starting output plugin");
-		if (!no_outp && (player_pmng->m_cur_out == NULL || 
-				(!cfg_get_var_int(cfg_list, "silent-mode") && 
-					!outp_start(player_pmng->m_cur_out))))
-		{
-			logger_error(player_log, 1, 
-					_("Output plugin initialization failed"));
-//			wnd_send_msg(wnd_root, WND_MSG_USER, PLAYER_MSG_END_TRACK);
-			inp_end(inp);
+		/* Create gstreamer stuff */
+		player_end_of_stream = FALSE;
+		loop = g_main_loop_new(NULL, FALSE);
+		if (!loop)
+		{
+			logger_error(player_log, 1, _("g_main_loop_new failed"));
 			player_context->m_status = PLAYER_STATUS_STOPPED;
-			wnd_invalidate(player_wnd);
-			continue;
+			goto cleanup;
+		}
+		player_pipeline = gst_element_factory_make("playbin", "play");
+		if (!player_pipeline)
+		{
+			logger_error(player_log, 1, _("gstreamer: unable to create playbin"));
+			player_context->m_status = PLAYER_STATUS_STOPPED;
+			goto cleanup;
 		}
-		player_cur_outp = player_pmng->m_cur_out;
 
-		/* Set audio parameters */
-		/*if (!no_outp)
+		/* Set a user-specified audio sink */
+		if (!player_set_audio_sink())
 		{
-			outp_set_channels(player_pmng->m_cur_out, 2);
-			outp_set_freq(player_pmng->m_cur_out, freq);
-			outp_set_fmt(player_pmng->m_cur_out, fmt);
-		}*/
+			player_context->m_status = PLAYER_STATUS_STOPPED;
+			goto cleanup;
+		}
 
-		/* Create buffers for converting audio */
-		convert_buf = x_convert_buffers_new();
+		/* Set fake videosink */
+		GstElement *videosink = gst_element_factory_make("fakesink", "videosink");
+		g_object_set(G_OBJECT(player_pipeline), "video-sink", videosink, NULL);
 
-		/* Save current input plugin */
-		player_inp = inp;
+		/* Set volume */
+		player_update_vol();
 
-		/* Set equalizer */
-		inp_set_eq(inp);
+		/* Set bus message handler */
+		bus = gst_pipeline_get_bus(GST_PIPELINE(player_pipeline));
+		if (!bus)
+		{
+			logger_error(player_log, 1, _("gst_pipeline_get_bus failed"));
+		}
+		gst_bus_add_watch(bus, player_gst_bus_call, NULL);
+		gst_object_unref(bus);
+		g_signal_connect(player_pipeline, "audio-changed", (GCallback)player_on_audio_changed, NULL);
+
+		g_object_set(G_OBJECT(player_pipeline), "uri", song_played->m_fullname, NULL);
+
+		/* Start playing */
+		gst_element_set_state(player_pipeline, GST_STATE_PLAYING);
+		gst_element_get_state(player_pipeline, NULL, NULL, GST_CLOCK_TIME_NONE);
+
+		/* Seek to start time */
+		logger_debug(player_log, "start time is %lld", song_played->m_start_time);
+		logger_debug(player_log, "cur_time is %lld", player_context->m_cur_time);
+		if (player_context->m_cur_time > 0 || song_played->m_start_time > -1)
+		{
+			guint64 tm = player_translate_time(song_played, player_context->m_cur_time, TRUE);
+			logger_debug(player_log, "gstreamer: seeking to time %lld", tm);
+			if (!gst_element_seek(player_pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
+					GST_SEEK_TYPE_SET, tm, GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE))
+			{
+				logger_error(player_log, 1, _("gstreamer: gst_element_seek returned FALSE"));
+			}
+		}
 
-		/* Start timer thread */
-		logger_debug(player_log, "Creating timer thread");
-		pthread_create(&player_timer_tid, NULL, player_timer_func, song_played);
-		//wnd_send_msg(wnd_root, WND_MSG_DISPLAY, 0);
-	
 		/* Play */
-		disp_count = 0;
 		logger_debug(player_log, "Going into track playing cycle");
 		song_finished = FALSE;
+		was_status = PLAYER_STATUS_PLAYING;
 		while (!player_end_track)
 		{
-			byte buf8192, *data = buf;
-			int size = 8192;
-			struct timespec tv;
+			g_main_context_iteration(NULL, FALSE);
 
-			if (player_context->m_status == PLAYER_STATUS_PLAYING)
+			if (player_context->m_status != was_status)
 			{
-				/* Update equalizer if it's parameters have changed */
-				if (player_eq_changed)
+				switch (player_context->m_status)
 				{
-					player_eq_changed = FALSE;
-					inp_set_eq(inp);
+				case PLAYER_STATUS_PLAYING:
+					gst_element_set_state(player_pipeline, GST_STATE_PLAYING);
+					break;
+				case PLAYER_STATUS_PAUSED:
+					gst_element_set_state(player_pipeline, GST_STATE_PAUSED);
+					break;
+				case PLAYER_STATUS_STOPPED:
+					gst_element_set_state(player_pipeline, GST_STATE_READY);
+					break;
 				}
-				
-				/* Get stream from input plugin */
-				logger_debug(player_log, "calling inp_get_stream(%d)", size);
-				if (size = inp_get_stream(inp, buf, size))
-				{
-					int new_ch, new_freq, new_br;
-					dword new_fmt;
-					
-					/* Get audio parameters */
-					inp_get_audio_params(inp, &new_ch, &new_freq, &new_fmt, 
-							&new_br);
-					was_pfreq = player_context->m_freq; was_pstereo = player_context->m_stereo;
-					was_pbr = player_context->m_bitrate;
-					player_context->m_freq = new_freq;
-					player_context->m_stereo = (new_ch == 1) ? PLAYER_MONO : PLAYER_STEREO;
-					new_br /= 1000;
-					player_context->m_bitrate = new_br;
-					if ((player_context->m_freq != was_pfreq || 
-							player_context->m_stereo != was_pstereo ||
-							player_context->m_bitrate != was_pbr) && !disp_count)
-					{
-						disp_count = cfg_get_var_int(cfg_list, 
-								"audio-params-display-count");
-						if (!disp_count)
-							disp_count = 20;
-						wnd_invalidate(player_wnd);
-					}
-					disp_count --;
-					if (disp_count < 0)
-						disp_count = 0;
+			}
 
-					/* Update audio parameters if they have changed */
-					if (!no_outp)
+			if (player_context->m_status == PLAYER_STATUS_PLAYING)
+			{
+				guint64 tm;
+
+				/* Update time */
+				if (gst_element_query_position(player_pipeline, GST_FORMAT_TIME, &tm))
+				{
+					tm = player_translate_time(song_played, tm, FALSE);
+					if (tm != player_context->m_cur_time)
 					{
-						if (ch != new_ch || freq != new_freq || fmt != new_fmt)
-						{
-							ch = new_ch;
-							freq = new_freq;
-							fmt = new_fmt;
-						
-							outp_flush(player_cur_outp);
-							outp_set_channels(player_cur_outp, ch);
-							outp_set_freq(player_cur_outp, freq);
-							outp_set_fmt(player_cur_outp, fmt);
-
-							/* Set conversion functions */
-							fmt_convert_func = NULL;
-							chan_convert_func = NULL;
-							freq_convert_func = NULL;
-							real_fmt = outp_get_fmt(player_cur_outp);
-							if (real_fmt != 0xFFFFFFFF && real_fmt != fmt)
-								fmt_convert_func = x_convert_get_func(real_fmt, fmt);
-							real_ch = outp_get_channels(player_cur_outp);
-							if (real_ch >= 0 && real_ch != ch)
-								chan_convert_func = x_convert_get_channel_func(real_fmt,
-										real_ch, ch);
-							real_freq = outp_get_freq(player_cur_outp);
-							if (real_freq >= 0 && real_freq != freq)
-								freq_convert_func = 
-									x_convert_get_frequency_func(real_fmt, real_ch);
-
-							logger_debug(player_log, "ch = %d, fmt = %d, freq = %d", 
-									ch, fmt, freq);
-							logger_debug(player_log, "real ch = %d, fmt = %d, freq = %d", 
-									real_ch, real_fmt, real_freq);
-						}
+						int was_seconds = TIME_TO_SECONDS(player_context->m_cur_time);
+						int new_seconds = TIME_TO_SECONDS(tm);
+						player_context->m_cur_time = tm;
 
-						/* Apply effects */
-						size = pmng_apply_effects(player_pmng, data, size, 
-								fmt, freq, ch);
-
-						/* Convert audio */
-						if (fmt_convert_func != NULL)
-							size = fmt_convert_func(convert_buf, (void **)(&data), size);
-						if (chan_convert_func != NULL)
-							size = chan_convert_func(convert_buf, (void **)(&data), size);
-						if (freq_convert_func != NULL)
-						{
-							size = freq_convert_func(convert_buf, (void **)(&data), size,
-									freq, real_freq);
-						}
-					
-						/* Send to output plugin */
-						outp_play(player_cur_outp, data, size);
-
-						/* Check for end of projected song */
-						if (song_played->m_end_time > -1 && 
-								player_translate_time(song_played, player_context->m_cur_time, TRUE) >= 
-								song_played->m_end_time)
+						if (was_seconds != new_seconds)
 						{
-							logger_debug(player_log, "stopping at time %d(%d).", 
-									player_context->m_cur_time,
-									player_translate_time(song_played, player_context->m_cur_time, TRUE));
-							song_finished = TRUE;
-							break;
+							pmng_hook(player_pmng, "player-time");
+							wnd_invalidate(player_wnd);
 						}
 					}
-					else
-						util_wait();
 				}
-				else
+
+				/* Check for end of projected song */
+				if (song_played->m_end_time > -1 && 
+						player_translate_time(song_played, player_context->m_cur_time, TRUE) >= 
+						song_played->m_end_time)
 				{
+					logger_debug(player_log, _("stopping at time %lld(%lld) with end_time=%lld."), 
+							player_context->m_cur_time,
+							player_translate_time(song_played, player_context->m_cur_time, TRUE),
+							song_played->m_end_time);
 					song_finished = TRUE;
 					break;
 				}
 			}
-			else if (player_context->m_status == PLAYER_STATUS_PAUSED)
+
+			if (player_end_of_stream)
 			{
-				util_wait();
+				player_end_of_stream = FALSE;
+				song_finished = TRUE;
+				break;
 			}
-		}
-		logger_debug(player_log, "End playing track");
-
-		/* Free convert buffers */
-		x_convert_buffers_destroy(convert_buf);
 
-		/* Wait until we really stop playing */
-		if (!no_outp && song_finished)
-		{
-			logger_debug(player_log, "outp_flush");
-			outp_flush(player_cur_outp);
+			was_status = player_context->m_status;
+			util_wait();
 		}
+		logger_debug(player_log, "End playing track");
 
-		/* Stop timer thread */
-		logger_debug(player_log, "Stopping timer");
-		player_stop_timer();
+		gst_element_set_state(player_pipeline, GST_STATE_NULL);
 
 		/* Send message about track end */
 		if (!player_end_track)
@@ -2060,21 +1916,22 @@
 		}
 
 		/* End playing */
-		logger_debug(player_log, "inp_end");
-		inp_end(inp);
-		player_inp = NULL;
-		player_context->m_bitrate = player_context->m_freq = player_context->m_stereo = 0;
-
-		/* End output plugin */
-		if (!no_outp)
-		{
-			logger_debug(player_log, "outp_end");
-			outp_end(player_cur_outp);
-		}
-		player_cur_outp = NULL;
+		player_context->m_bitrate = player_context->m_freq = player_context->m_channels = player_context->m_depth = 0;
 
 		/* Update screen */
 		wnd_invalidate(player_wnd);
+
+	cleanup:
+		if (player_pipeline)
+		{
+			gst_object_unref(GST_OBJECT(player_pipeline));
+			player_pipeline = NULL;
+		}
+		if (loop)
+		{
+			g_main_loop_unref(loop);
+			loop = NULL;
+		}
 	}
 	logger_debug(player_log, "Player thread finished");
 	return NULL;
@@ -2095,7 +1952,6 @@
 	dlg = dialog_new(wnd_root, _("Add songs"));
 	eb = filebox_new_with_label(WND_OBJ(dlg->m_vbox), _("File &name: "), 
 			"name", "", 'n', 50);
-	eb->m_vfs = player_vfs;
 	EDITBOX_OBJ(eb)->m_history = player_hist_listsPLAYER_HIST_LIST_ADD;
 	wnd_msg_add_handler(WND_OBJ(dlg), "ok_clicked", player_on_add);
 	dialog_arrange_children(dlg);
@@ -2154,7 +2010,6 @@
 	dialog_t *dlg;
 	editbox_t *name, *artist, *album, *year, *track, *comment;
 	combo_t *genre;
-	genre_list_t *glist;
 	label_t *own_info;
 	int i, sel_start, sel_end, start, end;
 	song_t *s;
@@ -2165,7 +2020,6 @@
 	char *file_name;
 	wnd_t *vbox;
 	hbox_t *hbox;
-	button_t *reload;
 
 	/* First create dialog */
 	dlg = dialog_new(wnd_root, "");
@@ -2186,7 +2040,10 @@
 	combo_new_with_label(vbox, _("&Genre: "), "genre", "", 'g',
 			PLAYER_EB_WIDTH, 10);
 	label_new(WND_OBJ(hbox), "", "own_data", LABEL_NOBOLD);
-	reload = button_new(WND_OBJ(dlg->m_hbox), _("&Reload info"), "reload", 'r');
+	editbox_t *path = editbox_new_with_label(vbox, _("Full path: "), "full_path", "", 0,
+			PLAYER_EB_WIDTH);
+	path->m_editable = FALSE;
+	button_t *reload = button_new(WND_OBJ(dlg->m_hbox), _("&Reload info"), "reload", 'r');
 
 	/* Fill items with values */
 	if (!player_info_dialog_fill(dlg, TRUE))
@@ -2210,21 +2067,50 @@
 	eb->m_gray_non_modified = diff;
 } /* End of 'player_info_eb_set' function */
 
+static void player_add_genres(combo_t *cb)
+{
+	char *genres = {
+		"Blues", "Classic Rock", "Country", "Dance", "Disco", "Funk", "Grunge",
+		"Hip-Hop", "Jazz", "Metal", "New Age", "Oldies", "Other", "Pop", "R&B",
+		"Rap", "Reggae", "Rock", "Techno", "Industrial", "Alternative", "Ska",
+		"Death Metal", "Pranks", "Soundtrack", "Euro-Techno", "Ambient", "Trip-Hop",
+		"Vocal", "Jazz+Funk", "Fusion", "Trance", "Classical", "Instrumental",
+		"Acid", "House", "Game", "Sound Clip", "Gospel", "Noise", "AlternRock",
+		"Bass", "Soul", "Punk", "Space", "Meditative", "Instrumental Pop",
+		"Instrumental Rock", "Ethnic", "Gothic", "Darkwave", "Techno-Industrial",
+		"Electronic", "Pop-Folk", "Eurodance", "Dream", "Southern Rock", "Comedy",
+		"Cult", "Gangsta", "Top 40", "Christian Rap", "Pop/Funk", "Jungle",
+		"Native American", "Cabaret", "New Wave", "Psychadelic", "Rave", "Showtunes",
+		"Trailer", "Lo-Fi", "Tribal", "Acid Punk", "Acid Jazz", "Polka", "Retro",
+		"Musical", "Rock & Roll", "Hard Rock", "Folk", "Folk-Rock", "National Folk",
+		"Swing", "Fast Fusion", "Bebob", "Latin", "Revival", "Celtic", "Bluegrass",
+		"Avantgarde", "Gothic Rock", "Progressive Rock", "Psychedelic Rock",
+		"Symphonic Rock", "Slow Rock", "Big Band", "Chorus", "Easy Listening",
+		"Acoustic", "Humour", "Speech", "Chanson", "Opera", "Chamber Music", "Sonata",
+		"Symphony", "Booty Bass", "Primus", "Porn Groove", "Satire", "Slow Jam",
+		"Club", "Tango", "Samba", "Folklore", "Ballad", "Power Ballad", "Rhythmic Soul",
+		"Freestyle", "Duet", "Punk Rock", "Drum Solo", "A capella", "Euro-House",
+		"Dance Hall"
+	};
+
+	for (int i = 0, e = sizeof(genres) / sizeof(*genres); i != e; ++i)
+		combo_add_item(cb, genresi);
+}
+
 /* Fill info dialog with values */
 bool_t player_info_dialog_fill( dialog_t *dlg, bool_t first_call )
 {
-	editbox_t *name, *artist, *album, *year, *track, *comments;
+	editbox_t *name, *artist, *album, *year, *track, *comments, *full_path_eb;
 	combo_t *genre;
 	label_t *own_data;
 	song_t **songs_list;
 	song_t *main_song;
 	int num_songs, i, j;
 	song_info_t *info;
-	char *file_name;
 	bool_t name_diff = FALSE, artist_diff = FALSE, album_diff = FALSE,
 		   year_diff = FALSE, track_diff = FALSE, comment_diff = FALSE,
 		   genre_diff = FALSE;
-	genre_list_t *glist;
+	bool_t main_readonly, all_readonly;
 	assert(dlg);
 
 	/* Generate selected songs list when calling for the first time */
@@ -2264,6 +2150,7 @@
 		}
 
 		/* Update songs info */
+		all_readonly = TRUE;
 		for ( i = start, num_songs = 0; i <= end; i ++ )
 		{
 			/* Read info */
@@ -2271,6 +2158,8 @@
 			song_update_info(song);
 			if (song->m_info == NULL)
 				continue;
+			if (!(song->m_flags & SONG_STATIC_INFO))
+				all_readonly = FALSE;
 
 			/* Save this song in the list */
 			songs_listnum_songs ++ = song_add_ref(song);
@@ -2286,10 +2175,18 @@
 			return FALSE;
 		}
 
+		assert(main_song);
+		main_readonly = (main_song->m_flags & SONG_STATIC_INFO);
+
 		/* Save the list in dialog data */
 		cfg_set_var_ptr(WND_OBJ(dlg)->m_cfg_list, "songs_list", songs_list);
 		cfg_set_var_ptr(WND_OBJ(dlg)->m_cfg_list, "main_song", main_song);
 		cfg_set_var_int(WND_OBJ(dlg)->m_cfg_list, "num_songs", num_songs);
+		cfg_set_var_bool(WND_OBJ(dlg)->m_cfg_list, "main_readonly", main_readonly);
+		cfg_set_var_bool(WND_OBJ(dlg)->m_cfg_list, "all_readonly", all_readonly);
+
+		/* Set fields read-only if necessary */
+		player_info_dialog_set_if_readonly(dlg);
 	}
 	/* Get the list */
 	else
@@ -2297,6 +2194,8 @@
 		songs_list = cfg_get_var_ptr(WND_OBJ(dlg)->m_cfg_list, "songs_list");
 		num_songs = cfg_get_var_int(WND_OBJ(dlg)->m_cfg_list, "num_songs");
 		main_song = cfg_get_var_ptr(WND_OBJ(dlg)->m_cfg_list, "main_song");
+		main_readonly = cfg_get_var_bool(WND_OBJ(dlg)->m_cfg_list, "main_readonly");
+		all_readonly = cfg_get_var_bool(WND_OBJ(dlg)->m_cfg_list, "all_readonly");
 		song_update_info(main_song);
 		info = main_song->m_info;
 		assert(songs_list && main_song && info && (num_songs > 0));
@@ -2349,39 +2248,23 @@
 	comments = EDITBOX_OBJ(dialog_find_item(dlg, "comments"));
 	genre = COMBO_OBJ(dialog_find_item(dlg, "genre"));
 	own_data = LABEL_OBJ(dialog_find_item(dlg, "own_data"));
+	full_path_eb = EDITBOX_OBJ(dialog_find_item(dlg, "full_path"));
 	assert(name && artist && album && year && track && comments &&
-			genre && own_data);
+			genre && own_data && full_path_eb);
 
 	/* Set items values */
-	file_name = cfg_get_var_int(cfg_list, "info-editor-show-full-name") ?
-		main_song->m_file_name : util_short_name(main_song->m_file_name);
-	wnd_set_title(WND_OBJ(dlg), file_name);
+	wnd_set_title(WND_OBJ(dlg), song_get_short_name(main_song));
 	player_info_eb_set(name, info->m_name, name_diff);
 	player_info_eb_set(artist, info->m_artist, artist_diff);
 	player_info_eb_set(album, info->m_album, album_diff);
 	player_info_eb_set(year, info->m_year, year_diff);
 	player_info_eb_set(track, info->m_track, track_diff);
 	player_info_eb_set(comments, info->m_comments, comment_diff);
-	glist = info->m_glist;
-	for ( i = 0; glist != NULL && i < glist->m_size; i ++ )
-		combo_add_item(genre, glist->m_listi.m_name);
+	player_add_genres(genre);
 	player_info_eb_set(EDITBOX_OBJ(genre), info->m_genre, genre_diff);
 	combo_synch_list(genre);
 	label_set_text(own_data, info->m_own_data);
-
-	/* Add the special functions buttons */
-	if (first_call)
-	{
-		int num = inp_get_num_specs(main_song->m_inp);
-		for ( i = 0; i < num; i ++ )
-		{
-			char *title = inp_get_spec_title(main_song->m_inp, i);
-			button_t *btn = button_new(WND_OBJ(dlg->m_hbox), title, "",
-					0);
-			cfg_set_var_int(WND_OBJ(btn)->m_cfg_list, "fn_index", i);
-			wnd_msg_add_handler(WND_OBJ(btn), "clicked", player_on_info_spec);
-		}
-	}
+	editbox_set_text(full_path_eb, song_get_name(main_song));
 	return TRUE;
 } /* End of 'player_info_dialog_fill' function */
 
@@ -2434,6 +2317,96 @@
 	dialog_arrange_children(dlg);
 } /* End of 'player_var_manager' function */
 
+static void player_audio_setup_sync_device_box( wnd_t *wnd )
+{
+	editbox_t *sink_eb = EDITBOX_OBJ(wnd);
+	dialog_t *dlg = DIALOG_OBJ(DLGITEM_OBJ(wnd)->m_dialog);
+	assert(dlg);
+	editbox_t *dev_eb = EDITBOX_OBJ(dialog_find_item(dlg, "device"));
+	assert(dev_eb);
+
+	/* Device is only active when sink is specified */
+	dev_eb->m_editable = !EDITBOX_EMPTY(sink_eb);
+}
+
+static void player_on_audio_setup( wnd_t *wnd )
+{
+	editbox_t *sink_eb = EDITBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), "sink"));
+	assert(sink_eb);
+	editbox_t *dev_eb = EDITBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), "device"));
+	assert(dev_eb);
+
+	cfg_set_var(cfg_list, "gstreamer.audio-sink", 
+			!EDITBOX_EMPTY(sink_eb) ? EDITBOX_TEXT(sink_eb) : "");
+	cfg_set_var(cfg_list, "gstreamer.audio-sink-params.device", 
+			!EDITBOX_EMPTY(dev_eb) ? EDITBOX_TEXT(dev_eb) : "");
+
+	/* Restart playback */
+	if (player_plist->m_cur_song >= 0)
+		player_play(player_plist->m_cur_song, player_context->m_cur_time);
+}
+
+/* Display audio output setup dialog */
+static void player_audio_setup_dlg( void )
+{
+	dialog_t *dlg = dialog_new(wnd_root, _("Audio output setup"));
+	editbox_t *sink_eb = editbox_new_with_label(WND_OBJ(dlg->m_vbox), _("&Sink name: "),
+			"sink", "", 's', PLAYER_EB_WIDTH);
+	editbox_set_text(sink_eb, cfg_get_var(cfg_list, "gstreamer.audio-sink"));
+	editbox_t *dev_eb = editbox_new_with_label(WND_OBJ(dlg->m_vbox), _("&Device name: "),
+			"device", "", 'd', PLAYER_EB_WIDTH);
+	editbox_set_text(dev_eb, cfg_get_var(cfg_list, "gstreamer.audio-sink-params.device"));
+	player_audio_setup_sync_device_box(WND_OBJ(sink_eb));
+	label_new(WND_OBJ(dlg->m_vbox),
+			_("\nYou can specify GStreamer sink (e.g. alsasink) and \n"
+			  "device here. Device can only be set if sink is specified.\n"
+			  "If the sink is configured by some other properties, you can set \n"
+			  "them directly with gstreamer.audio-sink-params.* variables.\n"),
+			"help", LABEL_NOBOLD);
+
+	wnd_msg_add_handler(WND_OBJ(sink_eb), "changed", player_audio_setup_sync_device_box);
+	wnd_msg_add_handler(WND_OBJ(dlg), "ok_clicked", player_on_audio_setup);
+	dialog_arrange_children(dlg);
+} /* End of 'player_var_manager' function */
+
+static void player_on_startup_msg_ok( wnd_t *wnd )
+{
+	char *var = cfg_get_var(wnd->m_cfg_list, "dont_show_cfg_name");
+	cfg_set_var_bool(cfg_list, var, CHECKBOX_OBJ(dialog_find_item(DIALOG_OBJ(wnd), "dont_show"))->m_checked);
+}
+
+/* Display audio output setup dialog */
+static void player_startup_msg_dialog( char *title, char *text, char *dont_show_cfg_name )
+{
+	if (cfg_get_var_bool(cfg_list, dont_show_cfg_name))
+		return;
+
+	dialog_t *dlg = dialog_new(wnd_root, title);
+	label_new(WND_OBJ(dlg->m_vbox), text, "text", LABEL_NOBOLD);
+	checkbox_new(WND_OBJ(dlg->m_vbox), _("&Don't show this anymore"), 
+			"dont_show", 'd', FALSE);
+	cfg_set_var(WND_OBJ(dlg)->m_cfg_list, "dont_show_cfg_name", dont_show_cfg_name);
+
+	wnd_msg_add_handler(WND_OBJ(dlg), "ok_clicked", player_on_startup_msg_ok);
+	dialog_arrange_children(dlg);
+} /* End of 'player_var_manager' function */
+
+static void player_welcome_dialog( void ) 
+{
+	player_startup_msg_dialog(_("Welcome"), 
+			_("Welcome to MPFC, Music Player For Console!\n"
+		      "To close this window, press <Enter>, and then '?' to see key bindings.\n"
+			  "For more help please see the full documentation."),
+			"dont_show.welcome");
+}
+
+static void player_utf8_dialog( void )
+{
+	player_startup_msg_dialog(_("Error"), 
+			"Your locale is not UTF-8! Text handling will work incorrectly",
+			"dont_show.utf8");
+}
+
 /* Launch advanced search dialog */
 void player_advanced_search_dialog( void )
 {
@@ -2502,11 +2475,8 @@
 /* Data for plugins manager */
 enum
 {
-	PLAYER_PMNG_INPUT = 0,
-	PLAYER_PMNG_OUTPUT,
-	PLAYER_PMNG_EFFECT,
+	PLAYER_PMNG_PLIST = 0,
 	PLAYER_PMNG_GENERAL,
-	PLAYER_PMNG_CHARSET,
 	PLAYER_PMNG_COUNT
 };
 typedef struct 
@@ -2536,26 +2506,14 @@
 	/* Initialize basic views data */
 	views = (player_pmng_view_t *)malloc(sizeof(*views) * PLAYER_PMNG_COUNT);
 	memset(views, 0, sizeof(*views) * PLAYER_PMNG_COUNT);
-	viewsPLAYER_PMNG_INPUT.m_title = _("Input");
-	viewsPLAYER_PMNG_INPUT.m_btn_title = _("&Input");
-	viewsPLAYER_PMNG_INPUT.m_name = "input";
-	viewsPLAYER_PMNG_INPUT.m_letter = 'i';
-	viewsPLAYER_PMNG_OUTPUT.m_title = _("Output");
-	viewsPLAYER_PMNG_OUTPUT.m_btn_title = _("&Output");
-	viewsPLAYER_PMNG_OUTPUT.m_name = "output";
-	viewsPLAYER_PMNG_OUTPUT.m_letter = 'o';
-	viewsPLAYER_PMNG_EFFECT.m_title = _("Effect");
-	viewsPLAYER_PMNG_EFFECT.m_btn_title = _("&Effect");
-	viewsPLAYER_PMNG_EFFECT.m_name = "effect";
-	viewsPLAYER_PMNG_EFFECT.m_letter = 'e';
+	viewsPLAYER_PMNG_PLIST.m_title = _("Playlist");
+	viewsPLAYER_PMNG_PLIST.m_btn_title = _("&Playlist");
+	viewsPLAYER_PMNG_PLIST.m_name = "playlist";
+	viewsPLAYER_PMNG_PLIST.m_letter = 'p';
 	viewsPLAYER_PMNG_GENERAL.m_title = _("General");
 	viewsPLAYER_PMNG_GENERAL.m_btn_title = _("&General");
 	viewsPLAYER_PMNG_GENERAL.m_name = "general";
 	viewsPLAYER_PMNG_GENERAL.m_letter = 'g';
-	viewsPLAYER_PMNG_CHARSET.m_title = _("Charset");
-	viewsPLAYER_PMNG_CHARSET.m_btn_title = _("C&harset");
-	viewsPLAYER_PMNG_CHARSET.m_name = "charset";
-	viewsPLAYER_PMNG_CHARSET.m_letter = 'h';
 
 	/* Create dialog and views */
 	mvd = mview_dialog_new(wnd_root, _("Plugins manager"));
@@ -2580,11 +2538,7 @@
 
 		v->m_hbox = hbox_new(WND_OBJ(v->m_view), NULL, 1);
 		snprintf(list_id, sizeof(list_id), "%s_list", v->m_name);
-		v->m_list = listbox_new(WND_OBJ(v->m_hbox), NULL, list_id, 'l', 
-				i == PLAYER_PMNG_OUTPUT ? LISTBOX_SELECTABLE : 0, 20, 10);
-		if (i == PLAYER_PMNG_OUTPUT)
-			wnd_msg_add_handler(WND_OBJ(v->m_list), "selection_changed",
-					player_pmng_dialog_on_list_sel_change);
+		v->m_list = listbox_new(WND_OBJ(v->m_hbox), NULL, list_id, 'l', 0, 20, 10);
 		wnd_msg_add_handler(WND_OBJ(v->m_list), "changed", 
 				player_pmng_dialog_on_list_change);
 		v->m_vbox = vbox_new(WND_OBJ(v->m_hbox), NULL, 0);
@@ -2594,33 +2548,19 @@
 	iter = pmng_start_iteration(player_pmng, PLUGIN_TYPE_ALL);
 	for ( ;; )
 	{
-		int index = 0, pos;
+		int index = 0;
 		plugin_t *p = pmng_iterate(&iter);
 		if (p == NULL)
 			break;
 
-		if (p->m_type == PLUGIN_TYPE_INPUT)
-			index = PLAYER_PMNG_INPUT;
-		else if (p->m_type == PLUGIN_TYPE_OUTPUT)
-			index = PLAYER_PMNG_OUTPUT;
-		else if (p->m_type == PLUGIN_TYPE_EFFECT)
-			index = PLAYER_PMNG_EFFECT;
+		if (p->m_type == PLUGIN_TYPE_PLIST)
+			index = PLAYER_PMNG_PLIST;
 		else if (p->m_type == PLUGIN_TYPE_GENERAL)
 			index = PLAYER_PMNG_GENERAL;
-		else if (p->m_type == PLUGIN_TYPE_CHARSET)
-			index = PLAYER_PMNG_CHARSET;
-		pos = listbox_add(viewsindex.m_list, p->m_name, p);
-		if (p->m_type == PLUGIN_TYPE_OUTPUT && 
-				p == (plugin_t *)player_pmng->m_cur_out)
-			listbox_sel_item(viewsindex.m_list, pos);
+		listbox_add(viewsindex.m_list, p->m_name, p);
 	}
 
 	/* Set plugins info controls */
-	viewsPLAYER_PMNG_EFFECT.m_enabled_cb = cb =
-		checkbox_new(WND_OBJ(viewsPLAYER_PMNG_EFFECT.m_vbox),
-				_("Effect is ena&bled"), "enabled", 'b', FALSE);
-	wnd_msg_add_handler(WND_OBJ(cb), "clicked",
-			player_pmng_dialog_on_effect_clicked);
 	for ( i = 0; i < PLAYER_PMNG_COUNT; i ++ )
 	{
 		char desc_id20, author_id20, conf_id20;
@@ -2680,12 +2620,9 @@
 		editbox_set_text(v->m_author, author == NULL ? "" : author);
 		editbox_set_text(v->m_desc, desc == NULL ? "" : desc);
 
-		/* Synchronize effect checkbox */
-		if (i == PLAYER_PMNG_EFFECT)
-			v->m_enabled_cb->m_checked = pmng_is_effect_enabled(player_pmng, p);
-		else if (i == PLAYER_PMNG_GENERAL)
+		if (i == PLAYER_PMNG_GENERAL)
 		{
-			bool_t started = genp_is_started(p);
+			bool_t started = genp_is_started(GENERAL_PLUGIN(p));
 			wnd_set_title(WND_OBJ(v->m_start_stop_btn), started ? _("S&top") :
 					_("S&tart"));
 		}
@@ -2884,51 +2821,6 @@
 	return WND_MSG_RETCODE_OK;
 } /* End of 'player_on_info_dlg_reload' function */
 
-/* Handle 'clicked' for info dialog special function button */
-wnd_msg_retcode_t player_on_info_spec( wnd_t *wnd )
-{
-	dlgitem_t *di;
-	wnd_t *dlg;
-	checkbox_t *cb;
-	song_t **songs_list, *main_song;
-	int num_songs;
-	bool_t write_in_all = FALSE;
-	int i, index;
-
-	/* Get songs list */
-	di = DLGITEM_OBJ(wnd);
-	dlg = di->m_dialog;
-	songs_list = cfg_get_var_ptr(dlg->m_cfg_list, "songs_list");
-	main_song = cfg_get_var_ptr(dlg->m_cfg_list, "main_song");
-	num_songs = cfg_get_var_int(dlg->m_cfg_list, "num_songs");
-	assert(songs_list && main_song && (num_songs > 0));
-
-	/* Get the function index */
-	index = cfg_get_var_int(wnd->m_cfg_list, "fn_index");
-
-	/* Save info if need */
-	if (inp_get_spec_flags(main_song->m_inp, index) & INP_SPEC_SAVE_INFO)
-		player_save_info_dialog(DIALOG_OBJ(dlg));
-
-	/* Execute special function */
-	cb = CHECKBOX_OBJ(dialog_find_item(DIALOG_OBJ(dlg), "write_in_all"));
-	if (cb != NULL)
-		write_in_all = (cb->m_checked);
-	for ( i = 0; i < num_songs; i ++ )
-	{
-		in_plugin_t *inp = songs_listi->m_inp;
-		if ((!write_in_all && (songs_listi != main_song)) ||
-				(inp != main_song->m_inp))
-			continue;
-		inp_spec_func(inp, index, songs_listi->m_file_name);
-	}
-
-	/* Reload the info */
-	if (!player_info_dialog_fill(DIALOG_OBJ(dlg), FALSE))
-		wnd_close(dlg);
-	return WND_MSG_RETCODE_OK;
-} /* End of 'player_on_info_spec' function */
-
 /* Handle 'clicked' for info dialog write-in-all checkbox */
 wnd_msg_retcode_t player_on_info_cb_clicked( wnd_t *wnd )
 {
@@ -2951,9 +2843,33 @@
 			cfg_get_var_bool(WND_OBJ(dlg)->m_cfg_list, "comment_diff"));
 	player_info_dlg_change_eb_gray(dlg, "genre", not_check ? FALSE :
 			cfg_get_var_bool(WND_OBJ(dlg)->m_cfg_list, "genre_diff"));
+
+	/* Set fields read-only if necessary */
+	player_info_dialog_set_if_readonly(dlg);
 	return WND_MSG_RETCODE_OK;
 } /* End of 'player_on_info_cb_clicked' function */
 
+/* Update read-only status of info dialog fields */
+static void player_info_dialog_set_if_readonly( dialog_t *dlg )
+{
+	bool_t in_all = FALSE;
+	dlgitem_t *in_all_cb = dialog_find_item(dlg, "write_in_all");
+	if (in_all_cb)
+		in_all = CHECKBOX_OBJ(in_all_cb)->m_checked;
+
+	bool_t is_readonly = in_all ?
+		cfg_get_var_bool(WND_OBJ(dlg)->m_cfg_list, "all_readonly") :
+		cfg_get_var_bool(WND_OBJ(dlg)->m_cfg_list, "main_readonly");
+
+	EDITBOX_OBJ(dialog_find_item(dlg, "name"))->m_editable = !is_readonly;
+	EDITBOX_OBJ(dialog_find_item(dlg, "artist"))->m_editable = !is_readonly;
+	EDITBOX_OBJ(dialog_find_item(dlg, "album"))->m_editable = !is_readonly;
+	EDITBOX_OBJ(dialog_find_item(dlg, "year"))->m_editable = !is_readonly;
+	EDITBOX_OBJ(dialog_find_item(dlg, "track"))->m_editable = !is_readonly;
+	EDITBOX_OBJ(dialog_find_item(dlg, "comments"))->m_editable = !is_readonly;
+	EDITBOX_OBJ(dialog_find_item(dlg, "genre"))->m_editable = !is_readonly;
+} /* End of 'player_info_dialog_set_if_readonly' function */
+
 /* Handle 'ok_clicked' for search dialog */
 wnd_msg_retcode_t player_on_search( wnd_t *wnd )
 {
@@ -3115,42 +3031,6 @@
 	return WND_MSG_RETCODE_OK;
 } /* End of 'player_pmng_dialog_on_list_change' function */
 
-/* Handle 'selection_changed' message for plugins manager list box */
-wnd_msg_retcode_t player_pmng_dialog_on_list_sel_change( wnd_t *wnd, 
-		int index )
-{
-	player_pmng_view_t *views;
-	wnd_t *dlg;
-
-	dlg = DLGITEM_OBJ(wnd)->m_dialog;
-	views = (player_pmng_view_t *)cfg_get_var_ptr(dlg->m_cfg_list, "views");
-	assert(views);
-	player_pmng->m_cur_out = index < 0 ? NULL :
-		OUTPUT_PLUGIN(viewsPLAYER_PMNG_OUTPUT.m_list->m_listindex.m_data);
-	return WND_MSG_RETCODE_OK;
-} /* End of 'player_pmng_dialog_on_list_sel_change' function */
-
-/* Handle 'clicked' message for plugins manager 'enable effect' checkbox */
-wnd_msg_retcode_t player_pmng_dialog_on_effect_clicked( wnd_t *wnd )
-{
-	plugin_t *ep;
-	checkbox_t *cb = CHECKBOX_OBJ(wnd);
-	wnd_t *dlg;
-	player_pmng_view_t *views;
-	listbox_t *lb;
-
-	/* Enable/disable effect */
-	dlg = DLGITEM_OBJ(wnd)->m_dialog;
-	views = (player_pmng_view_t *)cfg_get_var_ptr(dlg->m_cfg_list, "views");
-	assert(views);
-	lb = viewsPLAYER_PMNG_EFFECT.m_list;
-	if (!lb->m_list_size)
-		return WND_MSG_RETCODE_OK;
-	ep = (plugin_t *)lb->m_listlb->m_cursor.m_data;
-	pmng_enable_effect(player_pmng, ep, cb->m_checked);
-	return WND_MSG_RETCODE_OK;
-} /* End of 'player_pmng_dialog_on_effect_clicked' function */
-
 /* Handle 'clicked' message for plugins manager configure buttons */
 wnd_msg_retcode_t player_pmng_dialog_on_configure( wnd_t *wnd )
 {
@@ -3209,10 +3089,10 @@
 	p = (plugin_t *)v->m_list->m_listindex.m_data;
 
 	/* Change state */
-	if (!genp_is_started(p))
-		genp_start(p);
+	if (!genp_is_started(GENERAL_PLUGIN(p)))
+		genp_start(GENERAL_PLUGIN(p));
 	else
-		genp_end(p);
+		genp_end(GENERAL_PLUGIN(p));
 	player_pmng_dialog_sync(DIALOG_OBJ(dlg));
 	return WND_MSG_RETCODE_OK;
 } /* End of 'player_pmng_dialog_on_start_stop_general' function */
@@ -3240,7 +3120,7 @@
  *****/
 
 /* Handle 'title_format' variable setting */
-bool_t player_handle_var_title_format( cfg_node_t *var, char *value, 
+static bool_t player_handle_var_title_format( cfg_node_t *var, char *value, 
 		void *data )
 {
 	int i;
@@ -3254,33 +3134,8 @@
 	return TRUE;
 } /* End of 'player_handle_var_title_format' function */
 
-/* Handle 'output_plugin' variable setting */
-bool_t player_handle_var_outp( cfg_node_t *var, char *value, void *data )
-{
-	pmng_iterator_t iter;
-
-	if (player_pmng == NULL)
-		return TRUE;
-
-	/* Choose new output plugin */
-	iter = pmng_start_iteration(player_pmng, PLUGIN_TYPE_OUTPUT);
-	for ( ;; )
-	{
-		plugin_t *p = pmng_iterate(&iter);
-		if (p == NULL)
-			break;
-
-		if (!strcmp(p->m_name, cfg_get_var(cfg_list, "output-plugin")))
-		{
-			player_pmng->m_cur_out = OUTPUT_PLUGIN(p);
-			break;
-		}
-	}
-	return TRUE;
-} /* End of 'player_handle_var_outp' function */
-
 /* Handle 'color-scheme' variable setting */
-bool_t player_handle_color_scheme( cfg_node_t *node, char *value, 
+static bool_t player_handle_color_scheme( cfg_node_t *node, char *value, 
 		void *data )
 {
 	char fnameMAX_FILE_NAME;
@@ -3294,7 +3149,7 @@
 } /* End of 'player_handle_color_scheme' function */
 
 /* Handle 'kbind-scheme' variable setting */
-bool_t player_handle_kbind_scheme( cfg_node_t *node, char *value, 
+static bool_t player_handle_kbind_scheme( cfg_node_t *node, char *value, 
 		void *data )
 {
 	char fnameMAX_FILE_NAME;
@@ -3383,8 +3238,7 @@
 	cfg_set_var(list, "kbind.time_move", "gt");
 	cfg_set_var(list, "kbind.vol_fw", "+;lv");
 	cfg_set_var(list, "kbind.vol_bw", "-;hv");
-	cfg_set_var(list, "kbind.bal_fw", ";lb");
-	cfg_set_var(list, "kbind.bal_bw", ";hb");
+	cfg_set_var(list, "kbind.vol_def", "=");
 	cfg_set_var(list, "kbind.info", "i");
 	cfg_set_var(list, "kbind.add", "a");
 	cfg_set_var(list, "kbind.rem", "r");
@@ -3397,9 +3251,9 @@
 	cfg_set_var(list, "kbind.next_match", "n");
 	cfg_set_var(list, "kbind.prev_match", "N");
 	cfg_set_var(list, "kbind.help", "?");
-	cfg_set_var(list, "kbind.equalizer", "e");
 	cfg_set_var(list, "kbind.shuffle", "R");
 	cfg_set_var(list, "kbind.var_manager", "o");
+	cfg_set_var(list, "kbind.audio_setup", "A");
 	cfg_set_var(list, "kbind.plist_down", "J");
 	cfg_set_var(list, "kbind.plist_up", "K");
 	cfg_set_var(list, "kbind.plist_move", "M");
@@ -3486,6 +3340,7 @@
 		player_seek(player_last_song_time, FALSE);
 	else
 		player_play(player_last_song, player_last_song_time);
+	pmng_hook(player_pmng, "player-status");
 } /* End of 'player_time_back' function */
 
 /* Save current song and time */
@@ -3495,5 +3350,46 @@
 	player_last_song_time = player_context->m_cur_time;
 } /* End of 'player_save_time' function */
 
+/* High-level start play */
+void player_start_play( int song, song_time_t start_time )
+{
+	player_context->m_status = PLAYER_STATUS_PLAYING;
+	player_play(song, start_time);
+	pmng_hook(player_pmng, "player-status");
+} /* End of 'player_start_play' function */
+
+/* High-level pause/resume */
+void player_pause_resume( void )
+{
+	if (player_context->m_status == PLAYER_STATUS_PLAYING)
+	{
+		player_context->m_status = PLAYER_STATUS_PAUSED;
+	}
+	else if (player_context->m_status == PLAYER_STATUS_PAUSED)
+	{
+		player_context->m_status = PLAYER_STATUS_PLAYING;
+	}
+
+	pmng_hook(player_pmng, "player-status");
+} /* End of 'player_pause_resume' function */
+
+/* High-level stop play */
+void player_stop( void )
+{
+	int was_song = player_plist->m_cur_song;
+
+	player_context->m_status = PLAYER_STATUS_STOPPED;
+	player_end_play(FALSE);
+	player_plist->m_cur_song = was_song;
+	pmng_hook(player_pmng, "player-status");
+} /* End of 'player_stop' function */
+
+/* Queue the selected song */
+void player_queue_song( void )
+{
+	if(num_queued_songs < PLAYER_MAX_ENQUEUED)
+		queued_songsnum_queued_songs++ = player_plist->m_sel_end;
+} /* End of 'player_queue_song' function */
+
 /* End of 'player.c' file */

mpfc-1.3.8.1.tar.bz2/src/player.h -> mpfc-2.0.tar.bz2/src/player.h Changed

mpfc-1.3.8.1.tar.bz2/src/plist.c -> mpfc-2.0.tar.bz2/src/plist.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Play list manipulation functions.
- * $Id: plist.c 307 2011-03-13 11:58:47Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -21,14 +21,20 @@
  */
 
 #include <ctype.h>
+#include <errno.h>
+#include <glib.h>
+#include <glob.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
+#include <json-glib/json-glib.h>
 #include "types.h"
-#include "file.h"
-#include "inp.h"
+#include "file_utils.h"
+#include "json_helpers.h"
 #include "player.h"
 #include "plist.h"
 #include "pmng.h"
@@ -36,11 +42,7 @@
 #include "util.h"
 #include "undo.h"
 #include "wnd.h"
-
-extern void pmng_hook( pmng_t *pmng, char *hook );
-
-/* Number of files added by plist_add_set */
-int plist_num = 0;
+#include "info_rw_thread.h"
 
 /* Create a new play list */
 plist_t *plist_new( int start_pos )
@@ -101,311 +103,6 @@
 	return ret;
 } /* End of 'plist_add' function */
 
-/* Add single file to play list */
-int plist_add_one_file( plist_t *pl, vfs_file_t *file, char *title, int len,
-		int where )
-{
-	song_t *song;
-	int was_len;
-	assert(pl);
-
-	/* Choose if file is play list */
-	if (!strcasecmp(file->m_extension, "m3u"))
-		return plist_add_m3u(pl, file->m_name);
-	else if (!strcasecmp(file->m_extension, "pls"))
-		return plist_add_pls(pl, file->m_name);
-
-	/* Lock play list */
-	plist_lock(pl);
-
-	/* Try to reallocate memory for play list */
-	was_len = pl->m_len;
-	pl->m_list = (song_t **)realloc(pl->m_list,
-			sizeof(song_t *) * (pl->m_len + 1));
-	if (pl->m_list == NULL)
-	{
-		pl->m_len = 0;
-		plist_unlock(pl);
-		return 0;
-	}
-
-	/* Initialize new song and add it to list */
-	song = song_new(file, title, len);
-	if (song == NULL)
-	{
-		plist_unlock(pl);
-		return 0;
-	}
-	if (where < 0 || where >= pl->m_len)  
-		where = pl->m_len;
-	memmove(&pl->m_listwhere + 1, &pl->m_listwhere, 
-			sizeof(song_t *) * (pl->m_len - where));
-	pl->m_listwhere = song;
-	pl->m_len ++;
-
-	/* Update current song index */
-	if (pl->m_cur_song >= where)
-		pl->m_cur_song ++;
-
-	/* If list was empty - put cursor to the first song */
-	if (!was_len)
-	{
-		pl->m_sel_start = pl->m_sel_end = 0;
-		pl->m_visual = FALSE;
-	}
-
-	/* Unlock play list */
-	plist_unlock(pl);
-
-	/* Schedule song for setting its info and length */
-	if (title == NULL)
-		pl->m_listwhere->m_flags |= SONG_SCHEDULE;
-	return 1;
-} /* End of 'plist_add_one_file' function */
-
-/* Add a play list file to play list */
-int plist_add_list( plist_t *pl, char *filename )
-{
-	char *ext = util_extension(filename);
-	assert(pl);
-
-	/* Choose play list format */
-	if (!strcasecmp(ext, "m3u"))
-		return plist_add_m3u(pl, filename);
-	else if (!strcasecmp(ext, "pls"))
-		return plist_add_pls(pl, filename);
-	/*else if (!strcasecmp(ext, "mpl"))
-		return plist_add_mpl(pl, filename);*/
-	else
-		return -1;
-} /* End of 'plist_add_list' function */
-
-/* Add M3U play list */
-int plist_add_m3u( plist_t *pl, char *filename )
-{
-	file_t *fd;
-	char str1024;
-	int num = 0;
-	bool_t ext_info;
-
-	/* Try to open file */
-	fd = file_open(filename, "rt", NULL);
-	if (fd == NULL)
-	{
-		logger_error(player_log, 0, _("Unable to read %s file"), filename);
-		return 0;
-	}
-
-	/* Read file head */
-	file_gets(str, sizeof(str), fd);
-	ext_info = !strncmp(str, "#EXTM3U", 7);
-	if (!ext_info)
-		file_seek(fd, 0, SEEK_SET);
-		
-	/* Read file contents */
-	while (!file_eof(fd))
-	{
-		char len10, *title;
-		int i, j, song_len, str_len;
-		vfs_file_t desc;
-
-		/* Read file name if no extended info is supplied */
-		if (!ext_info)
-		{
-			file_gets(str, sizeof(str), fd);
-			if (file_eof(fd))
-				break;
-			util_del_nl(str, str);
-			vfs_file_desc_init(player_vfs, &desc, str, NULL);
-			num += plist_add_one_file(pl, &desc, NULL, 0, -1);
-			continue;
-		}
-		
-		/* Read song length and title string */
-		file_gets(str, sizeof(str), fd);
-		if (file_eof(fd) || strlen(str) < 10)
-			break;
-
-		/* Extract song length from string read */
-		for ( i = 8, j = 0; stri && stri != ',' && j < (sizeof(len) - 1); 
-				i ++, j ++ )
-			lenj = stri;
-		lenj = 0;
-		if (stri)
-			song_len = atoi(len);
-		title = strdup(&stri + 1);
-		util_del_nl(title, title);
-
-		/* Read song file name */
-		file_gets(str, sizeof(str), fd);
-		util_del_nl(str, str);
-
-		/* Add file */
-		vfs_file_desc_init(player_vfs, &desc, str, NULL);
-		num += plist_add_one_file(pl, &desc, title, song_len, -1);
-		free(title);
-	}
-
-	/* Close file */
-	file_close(fd);
-	return num;
-} /* End of 'plist_add_m3u' function */
-
-/* Add PLS play list */
-int plist_add_pls( plist_t *pl, char *filename )
-{
-	file_t *fd;
-	int num = 0;
-	char str1024;
-	int num_entries;
-	struct pls_entry_t
-	{
-		char *name;
-		char *title;
-		int len;
-	} *entries;
-	int i;
-
-	/* Try to open file */
-	fd = file_open(filename, "rt", NULL);
-	if (fd == NULL)
-	{
-		logger_error(player_log, 0, _("Unable to open file %s"), filename);
-		return 0;
-	}
-
-	/* Read header */
-	file_gets(str, sizeof(str), fd);
-	util_del_nl(str, str);
-	if (strcasecmp(str, "playlist"))
-	{
-		file_close(fd);
-		logger_error(player_log, 1, _("%s: missing play list header"), 
-				filename);
-		return 0;
-	}
-
-	/* Read number of entries */
-	file_gets(str, sizeof(str), fd);
-	util_del_nl(str, str);
-	if (strncasecmp(str, "numberofentries=", 16))
-	{
-		file_close(fd);
-		logger_error(player_log, 1, _("%s: missing `numberofentries' tag"), 
-				filename);
-		return 0;
-	}
-	num_entries = atoi(strchr(str, '=') + 1);
-
-	/* Allocate memory for play list entries */
-	entries = (struct pls_entry_t *)malloc(sizeof(*entries) * num_entries);
-	if (entries == NULL)
-	{
-		file_close(fd);
-		logger_error(player_log, 0, _("No enough memory"));
-		return 0;
-	}
-	memset(entries, 0, sizeof(*entries) * num_entries);
-
-	/* Read data */
-	while (!file_eof(fd))
-	{
-		char *value;
-		enum
-		{
-			FILE_NAME,
-			TITLE,
-			LENGTH
-		} type;
-		int index;
-		char *s = str;
-		
-		/* Read line */
-		file_gets(str, sizeof(str), fd);
-		util_del_nl(str, str);
-
-		/* Determine line type */
-		if (!strncasecmp(s, "File", 4))
-		{
-			s += 4;
-			type = FILE_NAME;
-		}
-		else if (!strncasecmp(s, "Title", 5))
-		{
-			s += 5;
-			type = TITLE;
-		}
-		else if (!strncasecmp(s, "Length", 6))
-		{
-			s += 6;
-			type = LENGTH;
-		}
-		else
-		{
-			continue;
-		}
-
-		/* Extract index */
-		index = 0;
-		while (isdigit(*s))
-		{
-			index *= 10;
-			index += ((*s) - '0');
-			s ++;
-		}
-		index --;
-		if (index >= num_entries)
-			continue;
-
-		/* Extract value */
-		if ((*s) != '=')
-			continue;
-		else
-			s ++;
-		value = strdup(s);
-
-		/* Save entry */
-		if (type == FILE_NAME)
-			entriesindex.name = value;
-		else if (type == TITLE)
-			entriesindex.title = value;
-		else 
-		{
-			entriesindex.len = atoi(value);
-			free(value);
-		}
-	}
-
-	/* Close file */
-	file_close(fd);
-
-	/* Add the value to the play list */
-	for ( i = 0; i < num_entries; i ++ )
-	{
-		char *name = entriesi.name;
-		char *title = entriesi.title;
-		int len = entriesi.len;
-
-		if (name != NULL)
-		{
-			vfs_file_t desc;
-
-			/* Add song */
-			vfs_file_desc_init(player_vfs, &desc, name, NULL);
-			num += plist_add_one_file(pl, &desc, title, len < 0 ? 0 : len, -1);
-
-			/* Free this entry */
-			free(name);
-			if (title != NULL)
-				free(title);
-		}
-		else if (title != NULL)
-			free(title);
-	}
-	free(entries);
-	return num;
-} /* End of 'plist_add_pls' function */
-
 /* Save play list */
 bool_t plist_save( plist_t *pl, char *filename )
 {
@@ -434,9 +131,12 @@
 	fprintf(fd, "#EXTM3U\n");
 	for ( i = 0; i < pl->m_len; i ++ )
 	{
-		fprintf(fd, "#EXTINF:%i,%s\n%s\n", pl->m_listi->m_len,
-				STR_TO_CPTR(pl->m_listi->m_title), 
-				pl->m_listi->m_full_name);
+		song_t *s = pl->m_listi;
+		fprintf(fd, "#EXTINF:%i", TIME_TO_SECONDS(s->m_len));
+		if (s->m_start_time >= 0)
+			fprintf(fd, "-%i", TIME_TO_SECONDS(s->m_start_time));
+
+		fprintf(fd, ",%s\n%s\n", STR_TO_CPTR(s->m_title), song_get_name(s));
 	}
 
 	/* Close file */
@@ -458,7 +158,7 @@
 	/* Write list head */
 	fprintf(fd, "playlist\nnumberofentries=%d\n", pl->m_len);
 	for ( i = 0; i < pl->m_len; i ++ )
-		fprintf(fd, "File%d=%s\n", i + 1, pl->m_listi->m_file_name);
+		fprintf(fd, "File%d=%s\n", i + 1, song_get_name(pl->m_listi));
 
 	/* Close file */
 	fclose(fd);
@@ -479,13 +179,14 @@
 	case PLIST_SORT_BY_TITLE:
 		return strcmp(STR_TO_CPTR(s1->m_title), STR_TO_CPTR(s2->m_title));
 	case PLIST_SORT_BY_NAME:
-		return strcmp(s1->m_short_name, s2->m_short_name);
+		return strcmp(util_short_name(song_get_name(s1)),
+				util_short_name(song_get_name(s2)));
 	case PLIST_SORT_BY_PATH:
-		return strcmp(s1->m_file_name, s2->m_file_name);
+		return strcmp(song_get_name(s1), song_get_name(s2));
 	case PLIST_SORT_BY_TRACK:
 		/* Compare directories first */
-		util_get_dir_name(dir1, s1->m_file_name);
-		util_get_dir_name(dir2, s2->m_file_name);
+		util_get_dir_name(dir1, song_get_name(s1));
+		util_get_dir_name(dir2, song_get_name(s2));
 		res = strcmp(dir1, dir2);
 		if (res != 0)
 			return res;
@@ -499,7 +200,8 @@
 		}
 
 		/* Now compare file names */
-		return strcmp(s1->m_short_name, s2->m_short_name);
+		return strcmp(util_short_name(song_get_name(s1)),
+				util_short_name(song_get_name(s2)));
 	}
 	return 0;
 } /* End of 'plist_song_cmp' function */
@@ -655,6 +357,7 @@
 		struct tag_undo_list_item_t *undo;
 		struct tag_undo_list_rem_t *data;
 		int j;
+		song_metadata_t metadata_empty = SONG_METADATA_EMPTY;
 		
 		undo = (struct tag_undo_list_item_t *)malloc(sizeof(*undo));
 		undo->m_type = UNDO_REM;
@@ -662,9 +365,30 @@
 		data = &undo->m_data.m_rem;
 		data->m_num_files = end - start + 1;
 		data->m_start_pos = start;
-		data->m_files = (char **)malloc(sizeof(char *) * data->m_num_files);
+		data->m_files = (struct song_name *)malloc(sizeof(struct song_name) * data->m_num_files);
 		for ( i = start, j = 0; i <= end; i ++, j ++ )
-			data->m_filesj = strdup(pl->m_listi->m_file_name);
+		{
+			song_t *s = pl->m_listi;
+			struct song_name *sn = &data->m_filesj;
+			if (s->m_filename)
+			{
+				sn->m_filename = strdup(s->m_filename);
+				sn->m_fullname = NULL;
+			}
+			else
+			{
+				sn->m_fullname = strdup(s->m_fullname);
+				sn->m_filename = NULL;
+			}
+
+			song_metadata_t *metadata = &sn->m_metadata;
+			(*metadata) = metadata_empty;
+			metadata->m_start_time = s->m_start_time;
+			metadata->m_end_time = s->m_end_time;
+			metadata->m_len = s->m_len;
+			if (s->m_default_title)
+				metadata->m_title = strdup(s->m_default_title);
+		}
 		undo_add(player_ul, undo);
 	}
 
@@ -837,12 +561,14 @@
 /* Display play list */
 void plist_display( plist_t *pl, wnd_t *wnd )
 {
-	int i, j, start, end, l_time = 0, s_time = 0;
+	int i, j, start, end;
 	char time_text80;
 
 	assert(pl);
 	PLIST_GET_SEL(pl, start, end);
 
+	plist_lock(pl);
+
 	/* Display each song */
 	for ( i = 0, j = pl->m_scrolled; i < PLIST_HEIGHT; i ++, j ++ )
 	{
@@ -880,7 +606,8 @@
 				if(queued_songsqueueList == j)
 					wnd_printf(wnd, 0, 0, "    #%i in queue...", queueList+1);
 			}
-			sprintf(len, "%i:%02i", s->m_len / 60, s->m_len % 60);
+			int l = TIME_TO_SECONDS(s->m_len);
+			sprintf(len, "%i:%02i", l / 60, l % 60);
 			wnd_move(wnd, WND_MOVE_ADVANCE, WND_WIDTH(wnd) - strlen(len) - 1, 
 					pl->m_start_pos + i);
 			wnd_printf(wnd, 0, 0, "%s", len);
@@ -888,6 +615,7 @@
 	}
 
 	/* Display play list time */
+	song_time_t l_time = 0, s_time = 0;
 	if (pl->m_len)
 	{
 		for ( i = 0; i < pl->m_len; i ++ )
@@ -895,15 +623,19 @@
 		for ( i = start; i <= end; i ++ )
 			s_time += pl->m_listi->m_len;
 	}
+	int l_seconds = TIME_TO_SECONDS(l_time);
+	int s_seconds = TIME_TO_SECONDS(s_time);
 	wnd_apply_style(wnd, "plist-time-style");
 	sprintf(time_text, ngettext("%i/%i song; %i:%02i:%02i/%i:%02i:%02i",
 				"%i/%i songs; %i:%02i:%02i/%i:%02i:%02i", pl->m_len),
 			(end >= 0 && pl->m_len > 0) ? end - start + 1 : 0, pl->m_len,
-			s_time / 3600, (s_time % 3600) / 60, s_time % 60,
-			l_time / 3600, (l_time % 3600) / 60, l_time % 60);
-	wnd_move(wnd, 0, WND_WIDTH(wnd) - strlen(time_text) - 1, 
+			s_seconds / 3600, (s_seconds % 3600) / 60, s_seconds % 60,
+			l_seconds / 3600, (l_seconds % 3600) / 60, l_seconds % 60);
+	wnd_move(wnd, 0, WND_WIDTH(wnd) - utf8_width(time_text) - 1, 
 			pl->m_start_pos + PLIST_HEIGHT);
 	wnd_printf(wnd, 0, 0, "%s", time_text);
+
+	plist_unlock(pl);
 } /* End of 'plist_display' function */
 
 /* Lock play list */
@@ -1033,12 +765,6 @@
 	}
 } /* End of 'plist_reload_info' function */
 
-/* Handle file returned by glob */
-void plist_glob_handler( vfs_file_t *file, void *data )
-{
-	plist_num += plist_add_one_file((plist_t *)data, file, NULL, 0, -1);
-} /* End of 'plist_glob_handler' function */
-
 /* Check if specified file name belongs to an object */
 bool_t plist_is_obj( char *filename )
 {
@@ -1066,25 +792,409 @@
 	}
 } /* End of 'plist_flush_scheduled' function */
 
+#define PLIST_TOO_NESTED -1
+#define PLP_STATUS_TOO_NESTED -1
+
+/* First see if this is a playlist prefix */
+static int plist_add_prefixed(plist_t *pl, char *name, song_metadata_t *metadata, int recc_level)
+{
+	/* First see if this is a playlist prefix */
+	plist_plugin_t *plp = pmng_is_playlist_prefix(player_pmng, name);
+	if (plp)
+		return plist_add_plist(pl, plp, name, recc_level);
+
+	return plist_add_uri(pl, name, metadata);
+}
+
+typedef struct
+{
+	plist_t *pl;
+	char *m_pl_name;
+	int num_added;
+	int recc_level;
+} plist_cb_ctx_t;
+
+/* Cue sheets often have a .wav file specified
+ * while actually relating to an encoded file
+ * Try to fix this.
+ * By the way return full name */
+static bool_t plist_fix_wrong_file_ext( char *name )
+{
+	/* Find extension start */
+	int ext_pos = strlen(name) - 1;
+	for ( ; ext_pos >= 0; ext_pos-- )
+	{
+		/* No extension found */
+		if (nameext_pos == '/')
+		{
+			ext_pos = -1;
+			break;
+		}
+		if (nameext_pos == '.')
+			break;
+	}
+	if (ext_pos < 0)
+		return FALSE;
+	ext_pos++; /* after the dot */
+
+	/* Try supported extensions */
+	char *ext_start = name + ext_pos;
+	char *ext = pmng_first_media_ext(player_pmng);
+	for ( ; ext; ext = pmng_next_media_ext(ext) )
+	{
+		/* Try this extension */
+		strcpy(ext_start, ext);
+
+		struct stat st;
+		if (!stat(name, &st))
+		{
+			return TRUE;
+		}
+	}
+	assert(!ext);
+
+	return FALSE;
+} /* End of 'cue_fix_wrong_file_ext' function */
+
+/* Playlist item adding callback */
+static plp_status_t plist_add_playlist_item( void *ctxv, char *name, song_metadata_t *metadata )
+{
+	plist_cb_ctx_t *ctx = (plist_cb_ctx_t *)ctxv;
+	plp_status_t ret = PLP_STATUS_OK;
+
+	/* Handle URI in a playlist */
+	if (fu_is_prefixed(name))
+	{
+		int res = plist_add_prefixed(ctx->pl, name, metadata, ctx->recc_level);
+		if (res == PLIST_TOO_NESTED)
+			return PLP_STATUS_TOO_NESTED;
+
+		assert(res >= 0);
+		ctx->num_added += res;
+		return PLP_STATUS_OK;
+	}
+
+	/* Get full path relative to the play list if it is not absolute */
+	char *full_name = name;
+	if ((*name) != '/')
+	{
+		full_name = (char*)malloc(strlen(ctx->m_pl_name) + strlen(name) +
+				player_pmng->m_media_ext_max_len + 2);
+		strcpy(full_name, ctx->m_pl_name);
+		char *sep = strrchr(full_name, '/');
+		if (sep)
+			strcpy(sep + 1, name);
+		else
+			strcpy(full_name, name);
+	}
+
+	/* Fix extension if it is incorrect */
+	struct stat st;
+	if (stat(full_name, &st))
+	{
+		/* Enlarge memory for extension probing.
+		 * But only if it was not allocated in the abs path handling block
+		 * because there we already take this into account */
+		if (full_name == name)
+		{
+			full_name = (char*)malloc(strlen(name) +
+					player_pmng->m_media_ext_max_len + 1);
+		}
+
+		/* If neither extension worked don't add this item */
+		if (!plist_fix_wrong_file_ext(full_name))
+			goto finish;
+	}
+
+	int res = plist_add_one_file(ctx->pl, full_name, metadata, -1, ctx->recc_level);
+	if (res == PLIST_TOO_NESTED)
+		ret = PLP_STATUS_TOO_NESTED;
+	else
+	{
+		assert(res >= 0);
+		ctx->num_added += res;
+	}
+
+finish:
+	if (full_name != name)
+		free(full_name);
+	return ret;
+} /* End of 'plist_add_playlist_item' function */
+
+void plist_add_song( plist_t *pl, song_t *song, int where )
+{
+	/* Lock play list */
+	plist_lock(pl);
+
+	/* Try to reallocate memory for play list */
+	int was_len = pl->m_len;
+	pl->m_list = (song_t **)realloc(pl->m_list,
+			sizeof(song_t *) * (pl->m_len + 1));
+	if (pl->m_list == NULL)
+	{
+		pl->m_len = 0;
+		plist_unlock(pl);
+		return;
+	}
+
+	if (where < 0 || where >= pl->m_len)  
+		where = pl->m_len;
+	memmove(&pl->m_listwhere + 1, &pl->m_listwhere, 
+			sizeof(song_t *) * (pl->m_len - where));
+	pl->m_listwhere = song;
+	pl->m_len ++;
+
+	/* Update current song index */
+	if (pl->m_cur_song >= where)
+		pl->m_cur_song ++;
+
+	/* If list was empty - put cursor to the first song */
+	if (!was_len)
+	{
+		pl->m_sel_start = pl->m_sel_end = 0;
+		pl->m_visual = FALSE;
+	}
+
+	/* Unlock play list */
+	plist_unlock(pl);
+}
+
+static plist_plugin_t *is_playlist(char *file)
+{
+	plist_plugin_t *plp = pmng_is_playlist_prefix(player_pmng, file);
+	if (plp)
+		return plp;
+
+	char *ext = strrchr(file, '.');
+	if (!ext || !(*++ext))
+		return NULL;
+	return pmng_is_playlist_extension(player_pmng, ext);
+}
+
+int plist_add_plist( plist_t *pl, plist_plugin_t *plp, char *file, int recc_level )
+{
+	/* Check recursion level */
+	if (recc_level++ > 16)
+		return PLIST_TOO_NESTED;
+
+	plist_cb_ctx_t ctx = { pl, file, 0, recc_level };
+	plp_status_t status = plp_for_each_item(plp, file, &ctx,
+			plist_add_playlist_item);
+	if (status != PLP_STATUS_OK)
+		return (status == PLP_STATUS_TOO_NESTED ? PLIST_TOO_NESTED : 0);
+
+	return ctx.num_added;
+}
+
+/* Add single file to play list */
+int plist_add_one_file( plist_t *pl, char *file, song_metadata_t *metadata,
+		int where, int recc_level )
+{
+	song_t *song;
+	int was_len;
+	assert(pl);
+
+	/* Choose if file is play list */
+	plist_plugin_t *plp = is_playlist(file);
+	if (plp)
+		return plist_add_plist(pl, plp, file, recc_level);
+
+	/* Initialize new song and add it to list */
+	song = song_new_from_file(file, metadata);
+	if (song == NULL)
+	{
+		plist_unlock(pl);
+		return 0;
+	}
+
+	/* Schedule song for setting its info and length */
+	if (!metadata->m_title)
+		song->m_flags |= SONG_SCHEDULE;
+
+	plist_add_song(pl, song, where);
+
+	return 1;
+} /* End of 'plist_add_one_file' function */
+
+static int plist_report_if_too_nested_and_continue( int res, char *path )
+{
+	if (res == PLIST_TOO_NESTED)
+	{
+		logger_error(player_log, 0,
+				_("Unable to add '%s' because nesting level is too high. "
+				  "It is likely to be a recursive playlist"), path);
+		return 0;
+	}
+	return res;
+}
+
+static int plist_add_file( plist_t *pl, char *full_path )
+{
+	song_metadata_t metadata = SONG_METADATA_EMPTY;
+	int res = plist_add_one_file(pl, full_path, &metadata, -1, 0);
+	res = plist_report_if_too_nested_and_continue(res, full_path);
+
+	assert(res >= 0);
+	return res;
+}
+
+static int plist_add_dir( plist_t *pl, char *dir_path );
+
+static int plist_add_real_path( plist_t *pl, char *full_path )
+{
+	/* Check if this is a directory */
+	bool_t is_dir;
+	if (!fu_file_type(full_path, &is_dir))
+		return 0;
+
+	if (is_dir)
+		return plist_add_dir(pl, full_path);
+	else
+		return plist_add_file(pl, full_path);
+}
+
+static int plist_add_dir( plist_t *pl, char *dir_path )
+{
+	/* Get sorted directory contents */
+	struct dirent **namelist;
+	int n = scandir(dir_path, &namelist, NULL, alphasort);
+	if (n < 0)
+	{
+		logger_error(player_log, 1, "scandir failed");
+		return 0;
+	}
+
+	int num_added = 0;
+	int only_idx = -1;
+
+	/* Smart directory adding: scan directory for playlist and 
+	 * only one playlist if there is any */
+	if (cfg_get_var_bool(cfg_list, "smart-dir-add"))
+	{
+		int plist_idx = -1;
+		int rank = 0;
+		for ( int i = 0; i < n; i++ )
+		{
+			char *name = namelisti->d_name;
+
+			plist_plugin_t *plp = is_playlist(name);
+			if (!plp)
+				continue;
+
+			int this_rank = PLIST_RANK(plp);
+			if (plist_idx < 0 || this_rank > rank)
+			{
+				plist_idx = i;
+				rank = this_rank;
+			}
+		}
+
+		only_idx = plist_idx;
+	}
+
+	for ( int i = 0; i < n; i++ )
+	{
+		char *name = namelisti->d_name;
+
+		/* Skip everything except for playlist in the smart-add mode */
+		if (only_idx != -1 && only_idx != i)
+			goto finally;
+
+		if (fu_is_special_dir(name))
+			goto finally;
+		if ((*name) == '.' && cfg_get_var_bool(cfg_list, "skip-hidden-files"))
+			goto finally;
+
+		char *full_path = util_strcat(dir_path, "/", name, NULL);
+		num_added += plist_add_real_path(pl, full_path);
+		free(full_path);
+
+	finally:
+		free(namelisti);
+	}
+
+	free(namelist);
+
+	return num_added;
+}
+
+int plist_add_uri( plist_t *pl, char *uri, song_metadata_t *metadata )
+{
+	song_t *s = song_new_from_uri(uri, metadata);
+	assert(s);
+
+	/* Schedule song for setting its info and length */
+	if (!metadata->m_title)
+		s->m_flags |= SONG_SCHEDULE;
+
+	plist_add_song(pl, s, -1);
+	return 1;
+}
+
+static int plist_add_path( plist_t *pl, char *path )
+{
+	/* This is an URI */
+	if (fu_is_prefixed(path))
+	{
+		song_metadata_t metadata = SONG_METADATA_EMPTY;
+		int res = plist_add_prefixed(pl, path, &metadata, 0);
+		res = plist_report_if_too_nested_and_continue(res, path);
+
+		assert(res >= 0);
+		return res;
+	}
+
+	/* Construct absolute path */
+	char *full_path = path;
+	if ((*path) != '/')
+	{
+		char *dirname = get_current_dir_name();
+		if (!dirname)
+		{
+			logger_error(player_log, 1, "get_current_dir_name failed: %s", strerror(errno));
+			return 0;
+		}
+
+		full_path = util_strcat(dirname,
+				(dirnamestrlen(dirname) - 1 == '/') ? "" : "/",
+				 path, NULL);
+		free(dirname);
+	}
+
+	int res = plist_add_real_path(pl, full_path);
+	if (full_path != path)
+		free(full_path);
+
+	assert(res >= 0);
+	return res;
+}
+
 /* Add a set of files to play list */
 bool_t plist_add_set( plist_t *pl, plist_set_t *set )
 {
-	int i, num = 0;
-	struct tag_plist_set_t *node;
-	vfs_glob_flags_t flags = 0;
-
 	/* Do nothing if set is empty */
 	if (pl == NULL || set == NULL)
 		return FALSE;
 
-	/* Add each file in the set */
-	if (!set->m_patterns)
-		flags |= VFS_GLOB_NOPATTERN;
-	plist_num = 0;
-	for ( node = set->m_head; node != NULL; node = node->m_next )
+	int plist_num = 0;
+
+	for ( struct tag_plist_set_t *node = set->m_head; node; node = node->m_next )
 	{
-		vfs_glob(player_vfs, node->m_name, plist_glob_handler, pl, 
-				VFS_LEVEL_INFINITE, flags);
+		/* glob patterns */
+		if (set->m_patterns && !fu_is_prefixed(node->m_name))
+		{
+			glob_t gl;
+			if (glob(node->m_name, GLOB_TILDE, NULL, &gl))
+				continue;
+
+			for ( char **path = gl.gl_pathv; *path; ++path )
+				plist_num += plist_add_path(pl, *path);
+
+			globfree(&gl);
+		}
+		/* or just a path */
+		else
+			plist_num += plist_add_path(pl, node->m_name);
 	}
 
 	/* Set info */
@@ -1124,7 +1234,6 @@
 			plist_sort_bounds(pl, pl->m_len - plist_num, pl->m_len - 1, cr);
 		}
 	}
-	plist_num = 0;
 
 	return TRUE;
 } /* End of 'plist_add_set' function */
@@ -1213,5 +1322,101 @@
 	pl->m_visual = FALSE;
 } /* End of 'plist_clear' function */
 
+/* Export play list to a json object */
+JsonArray *plist_export_to_json( plist_t *pl )
+{
+	JsonArray *js_plist = json_array_new();
+	for ( int i = 0; i < pl->m_len; i ++ )
+	{
+		song_t *s = pl->m_listi;
+		JsonObject *js_song = json_object_new();
+
+		json_object_set_string_member(js_song, "name", song_get_name(s));
+		json_object_set_int_member(js_song, "length", s->m_full_len);
+		json_object_set_int_member(js_song, "start_time", s->m_start_time);
+		json_object_set_int_member(js_song, "end_time", s->m_end_time);
+
+		if (s->m_default_title)
+			json_object_set_string_member(js_song, "title", s->m_default_title);
+
+		if (s->m_info && (s->m_info->m_flags & SI_INITIALIZED))
+		{
+			song_info_t *si = s->m_info;
+			JsonObject *js_si = json_object_new();
+			json_object_set_string_member(js_si, "artist",		si->m_artist);
+			json_object_set_string_member(js_si, "name",		si->m_name);
+			json_object_set_string_member(js_si, "album",		si->m_album);
+			json_object_set_string_member(js_si, "year",		si->m_year);
+			json_object_set_string_member(js_si, "comments",	si->m_comments);
+			json_object_set_string_member(js_si, "track",		si->m_track);
+			if (si->m_own_data)
+				json_object_set_string_member(js_si, "own_data",	si->m_own_data);
+			json_object_set_object_member(js_song, "song_info", js_si);
+
+			if (s->m_flags & SONG_STATIC_INFO)
+				json_object_set_int_member(js_song, "static_info", 1);
+		}
+
+		json_array_add_object_element(js_plist, js_song);
+	}
+	return js_plist;
+}
+
+/* Import play list from a json object */
+void plist_import_from_json( plist_t *pl, JsonArray *js_plist )
+{
+	int num_songs = json_array_get_length(js_plist);
+	for ( int i = 0; i < num_songs; ++i )
+	{
+		JsonNode *js_song_node = json_array_get_element(js_plist, i);
+		if (!js_song_node)
+			continue;
+		if (!JSON_NODE_HOLDS_OBJECT(js_song_node))
+			continue;
+		JsonObject *js_song = json_node_get_object(js_song_node);
+
+		const char *name = js_get_string(js_song, "name", NULL);
+		if (!name)
+			continue;
+
+		song_metadata_t metadata = SONG_METADATA_EMPTY;
+		const char *title = js_get_string(js_song, "title", NULL);
+		if (title)
+			metadata.m_title = title;
+
+		metadata.m_len = js_get_int(js_song, "length", 0);
+		metadata.m_start_time = js_get_int(js_song, "start_time", -1);
+		metadata.m_end_time = js_get_int(js_song, "end_time", -1);
+
+		song_info_t *si = NULL;
+		JsonObject *js_si = js_get_obj(js_song, "song_info");
+		if (js_si)
+		{
+			si = si_new();
+			si_set_artist	(si, js_get_string(js_si, "artist", ""));
+			si_set_name		(si, js_get_string(js_si, "name", ""));
+			si_set_album	(si, js_get_string(js_si, "album", ""));
+			si_set_year		(si, js_get_string(js_si, "year", ""));
+			si_set_genre	(si, js_get_string(js_si, "genre", ""));
+			si_set_comments	(si, js_get_string(js_si, "comments", ""));
+			si_set_track	(si, js_get_string(js_si, "track", ""));
+		}
+
+		bool_t is_static_info = js_get_int(js_song, "static_info", 0);
+		if (is_static_info)
+			metadata.m_song_info = si;
+
+		song_t *s = fu_is_prefixed(name) ?
+			song_new_from_uri(name, &metadata) :
+			song_new_from_file(name, &metadata);
+		if (s)
+		{
+			if (!is_static_info && si)
+				song_set_info(s, si);
+			plist_add_song(pl, s, -1);
+		}
+	}
+}
+
 /* End of 'plist.c' file */

mpfc-1.3.8.1.tar.bz2/src/plist.h -> mpfc-2.0.tar.bz2/src/plist.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Interface for play list manipulation functions.
- * $Id: plist.h 252 2006-02-02 00:49:29Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -26,8 +26,8 @@
 #include <pthread.h>
 #include "types.h"
 #include "main_types.h"
+#include "plp.h"
 #include "song.h"
-#include "vfs.h"
 #include "wnd.h"
 
 /* A set of files for adding */
@@ -88,8 +88,13 @@
 bool_t plist_add_set( plist_t *pl, plist_set_t *set );
 
 /* Add single file to play list */
-int plist_add_one_file( plist_t *pl, vfs_file_t *file, char *title, int len,
-		int where );
+int plist_add_one_file( plist_t *pl, char *file, song_metadata_t *metadata,
+		int where, int recc_level );
+
+int plist_add_uri( plist_t *pl, char *uri, song_metadata_t *metadata );
+int plist_add_plist( plist_t *pl, plist_plugin_t *plp, char *file, int recc_level );
+
+void plist_add_song( plist_t *pl, song_t *song, int where );
 
 /* Add M3U play list */
 int plist_add_m3u( plist_t *pl, char *filename );
@@ -151,9 +156,6 @@
 /* Reload all songs information */
 void plist_reload_info( plist_t *pl, bool_t global );
 
-/* Handle file returned by glob */
-void plist_glob_handler( vfs_file_t *file, void *data );
-
 /* Set info for all scheduled songs */
 void plist_flush_scheduled( plist_t *pl );
 
@@ -169,6 +171,12 @@
 /* Add a file to set */
 void plist_set_add( plist_set_t *set, char *name );
 
+/* Export play list to a json object */
+struct _JsonArray *plist_export_to_json( plist_t *pl );
+
+/* Import play list from a json object */
+void plist_import_from_json( plist_t *pl, struct _JsonArray *js );
+
 #endif
 
 /* End of 'plist.h' file */

mpfc-2.0.tar.bz2/src/plp.h Added

@@ -0,0 +1,97 @@
+/******************************************************************
+ * Copyright (C) 2003 - 2011 by SG Software.
+ *
+ * SG MPFC. Interface for playlist plugin management functions.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#ifndef __SG_MPFC_PLP_H__
+#define __SG_MPFC_PLP_H__
+
+#include "types.h"
+#include "plugin.h"
+
+struct tag_pmng_t;
+struct tag_song_metadata_t;
+
+/* Status code */
+typedef int plp_status_t;
+#define PLP_STATUS_OK 0
+#define PLP_STATUS_FAILED 1
+
+/* Callback function which is called for each play list item */
+typedef plp_status_t (*plp_func_t)( void *ctx, char *name, struct tag_song_metadata_t *metadata );
+
+/* Data for exchange */
+typedef struct
+{
+	/* Common plugin data */
+	plugin_data_t m_pd;
+
+	/* Iterate over playlist contents */
+	plp_status_t (*m_for_each_item)( char *pl_name, void *ctx, plp_func_t f );
+
+	/* Get supported file formats */
+	void (*m_get_formats)( char *extensions, char *content_type );
+
+	/* Rank used when comparing against other play list types
+	 * Specified with the cfg system (plugins.plist.<name>.rank)
+	 * Used for smart directory adding */
+	int m_rank;
+	
+	/* Get a prefix for virtual playlists (e.g. audiocd://) */
+	char *(*m_get_prefix)( void );
+
+	/* Reserved */
+	byte m_reserved112;
+
+	/* Reserved data */
+	byte m_reserved164;
+} plp_data_t;
+
+/* Play list plugin type */
+typedef struct tag_plist_plugin_t
+{
+	/* Common plugin data */
+	plugin_t m_plugin;
+
+	/* Data for exchange */
+	plp_data_t m_pd;
+} plist_plugin_t;
+
+/* Helper macros */
+#define PLIST_PLUGIN(p) ((plist_plugin_t *)p)
+#define PLIST_DATA(pd) ((plp_data_t *)pd)
+#define PLIST_RANK(plp) (plp->m_pd.m_rank)
+
+/* Initialize playlist plugin */
+plugin_t *plp_init( char *name, struct tag_pmng_t *pmng );
+
+/* Iterate over playlist contents */
+plp_status_t plp_for_each_item( plist_plugin_t *p, char *pl_name, void *ctx, plp_func_t f );
+
+/* Get supported file formats */
+void plp_get_formats( plist_plugin_t *p, char *extensions, char *content_type );
+	
+/* Get plugin prefix */
+char * plp_get_prefix( plist_plugin_t *p );
+	
+#endif
+
+/* End of 'plp.h' file */
+

mpfc-1.3.8.1.tar.bz2/src/plugin.h -> mpfc-2.0.tar.bz2/src/plugin.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * MPFC Library. Interface for common plugins data.
- * $Id: plugin.h 252 2006-02-02 00:49:29Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -26,7 +26,7 @@
 #include "types.h"
 #include "cfg.h"
 #include "logger.h"
-#include "wnd.h"
+#include "wnd_types.h"
 
 /* Forward declarations */
 struct tag_pmng_t;
@@ -34,25 +34,11 @@
 /* Plugin types */
 typedef enum
 {
-	PLUGIN_TYPE_INPUT = 1 << 0,
-	PLUGIN_TYPE_OUTPUT = 1 << 1,
-	PLUGIN_TYPE_EFFECT = 1 << 2,
-	PLUGIN_TYPE_CHARSET = 1 << 3,
-	PLUGIN_TYPE_GENERAL = 1 << 4,
+	PLUGIN_TYPE_GENERAL = 1 << 1,
+	PLUGIN_TYPE_PLIST = 1 << 2,
 	PLUGIN_TYPE_ALL = 0xFFFFFF
 } plugin_type_t;
 
-/* Plugin mixer types */
-typedef enum
-{
-	PLUGIN_MIXER_DEFAULT,
-	PLUGIN_MIXER_MASTER,
-	PLUGIN_MIXER_PCM,
-	PLUGIN_MIXER_LINE,
-	PLUGIN_MIXER_CD,
-	PLUGIN_MIXER_MIC
-} plugin_mixer_type_t;
-
 /* Common plugin data for exchange with plugin */
 typedef struct
 {

mpfc-1.3.8.1.tar.bz2/src/pmng.h -> mpfc-2.0.tar.bz2/src/pmng.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Interface for plugins manager functions.
- * $Id: pmng.h 252 2006-02-02 00:49:29Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -25,16 +25,12 @@
 
 #include "types.h"
 #include "cfg.h"
-#include "csp.h"
 #include "command.h"
-#include "ep.h"
-#include "inp.h"
 #include "logger.h"
 #include "main_types.h"
-#include "outp.h"
+#include "plp.h"
 #include "plugin.h"
-#include "vfs.h"
-#include "wnd.h"
+#include "wnd_types.h"
 
 /* Plugin manager type */
 typedef struct tag_pmng_t
@@ -43,9 +39,6 @@
 	int m_num_plugins;
 	plugin_t **m_plugins;
 
-	/* Current output plugin */
-	out_plugin_t *m_cur_out;
-
 	/* Configuration variables list */
 	cfg_node_t *m_cfg_list;
 
@@ -63,6 +56,14 @@
 
 	/* Player context */
 	player_context_t *m_player_context;
+
+	/* Local hook handler */
+	int m_hook_id;
+	void (*m_hook_handler)(char *hook);
+
+	/* The list of supported media file extensions */
+	char *m_media_file_exts;
+	unsigned m_media_ext_max_len;
 } pmng_t;
 
 /* Initialize plugins */
@@ -88,10 +89,7 @@
 void pmng_autostart_general( pmng_t *pmng );
 
 /* Search for input plugin supporting given format */
-in_plugin_t *pmng_search_format( pmng_t *pmng, char *filename, char *ext );
-
-/* Search for input plugin supporting given content-type */
-in_plugin_t *pmng_search_content_type( pmng_t *pmng, char *content );
+bool_t pmng_search_format( pmng_t *pmng, const char *filename, const char *ext );
 
 /* Apply effect plugins */
 int pmng_apply_effects( pmng_t *pmng, byte *data, int len, int fmt, 
@@ -101,14 +99,8 @@
 plugin_t *pmng_search_by_name( pmng_t *pmng, char *name, 
 		plugin_type_t type_mask );
 
-/* Plugin glob handler */
-void pmng_glob_handler( struct tag_vfs_file_t *file, void *data );
-
 /* Check if specified plugin is already loaded */
-bool_t pmng_is_loaded( pmng_t *pmng, char *name, plugin_type_t type_mask );
-
-/* Find charset plugin which supports specified set */
-cs_plugin_t *pmng_find_charset( pmng_t *pmng, char *name, int *index );
+bool_t pmng_is_loaded( pmng_t *pmng, const char *name, plugin_type_t type_mask );
 
 /* Get configuration variables list */
 cfg_node_t *pmng_get_cfg( pmng_t *pmng );
@@ -117,7 +109,7 @@
 logger_t *pmng_get_logger( pmng_t *pmng );
 
 /* Create a plugin name */
-char *pmng_create_plugin_name( char *filename );
+char *pmng_create_plugin_name( const char *filename );
 
 /* Stop all general plugins */
 void pmng_stop_general_plugins( pmng_t *pmng );
@@ -154,6 +146,25 @@
 /* Enable/disable effect */
 void pmng_enable_effect( pmng_t *pmng, plugin_t *ep, bool_t enable );
 
+/* Install a hook handler */
+int pmng_add_hook_handler( pmng_t *pmng, void (*handler)(char*) );
+
+/* Uninstall a hook handler */
+void pmng_remove_hook_handler( pmng_t *pmng, int handler_id );
+
+/* Call hook functions */
+void pmng_hook( pmng_t *pmng, char *hook );
+
+/* Start media extensions list iteration */
+char *pmng_first_media_ext( pmng_t *pmng );
+
+/* Get next media extension */
+char *pmng_next_media_ext( char *iter );
+
+/* Check if file is a play list managed by a plugin */
+plist_plugin_t *pmng_is_playlist_prefix( pmng_t *pmng, char *name );
+plist_plugin_t *pmng_is_playlist_extension( pmng_t *pmng, char *ext );
+
 #endif
 
 /* End of 'pmng.h' file */

mpfc-2.0.tar.bz2/src/rd_with_notify.c Added

@@ -0,0 +1,83 @@
+/******************************************************************
+ * Copyright (C) 2011 by SG Software.
+ *
+ * SG MPFC. Abstraction for a reader with external notification.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include "types.h"
+#include "rd_with_notify.h"
+
+/* Create a new object */
+rd_with_notify_t *rd_with_notify_new( int fd )
+{
+	/* Allocate memory */
+	rd_with_notify_t *rdwn = (rd_with_notify_t *)malloc(sizeof(rd_with_notify_t));
+	if (!rdwn)
+		return NULL;
+	rdwn->m_fd = fd;
+
+	/* Create the external notification pipe */
+	if (pipe(rdwn->m_notify_pipe) == -1)
+	{
+		free(rdwn);
+		return NULL;
+	}
+
+	return rdwn;
+} /* End of 'rd_with_notify_new' function */
+
+/* Create a new object */
+void rd_with_notify_free( rd_with_notify_t *rdwn )
+{
+	close(rdwn->m_notify_pipe0);
+	close(rdwn->m_notify_pipe1);
+	free(rdwn);
+} /* End of 'rd_with_notify_free' function */
+
+/* Wait for input or notification */
+int rd_with_notify_wait( rd_with_notify_t *rdwn )
+{
+	fd_set rdfs;
+	int retv;
+	int fd = RDWN_FD(rdwn);
+	int notify_fd = RDWN_NOTIFY_READ_FD(rdwn);
+	int nfd = ((notify_fd > fd) ? notify_fd : fd) + 1;
+	int res = 0;
+
+	/* Setup files for select */
+	FD_ZERO(&rdfs);
+	FD_SET(notify_fd, &rdfs);
+	FD_SET(fd, &rdfs);
+
+	/* Wait for some activity */
+	retv = select(nfd, &rdfs, NULL, NULL, NULL);
+	if (retv == -1)
+		return 0;
+
+	if (FD_ISSET(notify_fd, &rdfs))
+		res |= RDWN_NOTIFY_READY;
+	if (FD_ISSET(fd, &rdfs))
+		res |= RDWN_READ_READY;
+	return res;
+} /* End of 'rd_with_notify_wait' function */
+
+/* End of 'rd_with_notify.c' file */
+

mpfc-2.0.tar.bz2/src/rd_with_notify.h Added

@@ -0,0 +1,56 @@
+/******************************************************************
+ * Copyright (C) 2011 by SG Software.
+ *
+ * SG MPFC. Abstraction for a reader with external notification.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#ifndef __SG_MPFC_RD_WITH_NOTIFY_H__
+#define __SG_MPFC_RD_WITH_NOTIFY_H__
+
+#include "types.h"
+
+typedef struct
+{
+	/* Main file we are reading from */
+	int m_fd;
+
+	/* Pipe for communicating notifications */
+	int m_notify_pipe2;
+} rd_with_notify_t;
+
+#define RDWN_FD(x)				((x)->m_fd)
+#define RDWN_NOTIFY_READ_FD(x)	((x)->m_notify_pipe0)
+#define RDWN_NOTIFY_WRITE_FD(x)	((x)->m_notify_pipe1)
+
+#define RDWN_READ_READY		(1 << 0)
+#define RDWN_NOTIFY_READY	(1 << 1)
+
+/* Create a new object */
+rd_with_notify_t *rd_with_notify_new( int fd );
+
+/* Create a new object */
+void rd_with_notify_free( rd_with_notify_t *rdwn );
+
+/* Wait for input or notification */
+int rd_with_notify_wait( rd_with_notify_t *rdwn );
+
+#endif
+
+/* End of 'rd_with_notify.h' file */
+

mpfc-2.0.tar.bz2/src/server.c Added

@@ -0,0 +1,434 @@
+/******************************************************************
+ * Copyright (C) 2011 by SG Software.
+ *
+ * SG MPFC. Server implementation.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include "cfg.h"
+#include "pmng.h"
+#include "player.h"
+#include "rd_with_notify.h"
+#include "server_client.h"
+
+int server_socket = -1;
+pthread_t server_tid = -1;
+
+rd_with_notify_t *server_rdwn = NULL;
+
+server_conn_desc_t *server_conns = NULL;
+
+int server_hook_id = -1;
+
+pthread_mutex_t server_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+static void *server_thread( void * );
+static void *server_conn_thread( void * );
+
+static void server_conn_notify( server_conn_desc_t *conn, char nv );
+
+static void server_hook_handler( char *hook );
+
+/* Create a new connection descriptor */
+server_conn_desc_t *server_conn_desc_new( int sock )
+{
+	server_conn_desc_t *conn_desc =
+		(server_conn_desc_t *)malloc(sizeof(server_conn_desc_t));
+	if (!conn_desc)
+	{
+		logger_error(player_log, 0, _("No enough memory!"));
+		return NULL;
+	}
+
+	conn_desc->m_socket = sock;
+	conn_desc->m_buf0 = 0;
+	conn_desc->m_cur_cmd = str_new("");
+	if (!conn_desc->m_cur_cmd)
+	{
+		free(conn_desc);
+		logger_error(player_log, 0, _("No enough memory!"));
+		return NULL;
+	}
+
+	conn_desc->m_rdwn = rd_with_notify_new(sock);
+	if (!conn_desc->m_rdwn)
+	{
+		logger_error(player_log, 0,
+				_("Connection notification pipe create failed: %s"),
+				strerror(errno));
+		str_free(conn_desc->m_cur_cmd);
+		free(conn_desc);
+		return NULL;
+	}
+
+	/* List management */
+	pthread_mutex_lock(&server_mutex);
+	conn_desc->m_prev = NULL;
+	conn_desc->m_next = server_conns;
+	if (server_conns)
+		server_conns->m_prev = conn_desc;
+	server_conns = conn_desc;
+	pthread_mutex_unlock(&server_mutex);
+	return conn_desc;
+} /* End of 'server_conn_desc_new' function */
+
+/* Free connection descriptor */
+void server_conn_desc_free( server_conn_desc_t *conn_desc )
+{
+	pthread_mutex_lock(&server_mutex);
+	close(conn_desc->m_socket);
+	str_free(conn_desc->m_cur_cmd);
+	rd_with_notify_free(conn_desc->m_rdwn);
+
+	/* List management */
+	if (conn_desc->m_prev)
+		conn_desc->m_prev->m_next = conn_desc->m_next;
+	if (conn_desc->m_next)
+		conn_desc->m_next->m_prev = conn_desc->m_prev;
+	if (conn_desc == server_conns)
+		server_conns = conn_desc->m_next;
+
+	free(conn_desc);
+	pthread_mutex_unlock(&server_mutex);
+} /* End of 'server_conn_desc_free' function */
+
+/* Start the server */
+bool_t server_start( void )
+{
+	struct sockaddr_in addr;
+	int err, i;
+
+	int server_port = cfg_get_var_int(cfg_list, "server-port");
+	if (!server_port)
+		server_port = 0x4D50; /* 'MP' / 19792 */
+
+	int server_port_pool_size = cfg_get_var_int(cfg_list, "server-port-pool-size");
+	if (!server_port_pool_size)
+		server_port_pool_size = 10;
+
+	logger_message(player_log, 0, _("Starting the server at port %d"), server_port);
+
+	/* Create socket */
+	server_socket = socket(AF_INET, SOCK_STREAM, 0);
+	if (server_socket == -1)
+	{
+		logger_error(player_log, 0,
+				_("Server socket creation failed: %s"),
+				strerror(errno));
+		goto failed;
+	}
+
+	/* Bind */
+	for ( int i = 0; i < server_port_pool_size; i++, server_port++ )
+	{
+		addr.sin_addr.s_addr = INADDR_ANY;
+		addr.sin_port = htons(server_port);
+		addr.sin_family = AF_INET;
+		if (bind(server_socket, (struct sockaddr*)&addr, sizeof(addr)) != -1)
+			goto bind_succeeded;
+		else
+			logger_error(player_log, 0,
+					_("Server socket bind at port %d failed: %s"),
+					server_port, strerror(errno));
+	}
+
+bind_succeeded:
+
+	logger_message(player_log, 0, _("Server listening at port %d"), server_port);
+
+	/* Listen */
+	if (listen(server_socket, 5) == -1)
+	{
+		logger_error(player_log, 0,
+				_("Server socket listen failed: %s"),
+				strerror(errno));
+		goto failed;
+	}
+
+	/* Create rdwn */
+	server_rdwn = rd_with_notify_new(server_socket);
+	if (!server_rdwn)
+	{
+		logger_error(player_log, 0,
+				_("Server notification pipe create failed: %s"),
+				strerror(errno));
+		goto failed;
+	}
+
+	/* Start the main thread */
+	err = pthread_create(&server_tid, NULL, server_thread, NULL);
+	if (err)
+	{
+		logger_error(player_log, 0,
+				_("Server thread create failed: %s"),
+				strerror(err));
+		goto failed;
+	}
+
+	/* Install hook handler */
+	server_hook_id = pmng_add_hook_handler(player_pmng, server_hook_handler);
+
+	return TRUE;
+
+failed:
+	if (server_socket != -1)
+	{
+		close(server_socket);
+		server_socket = -1;
+	}
+	if (server_rdwn)
+	{
+		rd_with_notify_free(server_rdwn);
+		server_rdwn = NULL;
+	}
+	return FALSE;
+} /* End of 'server_start' function */
+
+/* Stop server */
+void server_stop( void )
+{
+	if (server_socket == -1)
+		return;
+
+	/* Uninstall hook handler */
+	pmng_remove_hook_handler(player_pmng, server_hook_id);
+
+	/* Notify the thread about exit */
+	char val = 0;
+	write(RDWN_NOTIFY_WRITE_FD(server_rdwn), &val, 1);
+	pthread_join(server_tid, NULL);
+
+	/* Close connections */
+	for ( ;; )
+	{
+		pthread_mutex_lock(&server_mutex);
+		if (server_conns)
+		{
+			pthread_t tid = server_conns->m_tid;
+			server_conn_notify(server_conns, SERVER_NOTIFY_EXIT);
+			pthread_mutex_unlock(&server_mutex);
+
+			pthread_join(tid, NULL);
+		}
+		else
+		{
+			pthread_mutex_unlock(&server_mutex);
+			break;
+		}
+	}
+
+	/* Close pipe */
+	rd_with_notify_free(server_rdwn);
+	server_rdwn = NULL;
+
+	/* Close socket */
+	close(server_socket);
+	server_socket = -1;
+
+	pthread_mutex_destroy(&server_mutex);
+} /* End of 'server_stop' function */
+
+/* The main server thread function
+ * It is responsible for accepting connections and launching 
+ * per-connection threads */
+static void *server_thread( void *p )
+{
+	for ( ;; )
+	{
+		/* Wait for input */
+		int retv = rd_with_notify_wait(server_rdwn);
+		if (!retv)
+		{
+			logger_error(player_log, 0,
+					_("Server select failed: %s"),
+					strerror(errno));
+			return NULL;
+		}
+
+		/* Exit */
+		if (retv & RDWN_NOTIFY_READY)
+			break;
+
+		/* Try to accept connection */
+		if (retv & RDWN_READ_READY)
+		{
+			server_conn_desc_t *conn_desc = NULL;
+			int conn_socket = -1;
+			int err;
+
+			conn_socket = accept(server_socket, NULL, NULL);
+			if (conn_socket == -1)
+			{
+				logger_error(player_log, 0,
+						_("Server socket accept failed: %s"),
+						strerror(errno));
+				goto failure;
+			}
+
+			logger_message(player_log, 0, _("Received a connection"));
+
+			/* Start the connection thread */
+			conn_desc = server_conn_desc_new(conn_socket);
+			if (!conn_desc)
+			{
+				close(conn_socket);
+				goto failure;
+			}
+			err = pthread_create(&conn_desc->m_tid, NULL,
+					server_conn_thread, conn_desc);
+			if (err)
+			{
+				logger_error(player_log, 0,
+						_("Server connection thread create failed: %s"),
+						strerror(err));
+				goto failure;
+			}
+
+			continue;
+		failure:
+			if (conn_desc)
+				server_conn_desc_free(conn_desc);
+			continue;
+		}
+	}
+
+	return NULL;
+} /* End of 'server_thread' function */
+
+/* Hook handler to send notifications */
+static void server_hook_handler( char *hook )
+{
+	char nv;
+	server_conn_desc_t *conn;
+
+	/* Determine notification code */
+	if (!strcmp(hook, "playlist"))
+		nv = SERVER_NOTIFY_PLAYLIST;
+	else if (!strcmp(hook, "player-status"))
+		nv = SERVER_NOTIFY_STATUS;
+	else
+		return;
+
+	/* Notify all clients */
+	pthread_mutex_lock(&server_mutex);
+	for ( conn = server_conns; conn; conn = conn->m_next )
+	{
+		server_conn_notify(conn, nv);
+	}
+	pthread_mutex_unlock(&server_mutex);
+} /* End of 'server_conn_hook_handler' function */
+
+/* Send exit notification to a connection */
+static void server_conn_notify( server_conn_desc_t *conn, char nv )
+{
+	write(RDWN_NOTIFY_WRITE_FD(conn->m_rdwn), &nv, 1);
+} /* End of 'server_conn_notify_exit' function */
+
+/* Parse and execute input from client */
+bool_t server_conn_parse_input(server_conn_desc_t *d)
+{
+	int i;
+	char *p;
+	bool_t res = TRUE;
+
+	/* Extract command */
+	for ( i = 0, p = d->m_buf; *p && i < sizeof(d->m_buf); i++, p++ )
+	{
+		if ((*p) == '\r')
+			continue;
+		if ((*p) == '\n')
+		{
+			res = server_conn_exec_command(d);
+			str_clear(d->m_cur_cmd);
+		}
+		else
+			str_insert_char(d->m_cur_cmd, *p, d->m_cur_cmd->m_len);
+	}
+	return res;
+} /* End of 'server_conn_parse_input' function */
+
+/* Connection management thread */
+static void *server_conn_thread( void *p )
+{
+	server_conn_desc_t *conn_desc = (server_conn_desc_t *)p;
+
+	for ( ;; )
+	{
+		/* Wait for some activity */
+		int retv = rd_with_notify_wait(conn_desc->m_rdwn);
+		if (!retv)
+		{
+			logger_error(player_log, 0,
+					_("Connection select failed: %s"),
+					strerror(errno));
+			break;
+		}
+
+		/* Notification */
+		if (retv & RDWN_NOTIFY_READY)
+		{
+			char nv;
+			if (read(RDWN_NOTIFY_READ_FD(conn_desc->m_rdwn), &nv, 1) <= 0)
+			{
+				/* Some error */
+				break;
+			}
+
+			/* Exit */
+			if (nv == SERVER_NOTIFY_EXIT)
+				break;
+
+			/* Handle notification */
+			server_conn_client_notify(conn_desc, nv);
+		}
+
+		/* Input from client */
+		if (retv & RDWN_READ_READY)
+		{
+			ssize_t sz = recv(conn_desc->m_socket, 
+					&conn_desc->m_buf, sizeof(conn_desc->m_buf) - 1, 0);
+			if (sz == -1)
+				continue;
+			else if (sz == 0)
+				break;
+			conn_desc->m_bufsz = 0;
+
+			if (!server_conn_parse_input(conn_desc))
+				break;
+		}
+	}
+
+	logger_message(player_log, 0, _("Closing connection"));
+
+	/* Destroy the connection */
+	server_conn_desc_free(conn_desc);
+
+	return NULL;
+} /* End of 'server_conn_thread' function */
+
+/* End of 'server.c' file */
+

mpfc-2.0.tar.bz2/src/server.h Added

@@ -0,0 +1,37 @@
+/******************************************************************
+ * Copyright (C) 2011 by SG Software.
+ *
+ * SG MPFC. Interface for the server.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#ifndef __SG_MPFC_SERVER_H__
+#define __SG_MPFC_SERVER_H__
+
+#include "types.h"
+
+/* Start the server */
+bool_t server_start( void );
+
+/* Stop server */
+void server_stop( void );
+
+#endif
+
+/* End of 'server.h' file */
+

mpfc-2.0.tar.bz2/src/server_client.c Added

@@ -0,0 +1,424 @@
+/******************************************************************
+ * Copyright (C) 2011 by SG Software.
+ *
+ * SG MPFC. Server client interaction.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <json-glib/json-glib.h>
+#include "file_utils.h"
+#include "json_helpers.h"
+#include "player.h"
+#include "server_client.h"
+#include "util.h"
+
+typedef union
+{
+	double num_param;
+	char *str_param;
+} param_t;
+
+typedef enum
+{
+	PARAM_NONE,
+	PARAM_NUMBER,
+	PARAM_STRING
+} param_kind_t;
+
+/* Parse command */
+static bool_t server_client_parse_cmd( char *cmd, char **cmd_name,
+	  	                               param_kind_t *param_kind, param_t *param )
+{
+	(*cmd_name) = cmd;
+
+	/* Skip command name */
+	for ( ;; cmd++ )
+	{
+		 if (!(isalnum(*cmd) || (*cmd) == '_'))
+			 break;
+	}
+
+	if (!(*cmd))
+	{
+		(*param_kind) = PARAM_NONE;
+		return TRUE;
+	}
+
+	/* Must be a space */
+	if ((*cmd) != ' ')
+		return FALSE;
+
+	/* Make command name null-terminated */
+	(*cmd++) = 0;
+
+	/* Starting a number */
+	if ((*cmd) == '-' || isdigit(*cmd))
+	{
+		char *endptr;
+		
+		errno = 0;
+		double v = strtold(cmd, &endptr);
+		if (errno)
+			return FALSE;
+
+		/* Something left: it's an error */
+		if (*endptr)
+			return FALSE;
+
+		(*param_kind) = PARAM_NUMBER;
+		param->num_param = v;
+		return TRUE;
+	}
+
+	/* Starting a string */
+	if ((*cmd) == '"')
+	{
+		char *p = ++cmd;
+
+		/* Skip to the closing '"'
+		 * TODO: handle escaping */
+		for ( ; *cmd && (*cmd) != '"'; cmd++ )
+			;
+		if (!(*cmd))
+			return FALSE;
+		(*cmd) = 0;
+		(*param_kind) = PARAM_STRING;
+		param->str_param = p;
+		return TRUE;
+	}
+
+	return FALSE;
+} /* End of 'server_client_parse_cmd' function */
+
+/* Send a buffer */
+bool_t server_conn_send_buf(server_conn_desc_t *d, const char *msg, int len)
+{
+	while (len > 0)
+	{
+		int sent = send(d->m_socket, msg, len, 0);
+		if (sent < 0)
+		{
+			logger_debug(player_log, "Error sending response");
+			return FALSE;
+		}
+
+		len -= sent;
+		msg += sent;
+	}
+	return TRUE;
+} /* End of 'server_conn_send_buf' function */
+
+/* Build notification message */
+void server_conn_notification_msg(char nv, char *msg, int buf_size)
+{
+	switch (nv)
+	{
+		case SERVER_NOTIFY_PLAYLIST:
+			strncpy(msg, "playlist", buf_size);
+			break;
+		case SERVER_NOTIFY_STATUS:
+			strncpy(msg, "status", buf_size);
+			break;
+		default:
+			strncpy(msg, "", buf_size);
+			break;
+	}
+} /* End of 'server_conn_notification_msg' function */
+
+/* Send a notification to client */
+void server_conn_client_notify(server_conn_desc_t *d, char nv)
+{
+	char msg128;
+	char header128;
+	int len;
+
+	server_conn_notification_msg(nv, msg, sizeof(msg));
+	len = strlen(msg);
+
+	snprintf(header, sizeof(header), "Msg-Length: %d\nMsg-Type: n\n", len);
+	if (!server_conn_send_buf(d, header, strlen(header)))
+		return;
+	server_conn_send_buf(d, msg, len);
+} /* End of 'server_conn_client_notify' function */
+
+/* Send a response to client and free message memory */
+static void server_conn_response(server_conn_desc_t *d, JsonNode *node)
+{
+	size_t len;
+	char *msg = js_to_string(node, &len);
+
+	char header128;
+	snprintf(header, sizeof(header), "Msg-Length: %zd\nMsg-Type: r\n", len);
+	if (!server_conn_send_buf(d, header, strlen(header)))
+		goto finally;
+	server_conn_send_buf(d, msg, len);
+
+finally:
+	g_free(msg);
+	json_node_free(node);
+} /* End of 'server_conn_response' function */
+
+/* Validate file name. It shall not contain '..' */
+static bool_t is_valid_file_name(char *name)
+{
+	if (name0 != '/')
+		return FALSE;
+
+	for ( ;; )
+	{
+		assert((*name) == '/');
+
+		name++;
+		if (name0 == '.' && name1 == '.' &&
+				(name2 == 0 || name2 == '/'))
+			return FALSE;
+		name = strchr(name, '/');
+		if (!name)
+			break;
+	}
+
+	return TRUE;
+} /* End of 'is_valid_file_name' function */
+
+/* Translate virtual file name */
+static char *translate_file_name(char *name)
+{
+	char *r = cfg_get_var(cfg_list, "remote-dir-root");
+	if (!r)
+		return NULL;
+
+	if (!is_valid_file_name(name))
+		return NULL;
+
+	return util_strcat(r, name, NULL);
+} /* End of 'translate_file_name' function */
+
+/* Execute 'list_dir' command */
+static void server_conn_list_dir(char *name, JsonArray *js)
+{
+	char *real_name = NULL;
+	fu_dir_t *dir = NULL;
+
+	/* Translate virtual directory name */
+	real_name = translate_file_name(name);
+	if (!real_name)
+		goto finally;
+
+	/* Open directory */
+	dir = fu_opendir(real_name);
+	if (!dir)
+		goto finally;
+
+	for ( ;; )
+	{
+		struct dirent *de = fu_readdir(dir);
+		if (!de)
+			break;
+
+		/* Skip special dirs */
+		if (fu_is_special_dir(de->d_name))
+			continue;
+
+		/* Determine file type */
+		bool_t is_dir;
+		{
+			char *full_name = util_strcat(real_name, "/", de->d_name, NULL);
+			bool_t ok = fu_file_type(full_name, &is_dir);
+			free(full_name);
+			if (!ok)
+				continue;
+		}
+
+		JsonObject *js_child = json_object_new();
+		json_object_set_string_member(js_child, "name", de->d_name);
+		json_object_set_string_member(js_child, "type", is_dir ? "d" : "f");
+		json_array_add_object_element(js, js_child);
+	}
+
+finally:
+	if (dir)
+		fu_closedir(dir);
+	if (real_name)
+		free(real_name);
+} /* End of 'server_conn_list_dir' function */
+
+/* Execute a command received from client */
+bool_t server_conn_exec_command(server_conn_desc_t *d)
+{
+	char *cmd_name;
+	param_kind_t param_kind;
+	param_t param;
+	char *cmd = d->m_cur_cmd->m_data;
+
+	logger_debug(player_log, "Received command '%s'", cmd);
+
+	if (!server_client_parse_cmd(cmd, &cmd_name, &param_kind, &param))
+	{
+		logger_debug(player_log, "Error parsing command");
+		return TRUE;
+	}
+
+	/* Execute */
+	if (!strcmp(cmd_name, "play"))
+	{
+		int song = (param_kind == PARAM_NUMBER ? param.num_param : 0);
+		player_start_play(song, 0);
+	}
+	else if (!strcmp(cmd_name, "resume"))
+	{
+		player_pause_resume();
+	}
+	else if (!strcmp(cmd_name, "pause"))
+	{
+		player_pause_resume();
+	}
+	else if (!strcmp(cmd_name, "stop"))
+	{
+		player_stop();
+	}
+	else if (!strcmp(cmd_name, "next"))
+	{
+		player_skip_songs(1, TRUE);
+	}
+	else if (!strcmp(cmd_name, "prev"))
+	{
+		player_skip_songs(-1, TRUE);
+	}
+	else if (!strcmp(cmd_name, "time_back"))
+	{
+		player_time_back();
+	}
+	else if (!strcmp(cmd_name, "get_cur_song"))
+	{
+		JsonObject *js = json_object_new();
+		int cur_song = player_plist->m_cur_song;
+
+		json_object_set_int_member(js, "position", cur_song);
+		if (cur_song >= 0)
+		{
+			const char *status = "";
+			song_t *s = player_plist->m_listcur_song;
+			json_object_set_string_member(js, "title", STR_TO_CPTR(s->m_title));
+			json_object_set_int_member(js, "time", player_context->m_cur_time);
+			json_object_set_int_member(js, "length", s->m_len);
+
+			if (player_context->m_status == PLAYER_STATUS_PLAYING)
+				status = "playing";
+			else if (player_context->m_status == PLAYER_STATUS_PAUSED)
+				status = "paused";
+			else if (player_context->m_status == PLAYER_STATUS_STOPPED)
+				status = "stopped";
+			json_object_set_string_member(js, "play_status", status);
+		}
+
+		server_conn_response(d, js_make_node(js));
+	}
+	else if (!strcmp(cmd_name, "get_playlist"))
+	{
+		JsonArray *js = json_array_new();
+
+		for ( int i = 0; i < player_plist->m_len; i++ )
+		{
+			JsonObject *js_child = json_object_new();
+			song_t *s = player_plist->m_listi;
+			json_object_set_string_member(js_child, "title", STR_TO_CPTR(s->m_title));
+			json_object_set_int_member(js_child, "length", s->m_len);
+
+			json_array_add_object_element(js, js_child);
+		}
+
+		server_conn_response(d, js_make_array_node(js));
+	}
+	else if (!strcmp(cmd_name, "get_volume"))
+	{
+		JsonObject *js = json_object_new();
+		json_object_set_double_member(js, "volume", player_context->m_volume);
+		server_conn_response(d, js_make_node(js));
+	}
+	else if (!strcmp(cmd_name, "set_volume"))
+	{
+		if (param_kind == PARAM_NUMBER)
+		{
+			player_set_vol(param.num_param, FALSE);
+		}
+	}
+	else if (!strcmp(cmd_name, "list_dir"))
+	{
+		JsonArray *js = json_array_new();
+		if (param_kind == PARAM_STRING)
+			server_conn_list_dir(param.str_param, js);
+		server_conn_response(d, js_make_array_node(js));
+	}
+	else if (!strcmp(cmd_name, "add"))
+	{
+		if (param_kind == PARAM_STRING)
+		{
+			char *real_name = translate_file_name(param.str_param);
+			plist_add(player_plist, real_name);
+			free(real_name);
+		}
+					
+	}
+	else if (!strcmp(cmd_name, "remove"))
+	{
+		if (param_kind == PARAM_NUMBER)
+		{
+			int pos = param.num_param;
+			plist_move(player_plist, pos, FALSE);
+			plist_rem(player_plist);
+		}
+	}
+	else if (!strcmp(cmd_name, "queue"))
+	{
+		if (param_kind == PARAM_NUMBER)
+		{
+			int pos = param.num_param;
+			plist_move(player_plist, pos, FALSE);
+			player_queue_song();
+		}
+	}
+	else if (!strcmp(cmd_name, "seek"))
+	{
+		if (param_kind == PARAM_NUMBER)
+		{
+			long long t = param.num_param;
+			player_seek(t, FALSE);
+		}
+	}
+	else if (!strcmp(cmd_name, "clear_playlist"))
+	{
+		plist_clear(player_plist);
+	}
+	else if (!strcmp(cmd_name, "bye"))
+	{
+		return FALSE;
+	}
+	wnd_invalidate(player_wnd);
+	return TRUE;
+} /* End of 'server_conn_exec_command' function */
+
+/* End of 'server_client.c' file */
+

mpfc-2.0.tar.bz2/src/server_client.h Added

@@ -0,0 +1,61 @@
+/******************************************************************
+ * Copyright (C) 2011 by SG Software.
+ *
+ * SG MPFC. Server client interaction.
+ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation; either version 2 
+ * of the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *  
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
+#ifndef __SG_MPFC_SERVER_CLIENT_H__
+#define __SG_MPFC_SERVER_CLIENT_H__
+
+#include <pthread.h>
+#include "mystring.h"
+#include "rd_with_notify.h"
+
+/* Connection descriptor */
+typedef struct tag_server_conn_desc_t
+{
+	int m_socket;
+	pthread_t m_tid;
+	rd_with_notify_t *m_rdwn;
+
+	char m_buf1024;
+	int m_buf_pos;
+	str_t *m_cur_cmd;
+
+	struct tag_server_conn_desc_t *m_next, *m_prev;
+} server_conn_desc_t;
+
+/* Notification codes */
+enum
+{
+	SERVER_NOTIFY_EXIT = 0,
+	SERVER_NOTIFY_PLAYLIST,
+	SERVER_NOTIFY_STATUS,
+};
+
+/* Send a notification to client */
+void server_conn_client_notify(server_conn_desc_t *d, char nv);
+
+/* Execute a command received from client */
+bool_t server_conn_exec_command(server_conn_desc_t *d);
+
+#endif
+
+/* End of 'server_client.h' file */
+

mpfc-1.3.8.1.tar.bz2/src/song.c -> mpfc-2.0.tar.bz2/src/song.c Changed

mpfc-1.3.8.1.tar.bz2/src/song.h -> mpfc-2.0.tar.bz2/src/song.h Changed

mpfc-1.3.8.1.tar.bz2/src/song_info.h -> mpfc-2.0.tar.bz2/src/song_info.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Interface for song info management functions.
- * $Id: song_info.h 229 2005-02-21 18:36:59Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -24,13 +24,12 @@
 #define __SG_MPFC_SONG_INFO_H__
 
 #include "types.h"
-#include "genre_list.h"
 
 /* Some types */
 struct tag_pmng_t;
 
 /* Song information type */
-typedef struct
+typedef struct tag_song_info_t
 {
 	char *m_artist;
 	char *m_name;
@@ -40,8 +39,6 @@
 	char *m_comments;
 	char *m_track;
 	char *m_own_data;
-	char *m_charset;
-	genre_list_t *m_glist;
 	dword m_flags;
 } song_info_t;
 
@@ -59,38 +56,28 @@
 void si_free( song_info_t *si );
 
 /* Set song name */
-void si_set_name( song_info_t *si, char *name );
+void si_set_name( song_info_t *si, const char *name );
 
 /* Set artist name */
-void si_set_artist( song_info_t *si, char *artist );
+void si_set_artist( song_info_t *si, const char *artist );
 
 /* Set album name */
-void si_set_album( song_info_t *si, char *album );
+void si_set_album( song_info_t *si, const char *album );
 
 /* Set year */
-void si_set_year( song_info_t *si, char *year );
+void si_set_year( song_info_t *si, const char *year );
 
 /* Set track */
-void si_set_track( song_info_t *si, char *track );
+void si_set_track( song_info_t *si, const char *track );
 
 /* Set comments */
-void si_set_comments( song_info_t *si, char *comments );
+void si_set_comments( song_info_t *si, const char *comments );
 
 /* Set genre */
-void si_set_genre( song_info_t *si, char *genre );
+void si_set_genre( song_info_t *si, const char *genre );
 
 /* Set own data */
-void si_set_own_data( song_info_t *si, char *own_data );
-
-/* Set charset */
-void si_set_charset( song_info_t *si, char *cs );
-
-/* Convert info fields from one charset to another */
-void si_convert_cs( song_info_t *si, char *new_cs, struct tag_pmng_t *pmng );
-
-/* Convert one field */
-void si_convert_field( song_info_t *si, char **field, char *new_cs, 
-							struct tag_pmng_t *pmng );
+void si_set_own_data( song_info_t *si, const char *own_data );
 
 #endif

mpfc-1.3.8.1.tar.bz2/src/test.c -> mpfc-2.0.tar.bz2/src/test.c Changed

mpfc-1.3.8.1.tar.bz2/src/test.h -> mpfc-2.0.tar.bz2/src/test.h Changed

mpfc-1.3.8.1.tar.bz2/src/types.h -> mpfc-2.0.tar.bz2/src/types.h Changed

mpfc-1.3.8.1.tar.bz2/src/undo.c -> mpfc-2.0.tar.bz2/src/undo.c Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Undo list management functions implementation.
- * $Id: undo.c 229 2005-02-21 18:36:59Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -25,7 +25,6 @@
 #include "types.h"
 #include "player.h"
 #include "plist.h"
-#include "vfs.h"
 #include "undo.h"
 
 /* Initialize undo list */
@@ -218,10 +217,12 @@
 		int i;
 		for ( i = 0; i < data->m_num_files; i ++ )
 		{
-			vfs_file_t desc;
-			vfs_file_desc_init(player_vfs, &desc, data->m_filesi, NULL);
-			plist_add_one_file(player_plist, &desc, NULL, 0,
-					data->m_start_pos + i);
+			struct song_name *sn = &data->m_filesi;
+			song_t *song = (sn->m_filename ?
+					song_new_from_file(sn->m_filename, &sn->m_metadata) :
+					song_new_from_uri(sn->m_fullname, &sn->m_metadata));
+			
+			plist_add_song(player_plist, song, data->m_start_pos + i);
 		}
 		plist_flush_scheduled(player_plist);
 	}
@@ -287,7 +288,13 @@
 			if (t->m_data.m_rem.m_files != NULL)
 			{
 				for ( i = 0; i < t->m_data.m_rem.m_num_files; i ++ )
-					free(t->m_data.m_rem.m_filesi);
+				{
+					struct song_name *sn = &t->m_data.m_rem.m_filesi;
+					if (sn->m_fullname)
+						free(sn->m_fullname);
+					if (sn->m_filename)
+						free(sn->m_filename);
+				}
 				free(t->m_data.m_rem.m_files);
 			}
 			break;

mpfc-1.3.8.1.tar.bz2/src/undo.h -> mpfc-2.0.tar.bz2/src/undo.h Changed

mpfc-1.3.8.1.tar.bz2/src/util.h -> mpfc-2.0.tar.bz2/src/util.h Changed

@@ -2,7 +2,7 @@
  * Copyright (C) 2003 - 2005 by SG Software.
  *
  * SG MPFC. Interface for different utility functions.
- * $Id: util.h 263 2007-09-21 19:41:23Z sg2 $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License 
@@ -25,6 +25,7 @@
 
 #include <stdio.h>
 #include "types.h"
+#include "mystring.h"
 
 /* Write message to log file */
 void util_log( char *format, ... );
@@ -33,10 +34,10 @@
 bool_t util_search_str( char *ptext, char *text );
 
 /* Get file extension */
-char *util_extension( char *name );
+char *util_extension( const char *name );
 
 /* Get file name without full path */
-char *util_short_name( char *name );
+char *util_short_name( const char *name );
 
 /* Delay */
 void util_delay( long s, long ns );
@@ -59,6 +60,9 @@
 /* Get file size */
 int util_get_file_size( char *filename );
 
+/* Wrapper around fgets */
+str_t *util_fgets( FILE *fd );
+
 /* Replace characters */
 void util_replace_char( char *str, char from, char to );
 
@@ -72,15 +76,52 @@
 void util_rem_slashes( char *name );
 
 /* Get file directory name */
-void util_get_dir_name( char *dir, char *filename );
+void util_get_dir_name( char *dir, const char *filename );
 
 /* A safe string copying (writes null to the end) */
 char *util_strncpy( char *dest, char *src, size_t n );
 
 /* Concatenate multiple strings */
-char *util_strcat( char *first, ... );
+char *util_strcat( const char *first, ... );
+
+/* Determine file type (regular or directory) resolving symlinks */
+bool_t util_file_type(char *name, bool_t *is_dir);
+
+/*
+ * UTF-8 helpers
+ */
 
-int msblen( char *str );
+static inline bool_t utf8_is_ascii_byte(char c)
+{
+	/* 0b00xxxxxx */
+	return (c & 0x80) == 0;
+}
+
+static inline bool_t utf8_is_lead_byte(char c)
+{
+	/* 0b11xxxxxx */
+	return (c & 0xC0) == 0xC0;
+}
+
+static inline bool_t utf8_is_cont_byte(char c)
+{
+	/* 0b10xxxxxx */
+	return (c & 0xC0) == 0x80;
+}
+
+static inline bool_t utf8_is_start_byte(char c)
+{
+	return !utf8_is_cont_byte(c);
+}
+
+/* Decode UTF-8 sequence length using the first byte */
+int utf8_decode_num_bytes(char c);
+
+/* Calculate display width of an UTF-8 string */
+int utf8_width( char *str );
+
+/* Check that the locale is in UTF-8 mode */
+bool_t util_check_utf8_mode( void );
 
 #endif

mpfc-2.0.tar.bz2/ylwrap Added

@@ -0,0 +1,247 @@
+#! /bin/sh
+# ylwrap - wrapper for lex/yacc invocations.
+
+scriptversion=2013-01-12.17; # UTC
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+get_dirname ()
+{
+  case $1 in
+    */*|*\\*) printf '%s\n' "$1" | sed -e 's|$\\/$^\\/*$|\1|';;
+    # Otherwise,  we want the empty string (not ".").
+  esac
+}
+
+# guard FILE
+# ----------
+# The CPP macro used to guard inclusion of FILE.
+guard ()
+{
+  printf '%s\n' "$1"                                                    \
+    | sed                                                               \
+        -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'   \
+        -e 's/^ABCDEFGHIJKLMNOPQRSTUVWXYZ/_/g'                        \
+        -e 's/__*/_/g'
+}
+
+# quote_for_sed STRING
+# ----------------------
+# Return STRING (or stdin) quoted to be used as a sed pattern.
+quote_for_sed ()
+{
+  case $# in
+    0) cat;;
+    1) printf '%s\n' "$1";;
+  esac \
+    | sed -e 's|\\.*|\\&|g'
+}
+
+case "$1" in
+  '')
+    echo "$0: No files given.  Try '$0 --help' for more information." 1>&2
+    exit 1
+    ;;
+  --basedir)
+    basedir=$2
+    shift 2
+    ;;
+  -h|--h*)
+    cat <<\EOF
+Usage: ylwrap --help|--version INPUT OUTPUT DESIRED... -- PROGRAM ARGS...
+
+Wrapper for lex/yacc invocations, renaming files as desired.
+
+  INPUT is the input file
+  OUTPUT is one file PROG generates
+  DESIRED is the file we actually want instead of OUTPUT
+  PROGRAM is program to run
+  ARGS are passed to PROG
+
+Any number of OUTPUT,DESIRED pairs may be used.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v|--v*)
+    echo "ylwrap $scriptversion"
+    exit $?
+    ;;
+esac
+
+
+# The input.
+input=$1
+shift
+# We'll later need for a correct munging of "#line" directives.
+input_sub_rx=`get_dirname "$input" | quote_for_sed`
+case $input in
+  \\/* | ?:\\/*)
+    # Absolute path; do nothing.
+    ;;
+  *)
+    # Relative path.  Make it absolute.
+    input=`pwd`/$input
+    ;;
+esac
+input_rx=`get_dirname "$input" | quote_for_sed`
+
+# Since DOS filename conventions don't allow two dots,
+# the DOS version of Bison writes out y_tab.c instead of y.tab.c
+# and y_tab.h instead of y.tab.h. Test to see if this is the case.
+y_tab_nodot=false
+if test -f y_tab.c || test -f y_tab.h; then
+  y_tab_nodot=true
+fi
+
+# The parser itself, the first file, is the destination of the .y.c
+# rule in the Makefile.
+parser=$1
+
+# A sed program to s/FROM/TO/g for all the FROM/TO so that, for
+# instance, we rename #include "y.tab.h" into #include "parse.h"
+# during the conversion from y.tab.c to parse.c.
+sed_fix_filenames=
+
+# Also rename header guards, as Bison 2.7 for instance uses its header
+# guard in its implementation file.
+sed_fix_header_guards=
+
+while test $# -ne 0; do
+  if test x"$1" = x"--"; then
+    shift
+    break
+  fi
+  from=$1
+  # Handle y_tab.c and y_tab.h output by DOS
+  if $y_tab_nodot; then
+    case $from in
+      "y.tab.c") from=y_tab.c;;
+      "y.tab.h") from=y_tab.h;;
+    esac
+  fi
+  shift
+  to=$1
+  shift
+  sed_fix_filenames="${sed_fix_filenames}s|"`quote_for_sed "$from"`"|$to|g;"
+  sed_fix_header_guards="${sed_fix_header_guards}s|"`guard "$from"`"|"`guard "$to"`"|g;"
+done
+
+# The program to run.
+prog=$1
+shift
+# Make any relative path in $prog absolute.
+case $prog in
+  \\/* | ?:\\/*) ;;
+  *\\/*) prog=`pwd`/$prog ;;
+esac
+
+dirname=ylwrap$$
+do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret'
+trap "ret=129; $do_exit" 1
+trap "ret=130; $do_exit" 2
+trap "ret=141; $do_exit" 13
+trap "ret=143; $do_exit" 15
+mkdir $dirname || exit 1
+
+cd $dirname
+
+case $# in
+  0) "$prog" "$input" ;;
+  *) "$prog" "$@" "$input" ;;
+esac
+ret=$?
+
+if test $ret -eq 0; then
+  for from in *
+  do
+    to=`printf '%s\n' "$from" | sed "$sed_fix_filenames"`
+    if test -f "$from"; then
+      # If $2 is an absolute path name, then just use that,
+      # otherwise prepend '../'.
+      case $to in
+        \\/* | ?:\\/*) target=$to;;
+        *) target=../$to;;
+      esac
+
+      # Do not overwrite unchanged header files to avoid useless
+      # recompilations.  Always update the parser itself: it is the
+      # destination of the .y.c rule in the Makefile.  Divert the
+      # output of all other files to a temporary file so we can
+      # compare them to existing versions.
+      if test $from != $parser; then
+        realtarget=$target
+        target=tmp-`printf '%s\n' "$target" | sed 's|.*\\/||g'`
+      fi
+
+      # Munge "#line" or "#" directives.  Don't let the resulting
+      # debug information point at an absolute srcdir.  Use the real
+      # output file name, not yy.lex.c for instance.  Adjust the
+      # include guards too.
+      sed -e "/^#/!b"                           \
+          -e "s|$input_rx|$input_sub_rx|"       \
+          -e "$sed_fix_filenames"               \
+          -e "$sed_fix_header_guards"           \
+        "$from" >"$target" || ret=$?
+
+      # Check whether files must be updated.
+      if test "$from" != "$parser"; then
+        if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+          echo "$to is unchanged"
+          rm -f "$target"
+        else
+          echo "updating $to"
+          mv -f "$target" "$realtarget"
+        fi
+      fi
+    else
+      # A missing file is only an error for the parser.  This is a
+      # blatant hack to let us support using "yacc -d".  If -d is not
+      # specified, don't fail when the header file is "missing".
+      if test "$from" = "$parser"; then
+        ret=1
+      fi
+    fi
+  done
+fi
+
+# Remove the directory.
+cd ..
+rm -rf $dirname
+
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:

mpfc.desktop Changed