summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Config.in1
-rw-r--r--package/cbtt/Makefile52
-rw-r--r--package/cbtt/patches/patch-Makefile61
-rw-r--r--package/cbtt/patches/patch-base64_cpp20
-rw-r--r--package/cbtt/patches/patch-bnbt_h11
-rw-r--r--package/kismet/patches/patch-Makefile_in48
-rw-r--r--package/kismet/patches/patch-configure17
-rw-r--r--package/kismet/patches/patch-ifcontrol_cc6
-rw-r--r--package/kismet/patches/patch-iwcontrol_cc15
-rw-r--r--package/libvirt/Makefile2
-rw-r--r--package/libvorbisidec/Makefile6
-rw-r--r--package/libvorbisidec/patches/autotool.patch36239
-rw-r--r--package/python/Makefile2
13 files changed, 36312 insertions, 168 deletions
diff --git a/package/Config.in b/package/Config.in
index 74e72e4bf..378ec7c2a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -484,7 +484,6 @@ source "package/rdate/Config.in"
endmenu
menu "P2P"
-source "package/cbtt/Config.in"
source "package/ctorrent/Config.in"
source "package/rtorrent/Config.in"
endmenu
diff --git a/package/cbtt/Makefile b/package/cbtt/Makefile
deleted file mode 100644
index 8f8573813..000000000
--- a/package/cbtt/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:= cbtt
-PKG_VERSION:= 20060211
-PKG_RELEASE:= 1
-PKG_MD5SUM:= 19abea2817c49ccc9438e9671c402984
-PKG_DESCR:= Bittorrent tracker
-PKG_SECTION:= net
-PKG_DEPENDS:= zlib
-PKG_BUILDDEP+= zlib
-ifeq (${ADK_COMPILE_CBTT_WITH_UCLIBCXX},y)
-PKG_BUILDDEP+= uclibc++
-endif
-PKG_URL:= http://bnbtusermods.sourceforge.net
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bnbtusermods/}
-
-PKG_HOST_DEPENDS:= !cygwin
-
-DISTFILES:= ${PKG_NAME}80-${PKG_VERSION}-src.tar.gz
-WRKDIST= ${WRKDIR}/${PKG_NAME}80-${PKG_VERSION}-src
-
-include ${TOPDIR}/mk/package.mk
-
-ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y)
-PKG_DEPENDS+= uclibc++
-PKG_DEPENDS_1+= uclibc++
-else
-PKG_DEPENDS+= libstdcxx
-PKG_DEPENDS_1+= libstdcxx
-endif
-
-$(eval $(call PKG_template,CBTT,cbtt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:= manual
-INSTALL_STYLE:= manual
-
-TLDFLAGS+= -shared -L. -lz -lpthread -lm -lgcc
-ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y)
-TLDFLAGS+= -nodefaultlibs -lz -lpthread \
- -luClibc++ -lc -lm -lgcc
-TCFLAGS+= -fno-builtin -nostdinc++
-endif
-TCFLAGS+= -fPIC
-
-do-install:
- ${INSTALL_DIR} ${IDIR_CBTT}/usr/bin
- ${INSTALL_BIN} ${WRKBUILD}/bnbt ${IDIR_CBTT}/usr/bin/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cbtt/patches/patch-Makefile b/package/cbtt/patches/patch-Makefile
deleted file mode 100644
index ddcc23d82..000000000
--- a/package/cbtt/patches/patch-Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
---- cbtt80-20060211-src.orig/Makefile 2006-02-07 18:44:58.000000000 +0100
-+++ cbtt80-20060211-src/Makefile 2010-02-14 09:21:02.000000000 +0100
-@@ -1,10 +1,8 @@
--SHELL = /bin/sh
--SYSTEM = $(shell uname)
--C++ = g++
-+SHELL ?= /bin/sh
-+SYSTEM = Linux
- DFLAGS =
--OFLAGS = -O2 -w
- LFLAGS = -L. -lz
--CFLAGS =
-+CFLAGS ?=
-
- ifeq ($(SYSTEM),Linux)
- DFLAGS += -D__LINUX__
-@@ -29,30 +27,31 @@ LFLAGS = -lresolv -lsocket -lnsl -lpthre
- CFLAGS =
- endif
-
--CFLAGS += $(OFLAGS) $(DFLAGS) -I.
-+LDFLAGS += $(LFLAGS)
-+CFLAGS += $(LDFLAGS) -I.
-
- OBJS = atom.o base64.o bencode.o client.o config.o link.o md5.o server.o sha1.o sort.o tracker_admin.o tracker_comments.o tracker_file.o tracker_index.o tracker_info.o tracker_login.o tracker_signup.o tracker_stats.o tracker_torrent.o tracker_upload.o tracker_users.o util.o
- OBJS_BNBT = bnbt.o tracker.o tracker_announce.o tracker_scrape.o
- OBJS_BNBTMYSQL = bnbt.mysql.o bnbt_mysql.mysql.o tracker.mysql.o tracker_announce.mysql.o tracker_scrape.mysql.o
-
--PROGS = ./bnbt ./bnbtmysql
-+PROGS = ./bnbt
-
--all: $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS)
-+all: $(OBJS) $(OBJS_BNBT) $(PROGS)
-
- ./bnbt: $(OBJS) $(OBJS_BNBT)
-- $(C++) -o ./bnbt $(OBJS) $(OBJS_BNBT) $(LFLAGS)
-+ $(CXX) -o ./bnbt $(OBJS) $(OBJS_BNBT) $(LDFLAGS)
-
- ./bnbtmysql: $(OBJS) $(OBJS_BNBTMYSQL)
-- $(C++) -o ./bnbtmysql $(OBJS) $(OBJS_BNBTMYSQL) $(LFLAGS) -L/usr/lib/mysql -lmysqlclient
-+ $(CXX) -o ./bnbtmysql $(OBJS) $(OBJS_BNBTMYSQL) $(LDFLAGS) -L/usr/lib/mysql -lmysqlclient
-
- clean:
- rm -f $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS)
-
- %.o: %.cpp
-- $(C++) -o $@ $(CFLAGS) -c $<
-+ $(CXX) -o $@ $(CFLAGS) -c $<
-
- %.mysql.o: %.cpp
-- $(C++) -o $@ $(CFLAGS) -DBNBT_MYSQL -c $<
-+ $(CXX) -o $@ $(CFLAGS) -DBNBT_MYSQL -c $<
-
- ./bnbt: $(OBJS) $(OBJS_BNBT)
-
-@@ -91,4 +90,4 @@ bnbt.mysql.o: bnbt.h bnbt_mysql.h config
- bnbt_mysql.mysql.o: bnbt.h bnbt_mysql.h util.h
- tracker.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h config.h md5.h server.h sort.h tracker.h util.h
- tracker_announce.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h link.h tracker.h util.h
--tracker_scrape.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h tracker.h util.h
-+tracker_scrape.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h tracker.h util.h
diff --git a/package/cbtt/patches/patch-base64_cpp b/package/cbtt/patches/patch-base64_cpp
deleted file mode 100644
index d69e6f997..000000000
--- a/package/cbtt/patches/patch-base64_cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cbtt80-20060211-src.orig/base64.cpp 2006-02-07 18:44:58.000000000 +0100
-+++ cbtt80-20060211-src/base64.cpp 2009-06-01 19:00:07.000000000 +0200
-@@ -112,7 +112,7 @@ uchar pBase64[] = {
- /* Returns: bool - True (!0) if the operation was successful. */
- /* False (0) if the operation was unsuccessful. */
- /*---------------------------------------------------------------------------*/
--char *b64decode(const char *s)
-+char *b64decode(char *s)
- {
- int l = strlen(s); // Get length of Base64 string.
- char *b; // Decoding buffer pointers.
-@@ -121,7 +121,6 @@ char *b64decode(const char *s)
- int y = 0;
-
- static // Collating sequence...
-- const // ...independant "===".
- char pPad[] = {0x3d, 0x3d, 0x3d, 0x00};
-
- if (l % 4) // If it's not modulo 4, then it...
diff --git a/package/cbtt/patches/patch-bnbt_h b/package/cbtt/patches/patch-bnbt_h
deleted file mode 100644
index 6169a027c..000000000
--- a/package/cbtt/patches/patch-bnbt_h
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cbtt80-20060211-src.orig/bnbt.h 2006-02-07 18:44:58.000000000 +0100
-+++ cbtt80-20060211-src/bnbt.h 2009-05-09 16:17:54.000000000 +0200
-@@ -5,6 +5,7 @@
- #ifndef BNBT_H
- #define BNBT_H
-
-+#include <string.h>
- #include <stdio.h>
- #include <time.h>
-
diff --git a/package/kismet/patches/patch-Makefile_in b/package/kismet/patches/patch-Makefile_in
index 68c43e813..8b00a86ec 100644
--- a/package/kismet/patches/patch-Makefile_in
+++ b/package/kismet/patches/patch-Makefile_in
@@ -1,5 +1,5 @@
---- kismet-2010-01-R1.orig/Makefile.in 2009-12-14 20:04:11.000000000 +0100
-+++ kismet-2010-01-R1/Makefile.in 2010-02-14 20:19:50.000000000 +0100
+--- kismet-2010-01-R1.orig/Makefile.in Mon Dec 14 20:04:11 2009
++++ kismet-2010-01-R1/Makefile.in Wed Feb 17 22:09:41 2010
@@ -100,25 +100,25 @@ commoninstall:
mkdir -p $(ETC)
mkdir -p $(BIN)
@@ -39,3 +39,47 @@
suidinstall: $(CS)
-groupadd -f $(SUIDGROUP)
+@@ -129,8 +129,8 @@ suidinstall: $(CS)
+ echo "if there have been any changes to the base config you will need"; \
+ echo "to add them to your config file."; \
+ else \
+- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \
+- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \
++ $(INSTALL) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \
++ echo install -m 644 conf/kismet.conf $(ETC)/kismet.conf; \
+ echo "Installed config into $(ETC)/kismet.conf."; \
+ fi
+ @if test -f $(ETC)/kismet_drone.conf; then \
+@@ -138,8 +138,8 @@ suidinstall: $(CS)
+ echo "if there have been any changes to the base config you will need"; \
+ echo "to add them to your config file."; \
+ else \
+- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \
+- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \
++ $(INSTALL) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \
++ echo install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \
+ echo "Installed drone config into $(ETC)/kismet_drone.conf."; \
+ fi
+
+@@ -161,8 +161,8 @@ install: $(PS) $(CS) $(DRONE) $(NC)
+ echo "if there have been any changes to the base config you will need"; \
+ echo "to add them to your config file."; \
+ else \
+- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \
+- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \
++ $(INSTALL) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \
++ echo install -m 644 conf/kismet.conf $(ETC)/kismet.conf; \
+ echo "Installed config into $(ETC)/kismet.conf."; \
+ fi
+ @if test -f $(ETC)/kismet_drone.conf; then \
+@@ -170,8 +170,8 @@ install: $(PS) $(CS) $(DRONE) $(NC)
+ echo "if there have been any changes to the base config you will need"; \
+ echo "to add them to your config file."; \
+ else \
+- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \
+- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \
++ $(INSTALL) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \
++ echo install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \
+ echo "Installed drone config into $(ETC)/kismet_drone.conf."; \
+ fi
+ @echo "Installed kismet into $(BIN)/."
diff --git a/package/kismet/patches/patch-configure b/package/kismet/patches/patch-configure
index 054622165..ce10b60f3 100644
--- a/package/kismet/patches/patch-configure
+++ b/package/kismet/patches/patch-configure
@@ -1,16 +1,18 @@
---- kismet-2010-01-R1.orig/configure 2010-01-08 00:33:30.000000000 +0100
-+++ kismet-2010-01-R1/configure 2010-02-14 20:32:44.000000000 +0100
-@@ -26,7 +26,8 @@ esac
+--- kismet-2010-01-R1.orig/configure Fri Jan 8 00:33:30 2010
++++ kismet-2010-01-R1/configure Wed Feb 17 21:59:01 2010
+@@ -26,9 +26,10 @@ esac
fi
--
+oCC="$CC"
+CC="$CXX"
+-
# PATH needs CR
-@@ -6836,73 +6837,6 @@ else
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+@@ -6836,74 +6837,7 @@ else
$as_echo "yes" >&6; }
fi
@@ -31,7 +33,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
+
-
-int
-main ()
@@ -81,9 +83,10 @@
- foundcxxl="uclibc" CXXLIBS="$CXXLIBS -luClibc++"
-fi
-
-
+-
# Do we use uclibc++?
if test "$foundcxxl"x == "x"; then
+ { $as_echo "$as_me:$LINENO: checking for main in -lstdc++" >&5
@@ -7017,7 +6951,7 @@ fi
diff --git a/package/kismet/patches/patch-ifcontrol_cc b/package/kismet/patches/patch-ifcontrol_cc
index c1606f9d2..a7028eb32 100644
--- a/package/kismet/patches/patch-ifcontrol_cc
+++ b/package/kismet/patches/patch-ifcontrol_cc
@@ -1,6 +1,6 @@
---- kismet-2010-01-R1.orig/ifcontrol.cc 2009-08-31 01:36:19.000000000 +0200
-+++ kismet-2010-01-R1/ifcontrol.cc 2010-02-14 19:59:51.000000000 +0100
-@@ -149,7 +149,7 @@ string Linux_GetSysDrv(const char *in_de
+--- kismet-2010-01-R1.orig/ifcontrol.cc Mon Aug 31 01:36:19 2009
++++ kismet-2010-01-R1/ifcontrol.cc Wed Feb 17 21:59:02 2010
+@@ -149,7 +149,7 @@ string Linux_GetSysDrv(const char *in_dev) {
devlinklen = readlink(devlink.c_str(), devlinktarget, 511);
if (devlinklen > 0) {
devlinktarget[devlinklen] = '\0';
diff --git a/package/kismet/patches/patch-iwcontrol_cc b/package/kismet/patches/patch-iwcontrol_cc
index 01ca44d53..f6e8aac25 100644
--- a/package/kismet/patches/patch-iwcontrol_cc
+++ b/package/kismet/patches/patch-iwcontrol_cc
@@ -1,5 +1,5 @@
---- kismet-2010-01-R1.orig/iwcontrol.cc 2009-08-17 21:51:36.000000000 +0200
-+++ kismet-2010-01-R1/iwcontrol.cc 2010-02-14 22:27:00.000000000 +0100
+--- kismet-2010-01-R1.orig/iwcontrol.cc Mon Aug 17 21:51:36 2009
++++ kismet-2010-01-R1/iwcontrol.cc Wed Feb 17 21:59:02 2010
@@ -32,7 +32,6 @@
#include <linux/if.h>
#include <linux/wireless.h>
@@ -8,7 +8,7 @@
#ifndef rintf
#define rintf(x) (float) rint((double) (x))
-@@ -697,7 +696,7 @@ int Iwconfig_Get_Chanlist(const char *in
+@@ -697,7 +696,7 @@ int Iwconfig_Get_Chanlist(const char *interface, char
return -1;
}
@@ -17,7 +17,7 @@
memset(&wrq, 0, sizeof(struct iwreq));
-@@ -732,7 +731,7 @@ int Iwconfig_Get_Chanlist(const char *in
+@@ -732,7 +731,7 @@ int Iwconfig_Get_Chanlist(const char *interface, char
memcpy((char *) &range, buffer, sizeof(iw_range));
} else {
/* Zero unknown fields */
@@ -26,11 +26,12 @@
/* Initial part unmoved */
memcpy((char *) &range, buffer, iwr15_off(num_channels));
-@@ -798,5 +797,7 @@ int Iwconfig_Get_Chanlist(const char *in
+@@ -797,6 +796,8 @@ int Iwconfig_Get_Chanlist(const char *interface, char
+ close(skfd);
return chan_list->size();
}
-
-+#endif // wireless
+
++#endif // wireless
+
#endif
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index cb4400e45..93ffba48e 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP+= libxml2 gnutls python
PKG_URL:= http://www.libvirt.org/
PKG_SITES:= ftp://libvirt.org/libvirt/
-PKG_HOST_DEPENDS:= !freebsd !netbsd
+PKG_HOST_DEPENDS:= !freebsd !netbsd !openbsd
PKG_TARGET_DEPENDS:= !foxboard
include ${TOPDIR}/mk/package.mk
diff --git a/package/libvorbisidec/Makefile b/package/libvorbisidec/Makefile
index 0e6cc53d8..e3a88a41e 100644
--- a/package/libvorbisidec/Makefile
+++ b/package/libvorbisidec/Makefile
@@ -19,10 +19,12 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBVORBISIDEC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-AUTOTOOL_STYLE:= autogen
+pre-configure:
+ @chmod 755 ${WRKBUILD}/install-sh
post-install:
${INSTALL_DIR} ${IDIR_LIBVORBISIDEC}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libvorbisidec.so* ${IDIR_LIBVORBISIDEC}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libvorbisidec.so* \
+ ${IDIR_LIBVORBISIDEC}/usr/lib/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libvorbisidec/patches/autotool.patch b/package/libvorbisidec/patches/autotool.patch
new file mode 100644
index 000000000..830eb2e92
--- /dev/null
+++ b/package/libvorbisidec/patches/autotool.patch
@@ -0,0 +1,36239 @@
+diff -Nur libvorbisidec-1.0.2+svn15687.orig/aclocal.m4 libvorbisidec-1.0.2+svn15687/aclocal.m4
+--- libvorbisidec-1.0.2+svn15687.orig/aclocal.m4 1970-01-01 01:00:00.000000000 +0100
++++ libvorbisidec-1.0.2+svn15687/aclocal.m4 2010-02-18 19:56:27.748858388 +0100
+@@ -0,0 +1,8929 @@
++# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
++
++# 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.
++
++# 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.
++
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
++[m4_warning([this file was generated for autoconf 2.65.
++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'.])])
++
++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++# 2006, 2007, 2008 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 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 56 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_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
++
++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 "X$cc_temp" | $Xsed -e 's%.*/%%' -e "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
++_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_CMD_RELOAD])dnl
++m4_require([_LT_CHECK_MAGIC_METHOD])dnl
++m4_require([_LT_CMD_OLD_ARCHIVE])dnl
++m4_require([_LT_CMD_GLOBAL_SYMBOLS])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
++_LT_PROG_ECHO_BACKSLASH
++
++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
++
++# Sed substitution that helps us do robust quoting. It backslashifies
++# metacharacters that are still active within double-quoted strings.
++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++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'
++
++# 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_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 "X$][$1" | $Xsed -e "$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 "X$<var>" | $Xsed -e "$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'
++
++# Quote evaled strings.
++for var in lt_decl_all_varnames([[ \
++]], lt_decl_quote_varnames);