optimize ipkg package management

- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
  set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)

more cleanups needed after allmodconfig

18 files changed, 159 insertions, 58468 deletions

diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 0d9eac1a7..fe5e0c47b 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -6,16 +6,18 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		linux-atm
-PKG_VERSION:=		2.4.1
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		84fef49cc39ff2605204246666f65864
-DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
-MASTER_SITES:=		http://ftp.debian.org/debian/pool/main/l/linux-atm/
+PKG_VERSION:=		2.5.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		0b45a0e801fac7093ce4b0cadf419965
+PKG_DESCR:=		ATM library for linux
+PKG_SECTION:=		net
+PKG_URL:=		http://linux-atm.sourceforge.net
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=linux-atm/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LINUX_ATM,linux-atm,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BR2684CTL,br2684ctl,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LINUX_ATM,linux-atm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BR2684CTL,br2684ctl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 BUILD_STYLE=		auto
diff --git a/package/linux-atm/ipkg/br2684ctl.control b/package/linux-atm/ipkg/br2684ctl.control
deleted file mode 100644
index 444dc07ab..000000000
--- a/package/linux-atm/ipkg/br2684ctl.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: br2684ctl
-Priority: optional
-Section: net
-Description: Utility for configuring the ATM RFC2684 bridging
diff --git a/package/linux-atm/ipkg/linux-atm.control b/package/linux-atm/ipkg/linux-atm.control
deleted file mode 100644
index 616471a2b..000000000
--- a/package/linux-atm/ipkg/linux-atm.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: linux-atm
-Priority: optional
-Section: net
-Description: ATM library for linux
diff --git a/package/linux-atm/patches/000-debian_16.patch b/package/linux-atm/patches/000-debian_16.patch
deleted file mode 100644
index 41dc437ca..000000000
--- a/package/linux-atm/patches/000-debian_16.patch
+++ /dev/null
@@ -1,35073 +0,0 @@
---- linux-atm-2.4.1.orig/Makefile.in
-+++ linux-atm-2.4.1/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
- 
- # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
-@@ -100,14 +100,14 @@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
-@@ -225,7 +225,7 @@
- 	  awk '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
- 
- mostlyclean-tags:
- 
-@@ -274,6 +274,11 @@
- 	-rm -rf $(distdir)
- 	mkdir $(distdir)
- 	-chmod 777 $(distdir)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
---- linux-atm-2.4.1.orig/aclocal.m4
-+++ linux-atm-2.4.1/aclocal.m4
-@@ -1,4 +1,4 @@
--dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-+dnl aclocal.m4 generated automatically by aclocal 1.4-p6
- 
- dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
-@@ -43,7 +43,8 @@
- dnl AM_INIT_AUTOMAKE(package,version, [no-define])
- 
- AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_REQUIRE([AC_PROG_INSTALL])
-+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])
- PACKAGE=[$1]
- AC_SUBST(PACKAGE)
- VERSION=[$2]
-@@ -59,13 +60,42 @@
- AC_REQUIRE([AC_ARG_PROGRAM])
- dnl FIXME This is truly gross.
- missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
- AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
- AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
- AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
- AC_REQUIRE([AC_PROG_MAKE_SET])])
- 
-+# Copyright 2002  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 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, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-+
- #
- # Check to make sure that the build environment is sane.
- #
-@@ -130,13 +160,14 @@
- dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
- AC_DEFUN([AM_PROG_LEX],
- [missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
--AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
-+AC_CHECK_PROGS(LEX, flex lex, $missing_dir/missing flex)
- AC_PROG_LEX
- AC_DECL_YYTEXT])
- 
- # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
- 
- # serial 46 AC_PROG_LIBTOOL
-+
- AC_DEFUN([AC_PROG_LIBTOOL],
- [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
- 
-@@ -162,6 +193,8 @@
- AC_REQUIRE([AC_PROG_LD])dnl
- AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
- AC_REQUIRE([AC_PROG_NM])dnl
-+AC_REQUIRE([LT_AC_PROG_SED])dnl
-+
- AC_REQUIRE([AC_PROG_LN_S])dnl
- AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
- AC_REQUIRE([AC_OBJEXT])dnl
-@@ -262,9 +295,30 @@
- 
- ])
- 
-+# AC_LIBTOOL_HEADER_ASSERT
-+# ------------------------
-+AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
-+[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
-+    [lt_cv_func_assert_works],
-+    [case $host in
-+    *-*-solaris*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
-+        case `$CC --version 2>/dev/null` in
-+        [[12]].*) lt_cv_func_assert_works=no ;;
-+        *)        lt_cv_func_assert_works=yes ;;
-+        esac
-+      fi
-+      ;;
-+    esac])
-+
-+if test "x$lt_cv_func_assert_works" = xyes; then
-+  AC_CHECK_HEADERS(assert.h)
-+fi
-+])# AC_LIBTOOL_HEADER_ASSERT
-+
- # _LT_AC_CHECK_DLFCN
- # --------------------
--AC_DEFUN(_LT_AC_CHECK_DLFCN,
-+AC_DEFUN([_LT_AC_CHECK_DLFCN],
- [AC_CHECK_HEADERS(dlfcn.h)
- ])# _LT_AC_CHECK_DLFCN
- 
-@@ -282,10 +336,10 @@
- # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
- 
- # Character class describing NM global symbol codes.
--[symcode='[BCDEGRST]']
-+symcode='[[BCDEGRST]]'
- 
- # Regexp to match symbols that can be accessed directly from C.
--[sympat='\([_A-Za-z][_A-Za-z0-9]*\)']
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
- 
- # Transform the above into a raw symbol and a C symbol.
- symxfrm='\1 \2\3 \3'
-@@ -293,25 +347,32 @@
- # Transform an extracted symbol line into a proper C declaration
- lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
- 
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+
- # Define system-specific variables.
- case $host_os in
- aix*)
--  [symcode='[BCDT]']
-+  symcode='[[BCDT]]'
-   ;;
- cygwin* | mingw* | pw32*)
--  [symcode='[ABCDGISTW]']
-+  symcode='[[ABCDGISTW]]'
-   ;;
- hpux*) # Its linker distinguishes data from code symbols
-   lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[[BCDEGRST]]'
-   ;;
--irix*)
--  [symcode='[BCDEGRST]']
-+osf*)
-+  symcode='[[BCDEGQRST]]'
-   ;;
- solaris* | sysv5*)
--  [symcode='[BDT]']
-+  symcode='[[BDT]]'
-   ;;
- sysv4)
--  [symcode='[DFNSTU]']
-+  symcode='[[DFNSTU]]'
-   ;;
- esac
- 
-@@ -325,14 +386,14 @@
- 
- # If we're using GNU nm, then use its standard symbol codes.
- if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
--  [symcode='[ABCDGISTW]']
-+  symcode='[[ABCDGISTW]]'
- fi
- 
- # Try without a prefix undercore, then with it.
- for ac_symprfx in "" "_"; do
- 
-   # Write the raw and C identifiers.
--[lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"]
-+lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
- 
-   # Check to see that the pipe works correctly.
-   pipe_works=no
-@@ -374,23 +435,23 @@
- 
- 	  cat <<EOF >> conftest.$ac_ext
- #if defined (__STDC__) && __STDC__
--# define lt_ptr_t void *
-+# define lt_ptr void *
- #else
--# define lt_ptr_t char *
-+# define lt_ptr char *
- # define const
- #endif
- 
- /* The mapping between symbol names and symbols. */
- const struct {
-   const char *name;
--  lt_ptr_t address;
-+  lt_ptr address;
- }
--[lt_preloaded_symbols[] =]
-+lt_preloaded_symbols[[]] =
- {
- EOF
--	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext
-+	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
- 	  cat <<\EOF >> conftest.$ac_ext
--  {0, (lt_ptr_t) 0}
-+  {0, (lt_ptr) 0}
- };
- 
- #ifdef __cplusplus
-@@ -403,7 +464,7 @@
- 	  save_CFLAGS="$CFLAGS"
- 	  LIBS="conftstm.$ac_objext"
- 	  CFLAGS="$CFLAGS$no_builtin_flag"
--	  if AC_TRY_EVAL(ac_link) && test -s conftest; then
-+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
- 	    pipe_works=yes
- 	  fi
- 	  LIBS="$save_LIBS"
-@@ -434,10 +495,13 @@
- global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
- if test -z "$lt_cv_sys_global_symbol_pipe"; then
-   global_symbol_to_cdecl=
-+  global_symbol_to_c_name_address=
- else
-   global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
-+  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
- fi
--if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then
-+if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
-+then
-   AC_MSG_RESULT(failed)
- else
-   AC_MSG_RESULT(ok)
-@@ -455,16 +519,17 @@
-     *-DOS) lt_cv_sys_path_separator=';' ;;
-     *)     lt_cv_sys_path_separator=':' ;;
-   esac
-+  PATH_SEPARATOR=$lt_cv_sys_path_separator
- fi
- ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
- 
- # _LT_AC_PROG_ECHO_BACKSLASH
- # --------------------------
- # Add some code to the start of the generated configure script which
--# will find an echo command which doesn;t interpret backslashes.
-+# will find an echo command which doesn't interpret backslashes.
- AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
- [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
--                              [AC_DIVERT_PUSH(NOTICE)])
-+			      [AC_DIVERT_PUSH(NOTICE)])
- _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
- 
- # Check that we are running under the correct shell.
-@@ -530,7 +595,7 @@
-   #
-   # So, first we look for a working echo in the user's PATH.
- 
--  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-   for dir in $PATH /usr/ucb; do
-     if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-        test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-@@ -619,7 +684,7 @@
- # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
- #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
- # ------------------------------------------------------------------
--AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF,
-+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
- [if test "$cross_compiling" = yes; then :
-   [$4]
- else
-@@ -706,7 +771,7 @@
- 
- # AC_LIBTOOL_DLOPEN_SELF
- # -------------------
--AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF,
-+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
- [if test "x$enable_dlopen" != xyes; then
-   enable_dlopen=unknown
-   enable_dlopen_self=unknown
-@@ -728,16 +793,22 @@
-    ;;
- 
-   *)
--    AC_CHECK_LIB(dl, dlopen,  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
--      [AC_CHECK_FUNC(dlopen, lt_cv_dlopen="dlopen",
--        [AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load",
--          [AC_CHECK_LIB(svld, dlopen,
--	    [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
--            [AC_CHECK_LIB(dld, shl_load,
--              [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-+    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="-dld"],
-+	[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="-dld"])
-+	      ])
- 	    ])
--          ])
--        ])
-+	  ])
-+	])
-       ])
-     ;;
-   esac
-@@ -800,10 +871,10 @@
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
- Xsed='sed -e s/^X//'
--[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-+sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g'
- 
- # Same as above, but do not quote variable references.
--[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-+double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g'
- 
- # Sed substitution to delay expansion of an escaped shell variable in a
- # double_quote_subst'ed string.
-@@ -872,8 +943,15 @@
- old_postuninstall_cmds=
- 
- if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  *)
-+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  esac
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
--  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
- fi
- 
- # Allow CC to be a program name with arguments.
-@@ -893,7 +971,7 @@
- AC_MSG_RESULT($objdir)
- 
- 
--AC_ARG_WITH(pic, 
-+AC_ARG_WITH(pic,
- [  --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=default
-@@ -921,7 +999,7 @@
-       # libC (AIX C++ library), which obviously doesn't included in libraries
-       # list by gcc. This cause undefined symbols with -static flags.
-       # This hack allows C programs to be linked with "-static -ldl", but
--      # we not sure about C++ programs.
-+      # not sure about C++ programs.
-       lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
-       ;;
-     amigaos*)
-@@ -930,7 +1008,7 @@
-       # like `-m68040'.
-       lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
-       ;;
--    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-       # PIC is the default for these OSes.
-       ;;
-     darwin* | rhapsody*)
-@@ -956,13 +1034,13 @@
-     # PORTME Check for PIC flags for the system compiler.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-+      lt_cv_prog_cc_wl='-Wl,'
-       # All AIX code is PIC.
-       if test "$host_cpu" = ia64; then
--        # AIX 5 now supports IA64 processor
--        lt_cv_prog_cc_static='-Bstatic'
--        lt_cv_prog_cc_wl='-Wl,'
-+	# AIX 5 now supports IA64 processor
-+	lt_cv_prog_cc_static='-Bstatic'
-       else
--        lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-+	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
- 
-@@ -973,7 +1051,7 @@
-       lt_cv_prog_cc_pic='+Z'
-       ;;
- 
--    irix5* | irix6*)
-+    irix5* | irix6* | nonstopux*)
-       lt_cv_prog_cc_wl='-Wl,'
-       lt_cv_prog_cc_static='-non_shared'
-       # PIC (with -KPIC) is the default.
-@@ -1017,11 +1095,7 @@
-     sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-       lt_cv_prog_cc_pic='-KPIC'
-       lt_cv_prog_cc_static='-Bstatic'
--      if test "x$host_vendor" = xsni; then
--        lt_cv_prog_cc_wl='-LD'
--      else
--        lt_cv_prog_cc_wl='-Wl,'
--      fi
-+      lt_cv_prog_cc_wl='-Wl,'
-       ;;
- 
-     uts4*)
-@@ -1087,7 +1161,7 @@
- # Check for any special shared library compilation flags.
- if test -n "$lt_cv_prog_cc_shlib"; then
-   AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
--  if echo "$old_CC $old_CFLAGS " | [egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]"] >/dev/null; then :
-+  if echo "$old_CC $old_CFLAGS " | egrep -e "[[ 	]]$lt_cv_prog_cc_shlib[[ 	]]" >/dev/null; then :
-   else
-    AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
-     lt_cv_prog_cc_can_build_shared=no
-@@ -1163,6 +1237,8 @@
-   lt_cv_compiler_o_lo=no
-   save_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS -c -o conftest.lo"
-+  save_objext="$ac_objext"
-+  ac_objext=lo
-   AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-@@ -1172,6 +1248,7 @@
-       lt_cv_compiler_o_lo=yes
-     fi
-   ])
-+  ac_objext="$save_objext"
-   CFLAGS="$save_CFLAGS"
-   ])
-   compiler_o_lo=$lt_cv_compiler_o_lo
-@@ -1268,7 +1345,7 @@
- extract_expsyms_cmds=
- 
- case $host_os in
--cygwin* | mingw* | pw32* )
-+cygwin* | mingw* | pw32*)
-   # 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++.
-@@ -1276,7 +1353,9 @@
-     with_gnu_ld=no
-   fi
-   ;;
--
-+openbsd*)
-+  with_gnu_ld=no
-+  ;;
- esac
- 
- ld_shlibs=yes
-@@ -1363,7 +1442,7 @@
-     # can override, but on older systems we have to supply one (in ltdll.c)
-     if test "x$lt_cv_need_dllmain" = "xyes"; then
-       ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
--      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
-+      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
- 	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
-     else
-       ltdll_obj=
-@@ -1376,24 +1455,25 @@
-     # Be careful not to strip the DATA tag left be newer dlltools.
-     export_symbols_cmds="$ltdll_cmds"'
-       $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
--      [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols'
-+      sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
- 
-     # If the export-symbols file already is a .def file (1st line
-     # is EXPORTS), use it as is.
-     # If DATA tags from a recent dlltool are present, honour them!
--    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
--        cp $export_symbols $output_objdir/$soname-def;
-+    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
-+	cp $export_symbols $output_objdir/$soname-def;
-       else
--        echo EXPORTS > $output_objdir/$soname-def;
--        _lt_hint=1;
--        cat $export_symbols | while read symbol; do
--         set dummy \$symbol;
--         case \[$]# in
--           2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
--           *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
--         esac;
--         _lt_hint=`expr 1 + \$_lt_hint`;
--        done;
-+	echo EXPORTS > $output_objdir/$soname-def;
-+	_lt_hint=1;
-+	cat $export_symbols | while read symbol; do
-+	 set dummy \$symbol;
-+	 case \[$]# in
-+	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
-+	   4) echo "   \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
-+	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
-+	 esac;
-+	 _lt_hint=`expr 1 + \$_lt_hint`;
-+	done;
-       fi~
-       '"$ltdll_cmds"'
-       $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-@@ -1488,80 +1568,98 @@
-     ;;
- 
-   aix4* | aix5*)
-+    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*)
-+	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.
- 
-+    hardcode_direct=yes
-     archive_cmds=''
-     hardcode_libdir_separator=':'
-     if test "$GCC" = yes; then
--      collect2name=`${CC} -print-prog-name=collect2`
--      if test -f "$collect2name" && \
--	 strings "$collect2name" | grep resolve_lib_name >/dev/null
--      then
--	# We have reworked collect2
--	hardcode_direct=yes
--      else
--        # We have old collect2
--        hardcode_direct=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
--        hardcode_minus_L=yes
--        hardcode_libdir_flag_spec='-L$libdir'
--        hardcode_libdir_separator=
--      fi
-+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+	collect2name=`${CC} -print-prog-name=collect2`
-+	if test -f "$collect2name" && \
-+	  strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	then
-+	  # We have reworked collect2
-+	  hardcode_direct=yes
-+	else
-+	  # We have old collect2
-+	  hardcode_direct=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
-+	  hardcode_minus_L=yes
-+	  hardcode_libdir_flag_spec='-L$libdir'
-+	  hardcode_libdir_separator=
-+	fi
-+      esac
-+
-       shared_flag='-shared'
-     else
-+      # not using gcc
-       if test "$host_cpu" = ia64; then
--        shared_flag='-G'
-+	shared_flag='${wl}-G'
-       else
--        shared_flag='${wl}-bM:SRE'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag='${wl}-G'
-+	else
-+	  shared_flag='${wl}-bM:SRE'
-+	fi
-       fi
--      hardcode_direct=yes
-     fi
- 
--    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
--      # 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 run time linking.
--      aix_use_runtimelinking=no
--      for ld_flag in $LDFLAGS; do
--        if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
--          aix_use_runtimelinking=yes
--          break
--        fi
--      done
--      exp_sym_flag='-bexport'
--      no_entry_flag='-bnoentry'
--    fi
-     # It seems that -bexpall can do strange things, so it is better to
-     # generate a list of symbols to export.
-     always_export_symbols=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.
-+      allow_undefined_flag='-berok'
-       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
--      allow_undefined_flag=' -Wl,-G'
--      archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-       if test "$host_cpu" = ia64; then
--        hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
--       allow_undefined_flag="-znodefs"
--        archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+	allow_undefined_flag="-z nodefs"
-+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-       else
--        hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
--        # Warning - without using the other run time loading flags, -berok will
--        #           link without error, but may produce a broken library.
--        allow_undefined_flag='${wl}-berok'
--        # This is a bit strange, but is similar to how AIX traditionally builds
--        # it's shared libraries.
--        archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
-+	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
-+	# Warning - without using the other run time loading flags,
-+	# -berok will link without error, but may produce a broken library.
-+	allow_undefined_flag='${wl}-berok'
-+	# This is a bit strange, but is similar to how AIX traditionally builds
-+	# it's shared libraries.
-+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-     fi
-     ;;
-@@ -1593,11 +1691,19 @@
-     ;;
- 
-   darwin* | rhapsody*)
--    allow_undefined_flag='-undefined suppress'
-+    case "$host_os" in
-+    rhapsody* | darwin1.[[012]])
-+      allow_undefined_flag='-undefined suppress'
-+      ;;
-+    *) # Darwin 1.3 on
-+      allow_undefined_flag='-flat_namespace -undefined suppress'
-+      ;;
-+    esac
-     # FIXME: Relying on posixy $() will cause problems for
-     #        cross-compilation, but unfortunately the echo tests do not
--    #        yet detect zsh echo's removal of \ escapes.
--    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
-+    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-+    #	     `"' quotes if we put them in here... so don't!
-+    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
-     # We need to add '_' to the symbols in $export_symbols first
-     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-     hardcode_direct=yes
-@@ -1649,13 +1755,14 @@
-     export_dynamic_flag_spec='${wl}-E'
-     ;;
- 
--  irix5* | irix6*)
-+  irix5* | irix6* | nonstopux*)
-     if test "$GCC" = yes; then
-       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-     else
-       archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='-rpath $libdir'
-     fi
--    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-     hardcode_libdir_separator=:
-     link_all_deplibs=yes
-     ;;
-@@ -1672,7 +1779,7 @@
-     ;;
- 
-   newsos6)
--    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-     hardcode_direct=yes
-     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-     hardcode_libdir_separator=:
-@@ -1680,10 +1787,24 @@
-     ;;
- 
-   openbsd*)
--    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_libdir_flag_spec='-R$libdir'
-     hardcode_direct=yes
-     hardcode_shlibpath_var=no
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then