Imported Upstream version 3.3.3
[debian/amanda] / perl / Makefile.in
index 8fd004230a74eab2b5f5c3fd812cd54f75c376ab..d4db7c1f1bafceed0fb72a4c8310de6de826a8ea 100644 (file)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 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.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
 @SET_MAKE@
 
 # vim:ft=automake
-# Copyright (c) 2007,2008,2009 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
+# 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
 # scripts in this directory.
 
 # vim:ft=automake
-# Copyright (c) 2007,2008,2009 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
+# 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
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \  ]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -145,8 +164,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 @WANT_SERVER_TRUE@     Amanda/Tapelist.c Amanda/Tapelist.pm \
 @WANT_SERVER_TRUE@     Amanda/Disklist.c Amanda/Disklist.pm
 
-# PACKAGE: Amanda::Interactive
-@WANT_SERVER_TRUE@am__append_6 = Amanda/Interactive.pm
+# PACKAGE: Amanda::ScanInventory
+
+# PACKAGE: Amanda::Interactivity
+@WANT_SERVER_TRUE@am__append_6 = Amanda/ScanInventory.pm \
+@WANT_SERVER_TRUE@     Amanda/Interactivity.pm
 
 # PACKAGE: Amanda::Changer
 
@@ -187,10 +209,10 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/macro-archive/docbook-xslt.m4 \
        $(top_srcdir)/config/macro-archive/xsltproc.m4 \
        $(top_srcdir)/config/amanda/amplot.m4 \
+       $(top_srcdir)/config/amanda/as_needed.m4 \
        $(top_srcdir)/config/amanda/bsd-security.m4 \
        $(top_srcdir)/config/amanda/bsdtcp-security.m4 \
        $(top_srcdir)/config/amanda/bsdudp-security.m4 \
-       $(top_srcdir)/config/amanda/changer.m4 \
        $(top_srcdir)/config/amanda/components.m4 \
        $(top_srcdir)/config/amanda/compress.m4 \
        $(top_srcdir)/config/amanda/config.m4 \
@@ -218,7 +240,6 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/amanda/readline.m4 \
        $(top_srcdir)/config/amanda/rsh-security.m4 \
        $(top_srcdir)/config/amanda/s3-device.m4 \
-       $(top_srcdir)/config/amanda/shmem.m4 \
        $(top_srcdir)/config/amanda/socklen_t_equiv.m4 \
        $(top_srcdir)/config/amanda/ssh-security.m4 \
        $(top_srcdir)/config/amanda/summary.m4 \
@@ -231,10 +252,14 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/gnulib/00gnulib.m4 \
        $(top_srcdir)/config/gnulib/alloca.m4 \
        $(top_srcdir)/config/gnulib/arpa_inet_h.m4 \
+       $(top_srcdir)/config/gnulib/asm-underscore.m4 \
        $(top_srcdir)/config/gnulib/base64.m4 \
        $(top_srcdir)/config/gnulib/btowc.m4 \
+       $(top_srcdir)/config/gnulib/dos.m4 \
+       $(top_srcdir)/config/gnulib/environ.m4 \
        $(top_srcdir)/config/gnulib/errno_h.m4 \
        $(top_srcdir)/config/gnulib/extensions.m4 \
+       $(top_srcdir)/config/gnulib/fcntl-o.m4 \
        $(top_srcdir)/config/gnulib/float_h.m4 \
        $(top_srcdir)/config/gnulib/fseeko.m4 \
        $(top_srcdir)/config/gnulib/fsusage.m4 \
@@ -248,7 +273,9 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/gnulib/hostent.m4 \
        $(top_srcdir)/config/gnulib/include_next.m4 \
        $(top_srcdir)/config/gnulib/inet_ntop.m4 \
+       $(top_srcdir)/config/gnulib/inet_pton.m4 \
        $(top_srcdir)/config/gnulib/intmax_t.m4 \
+       $(top_srcdir)/config/gnulib/langinfo_h.m4 \
        $(top_srcdir)/config/gnulib/localcharset.m4 \
        $(top_srcdir)/config/gnulib/locale-fr.m4 \
        $(top_srcdir)/config/gnulib/locale-ja.m4 \
@@ -261,10 +288,13 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/gnulib/mbrtowc.m4 \
        $(top_srcdir)/config/gnulib/mbsinit.m4 \
        $(top_srcdir)/config/gnulib/mbstate_t.m4 \
+       $(top_srcdir)/config/gnulib/memchr.m4 \
        $(top_srcdir)/config/gnulib/mkdtemp.m4 \
+       $(top_srcdir)/config/gnulib/mmap-anon.m4 \
        $(top_srcdir)/config/gnulib/multiarch.m4 \
        $(top_srcdir)/config/gnulib/netdb_h.m4 \
        $(top_srcdir)/config/gnulib/netinet_in_h.m4 \
+       $(top_srcdir)/config/gnulib/nl_langinfo.m4 \
        $(top_srcdir)/config/gnulib/onceonly.m4 \
        $(top_srcdir)/config/gnulib/physmem.m4 \
        $(top_srcdir)/config/gnulib/printf.m4 \
@@ -276,21 +306,25 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/gnulib/socklen.m4 \
        $(top_srcdir)/config/gnulib/sockpfaf.m4 \
        $(top_srcdir)/config/gnulib/ssize_t.m4 \
+       $(top_srcdir)/config/gnulib/stat.m4 \
        $(top_srcdir)/config/gnulib/stdbool.m4 \
+       $(top_srcdir)/config/gnulib/stddef_h.m4 \
        $(top_srcdir)/config/gnulib/stdint.m4 \
        $(top_srcdir)/config/gnulib/stdio_h.m4 \
        $(top_srcdir)/config/gnulib/stdlib_h.m4 \
+       $(top_srcdir)/config/gnulib/string_h.m4 \
        $(top_srcdir)/config/gnulib/sys_socket_h.m4 \
        $(top_srcdir)/config/gnulib/sys_stat_h.m4 \
        $(top_srcdir)/config/gnulib/sys_time_h.m4 \
        $(top_srcdir)/config/gnulib/tempname.m4 \
        $(top_srcdir)/config/gnulib/threadlib.m4 \
+       $(top_srcdir)/config/gnulib/time_h.m4 \
        $(top_srcdir)/config/gnulib/unistd_h.m4 \
        $(top_srcdir)/config/gnulib/vasnprintf.m4 \
-       $(top_srcdir)/config/gnulib/visibility.m4 \
-       $(top_srcdir)/config/gnulib/wchar.m4 \
+       $(top_srcdir)/config/gnulib/warn-on-use.m4 \
+       $(top_srcdir)/config/gnulib/wchar_h.m4 \
        $(top_srcdir)/config/gnulib/wcrtomb.m4 \
-       $(top_srcdir)/config/gnulib/wctype.m4 \
+       $(top_srcdir)/config/gnulib/wctype_h.m4 \
        $(top_srcdir)/config/gnulib/write.m4 \
        $(top_srcdir)/config/gettext-macros/codeset.m4 \
        $(top_srcdir)/config/gettext-macros/gettext.m4 \
@@ -312,7 +346,8 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/ltoptions.m4 \
        $(top_srcdir)/config/ltsugar.m4 \
        $(top_srcdir)/config/ltversion.m4 \
-       $(top_srcdir)/config/lt~obsolete.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/config/lt~obsolete.m4 $(top_srcdir)/FULL_VERSION \
+       $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -340,34 +375,40 @@ am__nobase_list = $(am__nobase_strip_setup); \
 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)$(amlibdir)" \
-       "$(DESTDIR)$(libApplicationdir)" "$(DESTDIR)$(libArchivedir)" \
-       "$(DESTDIR)$(libCmdlinedir)" "$(DESTDIR)$(libConfigdir)" \
-       "$(DESTDIR)$(libDebugdir)" "$(DESTDIR)$(libDevicedir)" \
-       "$(DESTDIR)$(libDisklistdir)" "$(DESTDIR)$(libFeaturedir)" \
-       "$(DESTDIR)$(libHeaderdir)" "$(DESTDIR)$(libIPCBinarydir)" \
-       "$(DESTDIR)$(libLogfiledir)" "$(DESTDIR)$(libMainLoopdir)" \
-       "$(DESTDIR)$(libNDMPdir)" "$(DESTDIR)$(libTapelistdir)" \
-       "$(DESTDIR)$(libTestsdir)" "$(DESTDIR)$(libUtildir)" \
-       "$(DESTDIR)$(libXferdir)" "$(DESTDIR)$(libXferServerdir)" \
-       "$(DESTDIR)$(Amandadir)" "$(DESTDIR)$(AmandaApplicationdir)" \
-       "$(DESTDIR)$(AmandaChangerdir)" \
+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)$(libApplicationdir)" \
+       "$(DESTDIR)$(libArchivedir)" "$(DESTDIR)$(libCmdlinedir)" \
+       "$(DESTDIR)$(libConfigdir)" "$(DESTDIR)$(libDebugdir)" \
+       "$(DESTDIR)$(libDevicedir)" "$(DESTDIR)$(libDisklistdir)" \
+       "$(DESTDIR)$(libFeaturedir)" "$(DESTDIR)$(libHeaderdir)" \
+       "$(DESTDIR)$(libIPCBinarydir)" "$(DESTDIR)$(libLogfiledir)" \
+       "$(DESTDIR)$(libMainLoopdir)" "$(DESTDIR)$(libNDMPdir)" \
+       "$(DESTDIR)$(libTapelistdir)" "$(DESTDIR)$(libTestsdir)" \
+       "$(DESTDIR)$(libUtildir)" "$(DESTDIR)$(libXferdir)" \
+       "$(DESTDIR)$(libXferServerdir)" "$(DESTDIR)$(Amandadir)" \
+       "$(DESTDIR)$(AmandaApplicationdir)" \
+       "$(DESTDIR)$(AmandaChangerdir)" "$(DESTDIR)$(AmandaConfigdir)" \
        "$(DESTDIR)$(AmandaCurinfodir)" "$(DESTDIR)$(AmandaIPCdir)" \
-       "$(DESTDIR)$(AmandaInteractivedir)" \
+       "$(DESTDIR)$(AmandaInteractivitydir)" \
        "$(DESTDIR)$(AmandaRecoverydir)" \
        "$(DESTDIR)$(AmandaReportdir)" "$(DESTDIR)$(AmandaTaperdir)" \
        "$(DESTDIR)$(AmandaTaperScandir)" "$(DESTDIR)$(Amanda_DBdir)"
-LTLIBRARIES = $(amlib_LTLIBRARIES) $(libApplication_LTLIBRARIES) \
-       $(libArchive_LTLIBRARIES) $(libCmdline_LTLIBRARIES) \
-       $(libConfig_LTLIBRARIES) $(libDebug_LTLIBRARIES) \
-       $(libDevice_LTLIBRARIES) $(libDisklist_LTLIBRARIES) \
-       $(libFeature_LTLIBRARIES) $(libHeader_LTLIBRARIES) \
-       $(libIPCBinary_LTLIBRARIES) $(libLogfile_LTLIBRARIES) \
-       $(libMainLoop_LTLIBRARIES) $(libNDMP_LTLIBRARIES) \
-       $(libTapelist_LTLIBRARIES) $(libTests_LTLIBRARIES) \
-       $(libUtil_LTLIBRARIES) $(libXfer_LTLIBRARIES) \
-       $(libXferServer_LTLIBRARIES)
-@WANT_CLIENT_TRUE@libApplication_la_DEPENDENCIES = libamglue.la \
+LTLIBRARIES = $(libApplication_LTLIBRARIES) $(libArchive_LTLIBRARIES) \
+       $(libCmdline_LTLIBRARIES) $(libConfig_LTLIBRARIES) \
+       $(libDebug_LTLIBRARIES) $(libDevice_LTLIBRARIES) \
+       $(libDisklist_LTLIBRARIES) $(libFeature_LTLIBRARIES) \
+       $(libHeader_LTLIBRARIES) $(libIPCBinary_LTLIBRARIES) \
+       $(libLogfile_LTLIBRARIES) $(libMainLoop_LTLIBRARIES) \
+       $(libNDMP_LTLIBRARIES) $(libTapelist_LTLIBRARIES) \
+       $(libTests_LTLIBRARIES) $(libUtil_LTLIBRARIES) \
+       $(libXfer_LTLIBRARIES) $(libXferServer_LTLIBRARIES)
+@WANT_CLIENT_TRUE@libApplication_la_DEPENDENCIES =  \
+@WANT_CLIENT_TRUE@     amglue/libamglue.la \
 @WANT_CLIENT_TRUE@     $(top_builddir)/client-src/libamclient.la
 am__libApplication_la_SOURCES_DIST = Amanda/Application.c \
        amglue/amglue.swg amglue/constants.swg amglue/directtcp.swg \
@@ -382,7 +423,7 @@ libApplication_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(libApplication_la_LDFLAGS) $(LDFLAGS) -o $@
 @WANT_CLIENT_TRUE@am_libApplication_la_rpath = -rpath \
 @WANT_CLIENT_TRUE@     $(libApplicationdir)
-libArchive_la_DEPENDENCIES = libamglue.la \
+libArchive_la_DEPENDENCIES = amglue/libamglue.la \
        $(top_builddir)/amar-src/libamar.la \
        $(top_builddir)/common-src/libamanda.la
 am_libArchive_la_OBJECTS = Archive.lo $(am__objects_1)
@@ -390,14 +431,14 @@ libArchive_la_OBJECTS = $(am_libArchive_la_OBJECTS)
 libArchive_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libArchive_la_LDFLAGS) $(LDFLAGS) -o $@
-libBinary_la_DEPENDENCIES = libamglue.la \
+libBinary_la_DEPENDENCIES = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 am_libBinary_la_OBJECTS = Binary.lo $(am__objects_1)
 libBinary_la_OBJECTS = $(am_libBinary_la_OBJECTS)
 libBinary_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libBinary_la_LDFLAGS) $(LDFLAGS) -o $@
-@WANT_SERVER_TRUE@libCmdline_la_DEPENDENCIES = libamglue.la \
+@WANT_SERVER_TRUE@libCmdline_la_DEPENDENCIES = amglue/libamglue.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/server-src/libamserver.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/common-src/libamanda.la
 am__libCmdline_la_SOURCES_DIST = Amanda/Cmdline.c amglue/amglue.swg \
@@ -411,21 +452,21 @@ libCmdline_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libCmdline_la_LDFLAGS) $(LDFLAGS) -o $@
 @WANT_SERVER_TRUE@am_libCmdline_la_rpath = -rpath $(libCmdlinedir)
-libConfig_la_DEPENDENCIES = libamglue.la \
+libConfig_la_DEPENDENCIES = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 am_libConfig_la_OBJECTS = Config.lo $(am__objects_1)
 libConfig_la_OBJECTS = $(am_libConfig_la_OBJECTS)
 libConfig_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libConfig_la_LDFLAGS) $(LDFLAGS) -o $@
-libDebug_la_DEPENDENCIES = libamglue.la \
+libDebug_la_DEPENDENCIES = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 am_libDebug_la_OBJECTS = Debug.lo $(am__objects_1)
 libDebug_la_OBJECTS = $(am_libDebug_la_OBJECTS)
 libDebug_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libDebug_la_LDFLAGS) $(LDFLAGS) -o $@
-@WANT_SERVER_TRUE@libDevice_la_DEPENDENCIES = libamglue.la \
+@WANT_SERVER_TRUE@libDevice_la_DEPENDENCIES = amglue/libamglue.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/device-src/libamdevice.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/common-src/libamanda.la
 am__libDevice_la_SOURCES_DIST = Amanda/Device.c amglue/amglue.swg \
@@ -438,7 +479,7 @@ libDevice_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libDevice_la_LDFLAGS) $(LDFLAGS) -o $@
 @WANT_SERVER_TRUE@am_libDevice_la_rpath = -rpath $(libDevicedir)
-@WANT_SERVER_TRUE@libDisklist_la_DEPENDENCIES = libamglue.la \
+@WANT_SERVER_TRUE@libDisklist_la_DEPENDENCIES = amglue/libamglue.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/server-src/libamserver.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/common-src/libamanda.la
 am__libDisklist_la_SOURCES_DIST = Amanda/Disklist.c amglue/amglue.swg \
@@ -452,21 +493,21 @@ libDisklist_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libDisklist_la_LDFLAGS) $(LDFLAGS) -o $@
 @WANT_SERVER_TRUE@am_libDisklist_la_rpath = -rpath $(libDisklistdir)
-libFeature_la_DEPENDENCIES = libamglue.la \
+libFeature_la_DEPENDENCIES = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 am_libFeature_la_OBJECTS = Feature.lo $(am__objects_1)
 libFeature_la_OBJECTS = $(am_libFeature_la_OBJECTS)
 libFeature_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libFeature_la_LDFLAGS) $(LDFLAGS) -o $@
-libHeader_la_DEPENDENCIES = libamglue.la \
+libHeader_la_DEPENDENCIES = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 am_libHeader_la_OBJECTS = Header.lo $(am__objects_1)
 libHeader_la_OBJECTS = $(am_libHeader_la_OBJECTS)
 libHeader_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libHeader_la_LDFLAGS) $(LDFLAGS) -o $@
-@WANT_SERVER_TRUE@libLogfile_la_DEPENDENCIES = libamglue.la \
+@WANT_SERVER_TRUE@libLogfile_la_DEPENDENCIES = amglue/libamglue.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/server-src/libamserver.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/common-src/libamanda.la
 am__libLogfile_la_SOURCES_DIST = Amanda/Logfile.c amglue/amglue.swg \
@@ -480,14 +521,14 @@ libLogfile_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libLogfile_la_LDFLAGS) $(LDFLAGS) -o $@
 @WANT_SERVER_TRUE@am_libLogfile_la_rpath = -rpath $(libLogfiledir)
-libMainLoop_la_DEPENDENCIES = libamglue.la \
+libMainLoop_la_DEPENDENCIES = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 am_libMainLoop_la_OBJECTS = MainLoop.lo $(am__objects_1)
 libMainLoop_la_OBJECTS = $(am_libMainLoop_la_OBJECTS)
 libMainLoop_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libMainLoop_la_LDFLAGS) $(LDFLAGS) -o $@
-@WANT_NDMP_TRUE@libNDMP_la_DEPENDENCIES = libamglue.la \
+@WANT_NDMP_TRUE@libNDMP_la_DEPENDENCIES = amglue/libamglue.la \
 @WANT_NDMP_TRUE@       $(top_builddir)/common-src/libamanda.la \
 @WANT_NDMP_TRUE@       $(top_builddir)/ndmp-src/libndmlib.la
 am__libNDMP_la_SOURCES_DIST = Amanda/NDMP.c amglue/amglue.swg \
@@ -500,7 +541,7 @@ libNDMP_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libNDMP_la_LDFLAGS) $(LDFLAGS) -o $@
 @WANT_NDMP_TRUE@am_libNDMP_la_rpath = -rpath $(libNDMPdir)
-@WANT_SERVER_TRUE@libTapelist_la_DEPENDENCIES = libamglue.la \
+@WANT_SERVER_TRUE@libTapelist_la_DEPENDENCIES = amglue/libamglue.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/server-src/libamserver.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/common-src/libamanda.la
 am__libTapelist_la_SOURCES_DIST = Amanda/Tapelist.c amglue/amglue.swg \
@@ -514,28 +555,28 @@ libTapelist_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libTapelist_la_LDFLAGS) $(LDFLAGS) -o $@
 @WANT_SERVER_TRUE@am_libTapelist_la_rpath = -rpath $(libTapelistdir)
-libTests_la_DEPENDENCIES = libamglue.la \
+libTests_la_DEPENDENCIES = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 am_libTests_la_OBJECTS = Tests.lo $(am__objects_1)
 libTests_la_OBJECTS = $(am_libTests_la_OBJECTS)
 libTests_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libTests_la_LDFLAGS) $(LDFLAGS) -o $@
-libUtil_la_DEPENDENCIES = libamglue.la \
+libUtil_la_DEPENDENCIES = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 am_libUtil_la_OBJECTS = Util.lo $(am__objects_1)
 libUtil_la_OBJECTS = $(am_libUtil_la_OBJECTS)
 libUtil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libUtil_la_LDFLAGS) $(LDFLAGS) -o $@
-libXfer_la_DEPENDENCIES = libamglue.la \
+libXfer_la_DEPENDENCIES = amglue/libamglue.la \
        $(top_builddir)/xfer-src/libamxfer.la
 am_libXfer_la_OBJECTS = Xfer.lo $(am__objects_1)
 libXfer_la_OBJECTS = $(am_libXfer_la_OBJECTS)
 libXfer_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libXfer_la_LDFLAGS) $(LDFLAGS) -o $@
-@WANT_SERVER_TRUE@libXferServer_la_DEPENDENCIES = libamglue.la \
+@WANT_SERVER_TRUE@libXferServer_la_DEPENDENCIES = amglue/libamglue.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/server-src/libamserver.la
 am__libXferServer_la_SOURCES_DIST = Amanda/XferServer.c \
        amglue/amglue.swg amglue/constants.swg amglue/directtcp.swg \
@@ -549,13 +590,6 @@ libXferServer_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(libXferServer_la_LDFLAGS) $(LDFLAGS) -o $@
 @WANT_SERVER_TRUE@am_libXferServer_la_rpath = -rpath \
 @WANT_SERVER_TRUE@     $(libXferServerdir)
-libamglue_la_DEPENDENCIES = $(top_builddir)/xfer-src/libamxfer.la
-am_libamglue_la_OBJECTS = ghashtable.lo gerror.lo bigint.lo source.lo \
-       objwrap.lo xferwrap.lo
-libamglue_la_OBJECTS = $(am_libamglue_la_OBJECTS)
-libamglue_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(libamglue_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -577,8 +611,7 @@ SOURCES = $(libApplication_la_SOURCES) $(libArchive_la_SOURCES) \
        $(libLogfile_la_SOURCES) $(libMainLoop_la_SOURCES) \
        $(libNDMP_la_SOURCES) $(libTapelist_la_SOURCES) \
        $(libTests_la_SOURCES) $(libUtil_la_SOURCES) \
-       $(libXfer_la_SOURCES) $(libXferServer_la_SOURCES) \
-       $(libamglue_la_SOURCES)
+       $(libXfer_la_SOURCES) $(libXferServer_la_SOURCES)
 DIST_SOURCES = $(am__libApplication_la_SOURCES_DIST) \
        $(libArchive_la_SOURCES) $(libBinary_la_SOURCES) \
        $(am__libCmdline_la_SOURCES_DIST) $(libConfig_la_SOURCES) \
@@ -588,15 +621,58 @@ DIST_SOURCES = $(am__libApplication_la_SOURCES_DIST) \
        $(libMainLoop_la_SOURCES) $(am__libNDMP_la_SOURCES_DIST) \
        $(am__libTapelist_la_SOURCES_DIST) $(libTests_la_SOURCES) \
        $(libUtil_la_SOURCES) $(libXfer_la_SOURCES) \
-       $(am__libXferServer_la_SOURCES_DIST) $(libamglue_la_SOURCES)
+       $(am__libXferServer_la_SOURCES_DIST)
+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
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(Amanda_DATA) $(AmandaApplication_DATA) $(AmandaChanger_DATA) \
-       $(AmandaCurinfo_DATA) $(AmandaIPC_DATA) \
-       $(AmandaInteractive_DATA) $(AmandaRecovery_DATA) \
+       $(AmandaConfig_DATA) $(AmandaCurinfo_DATA) $(AmandaIPC_DATA) \
+       $(AmandaInteractivity_DATA) $(AmandaRecovery_DATA) \
        $(AmandaReport_DATA) $(AmandaTaper_DATA) \
        $(AmandaTaperScan_DATA) $(Amanda_DB_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
 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@
 AIX_BACKUP = @AIX_BACKUP@
 ALLOCA = @ALLOCA@
@@ -618,8 +694,9 @@ AMTAR = @AMTAR@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 APPLICATION_DIR = @APPLICATION_DIR@
 AR = @AR@
-ARPA_INET_H = @ARPA_INET_H@
+ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 ASSERTIONS = @ASSERTIONS@
+AS_NEEDED_FLAGS = @AS_NEEDED_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -638,10 +715,7 @@ CAT = @CAT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CHECK_USERID = @CHECK_USERID@
-CHIO = @CHIO@
-CHS = @CHS@
 CLIENT_LOGIN = @CLIENT_LOGIN@
 CLIENT_SCRIPTS_OPT = @CLIENT_SCRIPTS_OPT@
 COMPRESS = @COMPRESS@
@@ -653,7 +727,6 @@ CONFIG_CLOBBER_MY_CONFIG = @CONFIG_CLOBBER_MY_CONFIG@
 CONFIG_DIR = @CONFIG_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CURL_CONFIG = @CURL_CONFIG@
 CYGPATH_W = @CYGPATH_W@
 DD = @DD@
 DEFAULT_AMANDATES_FILE = @DEFAULT_AMANDATES_FILE@
@@ -664,6 +737,7 @@ DEFAULT_TAPE_DEVICE = @DEFAULT_TAPE_DEVICE@
 DEFAULT_TAPE_SERVER = @DEFAULT_TAPE_SERVER@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DOC_BUILD_DATE = @DOC_BUILD_DATE@
 DSYMUTIL = @DSYMUTIL@
 DUMP = @DUMP@
@@ -697,78 +771,133 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIB_ACCEPT = @GNULIB_ACCEPT@
+GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
 GNULIB_ATOLL = @GNULIB_ATOLL@
 GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
 GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
 GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
 GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
+GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
 GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
+GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
+GNULIB_FPURGE = @GNULIB_FPURGE@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
+GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
 GNULIB_FTELLO = @GNULIB_FTELLO@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
 GNULIB_FWRITE = @GNULIB_FWRITE@
 GNULIB_GETADDRINFO = @GNULIB_GETADDRINFO@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
 GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
+GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
 GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
 GNULIB_GETLINE = @GNULIB_GETLINE@
 GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
+GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
 GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
 GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
 GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
+GNULIB_GRANTPT = @GNULIB_GRANTPT@
 GNULIB_INET_NTOP = @GNULIB_INET_NTOP@
 GNULIB_INET_PTON = @GNULIB_INET_PTON@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
+GNULIB_LINKAT = @GNULIB_LINKAT@
 GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
 GNULIB_MBRLEN = @GNULIB_MBRLEN@
 GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
+GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
+GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
+GNULIB_MBSCHR = @GNULIB_MBSCHR@
+GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
 GNULIB_MBSINIT = @GNULIB_MBSINIT@
+GNULIB_MBSLEN = @GNULIB_MBSLEN@
+GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
+GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
 GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
+GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
+GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
+GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
 GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
+GNULIB_MBSSEP = @GNULIB_MBSSEP@
+GNULIB_MBSSPN = @GNULIB_MBSSPN@
+GNULIB_MBSSTR = @GNULIB_MBSSTR@
+GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
+GNULIB_MEMCHR = @GNULIB_MEMCHR@
+GNULIB_MEMMEM = @GNULIB_MEMMEM@
+GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
+GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
+GNULIB_MKDIRAT = @GNULIB_MKDIRAT@
 GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKFIFO = @GNULIB_MKFIFO@
+GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@
+GNULIB_MKNOD = @GNULIB_MKNOD@
+GNULIB_MKNODAT = @GNULIB_MKNODAT@
+GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@
+GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
 GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
+GNULIB_MKTIME = @GNULIB_MKTIME@
+GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
+GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_PERROR = @GNULIB_PERROR@
+GNULIB_PIPE2 = @GNULIB_PIPE2@
+GNULIB_POPEN = @GNULIB_POPEN@
+GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
+GNULIB_PTSNAME = @GNULIB_PTSNAME@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
+GNULIB_PWRITE = @GNULIB_PWRITE@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
+GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
 GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_REALPATH = @GNULIB_REALPATH@
 GNULIB_RECV = @GNULIB_RECV@
 GNULIB_RECVFROM = @GNULIB_RECVFROM@
+GNULIB_REMOVE = @GNULIB_REMOVE@
+GNULIB_RENAME = @GNULIB_RENAME@
+GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
+GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
 GNULIB_SEND = @GNULIB_SEND@
 GNULIB_SENDTO = @GNULIB_SENDTO@
@@ -779,12 +908,41 @@ GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
 GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
+GNULIB_STAT = @GNULIB_STAT@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
+GNULIB_STPCPY = @GNULIB_STPCPY@
+GNULIB_STPNCPY = @GNULIB_STPNCPY@
+GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
+GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
+GNULIB_STRDUP = @GNULIB_STRDUP@
+GNULIB_STRERROR = @GNULIB_STRERROR@
+GNULIB_STRNCAT = @GNULIB_STRNCAT@
+GNULIB_STRNDUP = @GNULIB_STRNDUP@
+GNULIB_STRNLEN = @GNULIB_STRNLEN@
+GNULIB_STRPBRK = @GNULIB_STRPBRK@
+GNULIB_STRPTIME = @GNULIB_STRPTIME@
+GNULIB_STRSEP = @GNULIB_STRSEP@
+GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
+GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
+GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
+GNULIB_SYMLINK = @GNULIB_SYMLINK@
+GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
+GNULIB_TIMEGM = @GNULIB_TIMEGM@
+GNULIB_TIME_R = @GNULIB_TIME_R@
+GNULIB_TMPFILE = @GNULIB_TMPFILE@
+GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
+GNULIB_UNLINK = @GNULIB_UNLINK@
+GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
+GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
 GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_USLEEP = @GNULIB_USLEEP@
+GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@
 GNULIB_VASPRINTF = @GNULIB_VASPRINTF@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
@@ -799,17 +957,21 @@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
 GNULIB_WCTOB = @GNULIB_WCTOB@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
 GNULIB_WRITE = @GNULIB_WRITE@
+GNULIB__EXIT = @GNULIB__EXIT@
 GNUPLOT = @GNUPLOT@
 GNUTAR = @GNUTAR@
 GNUTAR_LISTED_INCREMENTAL_DIR = @GNUTAR_LISTED_INCREMENTAL_DIR@
 GOBJECT_QUERY = @GOBJECT_QUERY@
 GREP = @GREP@
 GZIP = @GZIP@
+HAVE_ACCEPT4 = @HAVE_ACCEPT4@
 HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
-HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
+HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
+HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
 HAVE_DECL_FREEADDRINFO = @HAVE_DECL_FREEADDRINFO@
 HAVE_DECL_GAI_STRERROR = @HAVE_DECL_GAI_STRERROR@
 HAVE_DECL_GETADDRINFO = @HAVE_DECL_GETADDRINFO@
@@ -818,60 +980,119 @@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETNAMEINFO = @HAVE_DECL_GETNAMEINFO@
+HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
+HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
 HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@
 HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@
+HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
+HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
+HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
+HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
+HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
+HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
+HAVE_DUP3 = @HAVE_DUP3@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
+HAVE_FACCESSAT = @HAVE_FACCESSAT@
+HAVE_FCHDIR = @HAVE_FCHDIR@
+HAVE_FCHMODAT = @HAVE_FCHMODAT@
+HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FSEEKO = @HAVE_FSEEKO@
+HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
 HAVE_FTELLO = @HAVE_FTELLO@
 HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_FUTIMENS = @HAVE_FUTIMENS@
 HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
+HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
+HAVE_GETLOGIN = @HAVE_GETLOGIN@
+HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
-HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@
+HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
+HAVE_GRANTPT = @HAVE_GRANTPT@
 HAVE_GZIP = @HAVE_GZIP@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_ISWBLANK = @HAVE_ISWBLANK@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
+HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
+HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
 HAVE_LCHMOD = @HAVE_LCHMOD@
+HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LINK = @HAVE_LINK@
+HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
-HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
+HAVE_MBSLEN = @HAVE_MBSLEN@
 HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
 HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MEMCHR = @HAVE_MEMCHR@
+HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MKDIRAT = @HAVE_MKDIRAT@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_MKFIFO = @HAVE_MKFIFO@
+HAVE_MKFIFOAT = @HAVE_MKFIFOAT@
+HAVE_MKNOD = @HAVE_MKNOD@
+HAVE_MKNODAT = @HAVE_MKNODAT@
+HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
+HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
+HAVE_MKSTEMP = @HAVE_MKSTEMP@
+HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
+HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NETDB_H = @HAVE_NETDB_H@
 HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@
+HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OS_H = @HAVE_OS_H@
+HAVE_PIPE2 = @HAVE_PIPE2@
+HAVE_PREAD = @HAVE_PREAD@
+HAVE_PTSNAME = @HAVE_PTSNAME@
+HAVE_PWRITE = @HAVE_PWRITE@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
+HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
 HAVE_READLINK = @HAVE_READLINK@
-HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
+HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALPATH = @HAVE_REALPATH@
+HAVE_RENAMEAT = @HAVE_RENAMEAT@
 HAVE_RPMATCH = @HAVE_RPMATCH@
+HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SETENV = @HAVE_SETENV@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
 HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
 HAVE_SLEEP = @HAVE_SLEEP@
 HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STPCPY = @HAVE_STPCPY@
+HAVE_STPNCPY = @HAVE_STPNCPY@
+HAVE_STRCASESTR = @HAVE_STRCASESTR@
+HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
+HAVE_STRPBRK = @HAVE_STRPBRK@
+HAVE_STRPTIME = @HAVE_STRPTIME@
+HAVE_STRSEP = @HAVE_STRSEP@
 HAVE_STRTOD = @HAVE_STRTOD@
 HAVE_STRTOLL = @HAVE_STRTOLL@
 HAVE_STRTOULL = @HAVE_STRTOULL@
 HAVE_STRUCT_ADDRINFO = @HAVE_STRUCT_ADDRINFO@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
+HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
+HAVE_SYMLINK = @HAVE_SYMLINK@
+HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
 HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
@@ -879,13 +1100,19 @@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNLINKAT = @HAVE_UNLINKAT@
+HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
 HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_USLEEP = @HAVE_USLEEP@
+HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
 HAVE_VASPRINTF = @HAVE_VASPRINTF@
 HAVE_VDPRINTF = @HAVE_VDPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCHAR_T = @HAVE_WCHAR_T@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
@@ -894,9 +1121,12 @@ HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
 HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE__BOOL = @HAVE__BOOL@
+HAVE__EXIT = @HAVE__EXIT@
 HOSTENT_LIB = @HOSTENT_LIB@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
+INET_NTOP_LIB = @INET_NTOP_LIB@
+INET_PTON_LIB = @INET_PTON_LIB@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -932,7 +1162,6 @@ LOCKING = @LOCKING@
 LOW_TCPPORTRANGE = @LOW_TCPPORTRANGE@
 LPR = @LPR@
 LPRFLAG = @LPRFLAG@
-LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
@@ -941,32 +1170,60 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAILER = @MAILER@
 MAKEINFO = @MAKEINFO@
-MCUTIL = @MCUTIL@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MOUNT = @MOUNT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MT = @MT@
 MTX = @MTX@
 MT_FILE_FLAG = @MT_FILE_FLAG@
-NETDB_H = @NETDB_H@
+NC = @NC@
+NC6 = @NC6@
+NETCAT = @NETCAT@
 NETINET_IN_H = @NETINET_IN_H@
 NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@
+NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@
+NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
+NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
+NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
+NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
+NEXT_AS_FIRST_DIRECTIVE_NETDB_H = @NEXT_AS_FIRST_DIRECTIVE_NETDB_H@
+NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H = @NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H@
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
+NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@
+NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
+NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
+NEXT_GETOPT_H = @NEXT_GETOPT_H@
+NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_NETDB_H = @NEXT_NETDB_H@
 NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@
+NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
 NEXT_STDIO_H = @NEXT_STDIO_H@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
 NEXT_WCHAR_H = @NEXT_WCHAR_H@
 NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -975,6 +1232,7 @@ 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@
 PCAT = @PCAT@
@@ -982,52 +1240,110 @@ PERL = @PERL@
 PERLEXTLIBS = @PERLEXTLIBS@
 PERL_INC = @PERL_INC@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PS = @PS@
 PS_ARGUMENT = @PS_ARGUMENT@
 PS_ARGUMENT_ARGS = @PS_ARGUMENT_ARGS@
+PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REPLACE_BTOWC = @REPLACE_BTOWC@
+REPLACE_CALLOC = @REPLACE_CALLOC@
+REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
-REPLACE_FCHDIR = @REPLACE_FCHDIR@
+REPLACE_DUP = @REPLACE_DUP@
+REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
+REPLACE_FPURGE = @REPLACE_FPURGE@
 REPLACE_FREOPEN = @REPLACE_FREOPEN@
 REPLACE_FSEEK = @REPLACE_FSEEK@
 REPLACE_FSEEKO = @REPLACE_FSEEKO@
+REPLACE_FSTAT = @REPLACE_FSTAT@
+REPLACE_FSTATAT = @REPLACE_FSTATAT@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
+REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETDELIM = @REPLACE_GETDELIM@
+REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LINK = @REPLACE_LINK@
+REPLACE_LINKAT = @REPLACE_LINKAT@
+REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
+REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MEMCHR = @REPLACE_MEMCHR@
+REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKDIR = @REPLACE_MKDIR@
+REPLACE_MKFIFO = @REPLACE_MKFIFO@
+REPLACE_MKNOD = @REPLACE_MKNOD@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_MKTIME = @REPLACE_MKTIME@
+REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
+REPLACE_NULL = @REPLACE_NULL@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_PERROR = @REPLACE_PERROR@
+REPLACE_POPEN = @REPLACE_POPEN@
+REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_PWRITE = @REPLACE_PWRITE@
+REPLACE_READLINK = @REPLACE_READLINK@
+REPLACE_REALLOC = @REPLACE_REALLOC@
+REPLACE_REALPATH = @REPLACE_REALPATH@
+REPLACE_REMOVE = @REPLACE_REMOVE@
+REPLACE_RENAME = @REPLACE_RENAME@
+REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
+REPLACE_RMDIR = @REPLACE_RMDIR@
+REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
+REPLACE_STAT = @REPLACE_STAT@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
+REPLACE_STPNCPY = @REPLACE_STPNCPY@
+REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
+REPLACE_STRDUP = @REPLACE_STRDUP@
+REPLACE_STRERROR = @REPLACE_STRERROR@
+REPLACE_STRNCAT = @REPLACE_STRNCAT@
+REPLACE_STRNDUP = @REPLACE_STRNDUP@
+REPLACE_STRNLEN = @REPLACE_STRNLEN@
+REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
+REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_SYMLINK = @REPLACE_SYMLINK@
+REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TMPFILE = @REPLACE_TMPFILE@
+REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_UNLINK = @REPLACE_UNLINK@
+REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
+REPLACE_UNSETENV = @REPLACE_UNSETENV@
+REPLACE_USLEEP = @REPLACE_USLEEP@
+REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@
 REPLACE_VASPRINTF = @REPLACE_VASPRINTF@
 REPLACE_VDPRINTF = @REPLACE_VDPRINTF@
 REPLACE_VFPRINTF = @REPLACE_VFPRINTF@
@@ -1035,6 +1351,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
 REPLACE_WCTOB = @REPLACE_WCTOB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
@@ -1057,19 +1374,24 @@ SSH = @SSH@
 SSH_SECURITY = @SSH_SECURITY@
 STAR = @STAR@
 STDBOOL_H = @STDBOOL_H@
+STDDEF_H = @STDDEF_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
+SUNTAR = @SUNTAR@
 SVN = @SVN@
 SWIG = @SWIG@
 SWIG_LIB = @SWIG_LIB@
-SYS_SOCKET_H = @SYS_SOCKET_H@
-SYS_STAT_H = @SYS_STAT_H@
-SYS_TIME_H = @SYS_TIME_H@
+SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 TCPPORTRANGE = @TCPPORTRANGE@
+TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 UDPPORTRANGE = @UDPPORTRANGE@
+UMOUNT = @UMOUNT@
+UNAME = @UNAME@
 UNCOMPRESS_OPT = @UNCOMPRESS_OPT@
 UNCOMPRESS_PATH = @UNCOMPRESS_PATH@
+UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
+UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
 USE_AMANDAHOSTS = @USE_AMANDAHOSTS@
 USE_NLS = @USE_NLS@
 USE_RUNDUMP = @USE_RUNDUMP@
@@ -1079,13 +1401,10 @@ VERSION_COMMENT = @VERSION_COMMENT@
 VERSION_MAJOR = @VERSION_MAJOR@
 VERSION_MINOR = @VERSION_MINOR@
 VERSION_PATCH = @VERSION_PATCH@
-VOID_UNSETENV = @VOID_UNSETENV@
 VRESTORE = @VRESTORE@
 VXDUMP = @VXDUMP@
 VXRESTORE = @VXRESTORE@
-WCHAR_H = @WCHAR_H@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WCTYPE_H = @WCTYPE_H@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XFSDUMP = @XFSDUMP@
 XFSRESTORE = @XFSRESTORE@
@@ -1101,6 +1420,7 @@ 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@
@@ -1129,6 +1449,7 @@ gl_LIBOBJS = @gl_LIBOBJS@
 gl_LTLIBOBJS = @gl_LTLIBOBJS@
 gltests_LIBOBJS = @gltests_LIBOBJS@
 gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
+gltests_WITNESS = @gltests_WITNESS@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -1142,7 +1463,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -1159,31 +1479,31 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUFFIXES = 
-EXTRA_DIST = $(libamglue_la_SOURCES) $(AMGLUE_SWG) Amanda/Archive.swg \
-       Amanda/Archive.pm Amanda/Archive.pod Amanda/Process.pm \
-       Amanda/Device.swg Amanda/Device.pm Amanda/Device.pod \
-       Amanda/Logfile.swg Amanda/Logfile.pm Amanda/Logfile.pod \
-       Amanda/Cmdline.swg Amanda/Cmdline.pm Amanda/Cmdline.pod \
-       Amanda/Tapelist.swg Amanda/Tapelist.pm Amanda/Tapelist.pod \
-       Amanda/Disklist.swg Amanda/Disklist.pm Amanda/Disklist.pod \
-       Amanda/Feature.swg Amanda/Feature.pm Amanda/Feature.pod \
-       Amanda/Interactive.pm Amanda/ClientService.pm \
-       $(AmandaInteractive_DATA) Amanda/Changer.pm \
+EXTRA_DIST = $(AMGLUE_SWG) Amanda/Archive.swg Amanda/Archive.pm \
+       Amanda/Archive.pod Amanda/Process.pm Amanda/Device.swg \
+       Amanda/Device.pm Amanda/Device.pod Amanda/Logfile.swg \
+       Amanda/Logfile.pm Amanda/Logfile.pod Amanda/Cmdline.swg \
+       Amanda/Cmdline.pm Amanda/Cmdline.pod Amanda/Tapelist.swg \
+       Amanda/Tapelist.pm Amanda/Tapelist.pod Amanda/Disklist.swg \
+       Amanda/Disklist.pm Amanda/Disklist.pod Amanda/Feature.swg \
+       Amanda/Feature.pm Amanda/Feature.pod Amanda/ScanInventory.pm \
+       Amanda/Interactivity.pm Amanda/ClientService.pm \
+       $(AmandaInteractivity_DATA) Amanda/Changer.pm \
        $(AmandaChanger_DATA) Amanda/Curinfo.pm $(AmandaCurinfo_DATA) \
        $(AmandaRecovery_DATA) $(AmandaTaper_DATA) \
        $(AmandaTaperScan_DATA) Amanda/DB/Catalog.pm Amanda/Xfer.swg \
        Amanda/Xfer.pm Amanda/Xfer.pod $(am__append_12) \
        $(am__append_15) Amanda/BigIntCompat.pm Amanda/Debug.swg \
        Amanda/Debug.pm Amanda/Debug.pod Amanda/Config.swg \
-       Amanda/Config.pm Amanda/Config.pod Amanda/Util.swg \
-       Amanda/Util.pm Amanda/Util.pod Amanda/Header.swg \
-       Amanda/Header.pm Amanda/Header.pod Amanda/Tests.swg \
-       Amanda/Tests.pm Amanda/Tests.pod Amanda/MainLoop.swg \
-       Amanda/MainLoop.pm Amanda/MainLoop.pod $(AmandaIPC_DATA) \
-       Amanda/IPC/Binary.swg Amanda/IPC/Binary.pm \
+       Amanda/Config.pm Amanda/Config.pod $(AmandaConfig_DATA) \
+       Amanda/Util.swg Amanda/Util.pm Amanda/Util.pod \
+       Amanda/Header.swg Amanda/Header.pm Amanda/Header.pod \
+       Amanda/Tests.swg Amanda/Tests.pm Amanda/Tests.pod \
+       Amanda/MainLoop.swg Amanda/MainLoop.pm Amanda/MainLoop.pod \
+       $(AmandaIPC_DATA) Amanda/IPC/Binary.swg Amanda/IPC/Binary.pm \
        Amanda/IPC/Binary.pod Amanda/Paths.pm.in \
-       Amanda/Constants.pm.in Amanda/Script_App.pm Amanda/Holding.pm \
-       Amanda/Application.swg Amanda/Application.pm \
+       Amanda/Constants.pm.in Amanda/Script_App.pm Amanda/Extract.pm \
+       Amanda/Holding.pm Amanda/Application.swg Amanda/Application.pm \
        Amanda/Application.pod Amanda/Script.pm \
        Amanda/Application/Zfs.pm
 BUILT_SOURCES = 
@@ -1204,6 +1524,9 @@ MAINTAINERCLEANFILES = Amanda/Archive.c Amanda/Archive.pm \
        Amanda/MainLoop.c Amanda/MainLoop.pm Amanda/IPC/Binary.c \
        Amanda/IPC/Binary.pm $(am__append_18)
 
+# build amglue *first*
+SUBDIRS = amglue .
+
 # add the SWIG symbol to avoid conflicts with perl definitions.
 # $AMANDA_WARNING_CFLAGS is omitted because SWIG-generated files tend
 # to trigger warnings.
@@ -1217,22 +1540,6 @@ INCLUDES = -I$(top_builddir)/common-src -I$(top_srcdir)/common-src \
        -I$(top_srcdir)/gnulib -I$(top_srcdir)/ndmp-src $(PERL_INC) \
        $(am__append_1) $(am__append_2) $(am__append_3)
 
-# (amplot has a conditional, but doesn't have any header files)
-amlib_LTLIBRARIES = libamglue.la
-libamglue_la_SOURCES = \
-       amglue/ghashtable.c \
-       amglue/gerror.c \
-       amglue/bigint.c \
-       amglue/source.c \
-       amglue/objwrap.c \
-       amglue/xferwrap.c \
-       amglue/amglue.h
-
-libamglue_la_LDFLAGS = $(PERL_EXT_LDFLAGS) -release $(VERSION)
-libamglue_la_LIBADD = \
-       $(top_builddir)/xfer-src/libamxfer.la
-
-
 # Tell libtool to not bother versioning the libs we build, since perl won't
 # pay attention to such things, anyway.
 
@@ -1240,7 +1547,7 @@ libamglue_la_LIBADD = \
 # threading library
 PERL_EXT_LDFLAGS = -avoid-version -shared $(PERLEXTLIBS)
 
-# list our SWIG libraries.
+# list our SWIG libraries; these are %included from .swg files
 AMGLUE_SWG = amglue/amglue.swg \
        amglue/amglue.swg \
        amglue/constants.swg \
@@ -1266,8 +1573,8 @@ SWIG_OPTIONS = -perl5 -proxy -DSWIG_TYPE_TABLE=SWIG_TYPES_Amanda -I$(srcdir)
 # PM_FILES should contain the .pm files from which the HTML should
 # be geneated.  This is just the concatenation of foo_DATA for all $(foodir)
 # into which perl modules are installed.
-PM_FILES = $(Amanda_DATA) $(am__append_9) $(AmandaIPC_DATA) \
-       $(am__append_19)
+PM_FILES = $(Amanda_DATA) $(AmandaInteractivity_DATA) $(am__append_9) \
+       $(AmandaIPC_DATA) $(am__append_19)
 Amandadir = $(amperldir)/Amanda
 
 # PACKAGE: Amanda::Process
@@ -1282,6 +1589,8 @@ Amandadir = $(amperldir)/Amanda
 
 # PACKAGE: Amanda::Script_App
 
+# PACKAGE: Amanda::Extract
+
 # PACKAGE: Amanda::Script
 Amanda_DATA = Amanda/Archive.pm Amanda/Process.pm $(am__append_4) \
        Amanda/Feature.pm $(am__append_6) Amanda/ClientService.pm \
@@ -1289,15 +1598,15 @@ Amanda_DATA = Amanda/Archive.pm Amanda/Process.pm $(am__append_4) \
        $(am__append_13) Amanda/BigIntCompat.pm Amanda/Debug.pm \
        Amanda/Config.pm Amanda/Util.pm Amanda/Header.pm \
        Amanda/Tests.pm Amanda/MainLoop.pm Amanda/Paths.pm \
-       Amanda/Constants.pm Amanda/Script_App.pm $(am__append_16) \
-       $(am__append_17) Amanda/Script.pm
+       Amanda/Constants.pm Amanda/Script_App.pm Amanda/Extract.pm \
+       $(am__append_16) $(am__append_17) Amanda/Script.pm
 
 # PACKAGE: Amanda::Archive
 libArchivedir = $(amperldir)/auto/Amanda/Archive
 libArchive_LTLIBRARIES = libArchive.la
 libArchive_la_SOURCES = Amanda/Archive.c $(AMGLUE_SWG)
 libArchive_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-libArchive_la_LIBADD = libamglue.la \
+libArchive_la_LIBADD = amglue/libamglue.la \
        $(top_builddir)/amar-src/libamar.la \
        $(top_builddir)/common-src/libamanda.la
 
@@ -1307,7 +1616,7 @@ libArchive_la_LIBADD = libamglue.la \
 @WANT_SERVER_TRUE@libDevice_LTLIBRARIES = libDevice.la
 @WANT_SERVER_TRUE@libDevice_la_SOURCES = Amanda/Device.c $(AMGLUE_SWG)
 @WANT_SERVER_TRUE@libDevice_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-@WANT_SERVER_TRUE@libDevice_la_LIBADD = libamglue.la \
+@WANT_SERVER_TRUE@libDevice_la_LIBADD = amglue/libamglue.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/device-src/libamdevice.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/common-src/libamanda.la
 
@@ -1317,7 +1626,7 @@ libArchive_la_LIBADD = libamglue.la \
 @WANT_SERVER_TRUE@libLogfile_LTLIBRARIES = libLogfile.la
 @WANT_SERVER_TRUE@libLogfile_la_SOURCES = Amanda/Logfile.c $(AMGLUE_SWG)
 @WANT_SERVER_TRUE@libLogfile_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-@WANT_SERVER_TRUE@libLogfile_la_LIBADD = libamglue.la \
+@WANT_SERVER_TRUE@libLogfile_la_LIBADD = amglue/libamglue.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/server-src/libamserver.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/common-src/libamanda.la
 
@@ -1327,7 +1636,7 @@ libArchive_la_LIBADD = libamglue.la \
 @WANT_SERVER_TRUE@libCmdline_LTLIBRARIES = libCmdline.la
 @WANT_SERVER_TRUE@libCmdline_la_SOURCES = Amanda/Cmdline.c $(AMGLUE_SWG)
 @WANT_SERVER_TRUE@libCmdline_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-@WANT_SERVER_TRUE@libCmdline_la_LIBADD = libamglue.la \
+@WANT_SERVER_TRUE@libCmdline_la_LIBADD = amglue/libamglue.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/server-src/libamserver.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/common-src/libamanda.la
 
@@ -1337,7 +1646,7 @@ libArchive_la_LIBADD = libamglue.la \
 @WANT_SERVER_TRUE@libTapelist_LTLIBRARIES = libTapelist.la
 @WANT_SERVER_TRUE@libTapelist_la_SOURCES = Amanda/Tapelist.c $(AMGLUE_SWG)
 @WANT_SERVER_TRUE@libTapelist_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-@WANT_SERVER_TRUE@libTapelist_la_LIBADD = libamglue.la \
+@WANT_SERVER_TRUE@libTapelist_la_LIBADD = amglue/libamglue.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/server-src/libamserver.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/common-src/libamanda.la
 
@@ -1347,7 +1656,7 @@ libArchive_la_LIBADD = libamglue.la \
 @WANT_SERVER_TRUE@libDisklist_LTLIBRARIES = libDisklist.la
 @WANT_SERVER_TRUE@libDisklist_la_SOURCES = Amanda/Disklist.c $(AMGLUE_SWG)
 @WANT_SERVER_TRUE@libDisklist_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-@WANT_SERVER_TRUE@libDisklist_la_LIBADD = libamglue.la \
+@WANT_SERVER_TRUE@libDisklist_la_LIBADD = amglue/libamglue.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/server-src/libamserver.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/common-src/libamanda.la
 
@@ -1355,19 +1664,23 @@ libFeaturedir = $(amperldir)/auto/Amanda/Feature
 libFeature_LTLIBRARIES = libFeature.la
 libFeature_la_SOURCES = Amanda/Feature.c $(AMGLUE_SWG)
 libFeature_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-libFeature_la_LIBADD = libamglue.la \
+libFeature_la_LIBADD = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 
 
-# PACKAGE: Amanda::Interactive::*
-@WANT_SERVER_TRUE@AmandaInteractivedir = $(amperldir)/Amanda/Interactive
-@WANT_SERVER_TRUE@AmandaInteractive_DATA = \
-@WANT_SERVER_TRUE@     Amanda/Interactive/stdin.pm
+# PACKAGE: Amanda::Interactivity::*
+@WANT_SERVER_TRUE@AmandaInteractivitydir = $(amperldir)/Amanda/Interactivity
+@WANT_SERVER_TRUE@AmandaInteractivity_DATA = \
+@WANT_SERVER_TRUE@     Amanda/Interactivity/email.pm \
+@WANT_SERVER_TRUE@     Amanda/Interactivity/stdin.pm \
+@WANT_SERVER_TRUE@     Amanda/Interactivity/tty.pm \
+@WANT_SERVER_TRUE@     Amanda/Interactivity/tty_email.pm
 
 
 # PACKAGE: Amanda::Changer::*
 @WANT_SERVER_TRUE@AmandaChangerdir = $(amperldir)/Amanda/Changer
-@WANT_SERVER_TRUE@AmandaChanger_DATA = Amanda/Changer/compat.pm \
+@WANT_SERVER_TRUE@AmandaChanger_DATA = Amanda/Changer/aggregate.pm \
+@WANT_SERVER_TRUE@     Amanda/Changer/compat.pm \
 @WANT_SERVER_TRUE@     Amanda/Changer/disk.pm \
 @WANT_SERVER_TRUE@     Amanda/Changer/multi.pm \
 @WANT_SERVER_TRUE@     Amanda/Changer/null.pm \
@@ -1392,13 +1705,18 @@ libFeature_la_LIBADD = libamglue.la \
 # PACKAGE: Amanda::Taper::*
 @WANT_SERVER_TRUE@AmandaTaperdir = $(amperldir)/Amanda/Taper
 @WANT_SERVER_TRUE@AmandaTaper_DATA = \
+@WANT_SERVER_TRUE@     Amanda/Taper/Controller.pm \
+@WANT_SERVER_TRUE@     Amanda/Taper/Protocol.pm \
 @WANT_SERVER_TRUE@     Amanda/Taper/Scan.pm \
-@WANT_SERVER_TRUE@     Amanda/Taper/Scribe.pm
+@WANT_SERVER_TRUE@     Amanda/Taper/Scribe.pm \
+@WANT_SERVER_TRUE@     Amanda/Taper/Worker.pm
 
 
 # PACKAGE: Amanda::Taper::Scan::*
 @WANT_SERVER_TRUE@AmandaTaperScandir = $(amperldir)/Amanda/Taper/Scan
 @WANT_SERVER_TRUE@AmandaTaperScan_DATA = \
+@WANT_SERVER_TRUE@     Amanda/Taper/Scan/lexical.pm \
+@WANT_SERVER_TRUE@     Amanda/Taper/Scan/oldest.pm \
 @WANT_SERVER_TRUE@     Amanda/Taper/Scan/traditional.pm
 
 
@@ -1413,7 +1731,7 @@ libXferdir = $(amperldir)/auto/Amanda/Xfer
 libXfer_LTLIBRARIES = libXfer.la
 libXfer_la_SOURCES = Amanda/Xfer.c $(AMGLUE_SWG)
 libXfer_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-libXfer_la_LIBADD = libamglue.la \
+libXfer_la_LIBADD = amglue/libamglue.la \
        $(top_builddir)/xfer-src/libamxfer.la
 
 
@@ -1422,7 +1740,7 @@ libXfer_la_LIBADD = libamglue.la \
 @WANT_NDMP_TRUE@libNDMP_LTLIBRARIES = libNDMP.la
 @WANT_NDMP_TRUE@libNDMP_la_SOURCES = Amanda/NDMP.c $(AMGLUE_SWG)
 @WANT_NDMP_TRUE@libNDMP_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-@WANT_NDMP_TRUE@libNDMP_la_LIBADD = libamglue.la \
+@WANT_NDMP_TRUE@libNDMP_la_LIBADD = amglue/libamglue.la \
 @WANT_NDMP_TRUE@       $(top_builddir)/common-src/libamanda.la \
 @WANT_NDMP_TRUE@       $(top_builddir)/ndmp-src/libndmlib.la
 
@@ -1432,7 +1750,7 @@ libXfer_la_LIBADD = libamglue.la \
 @WANT_SERVER_TRUE@libXferServer_LTLIBRARIES = libXferServer.la
 @WANT_SERVER_TRUE@libXferServer_la_SOURCES = Amanda/XferServer.c $(AMGLUE_SWG)
 @WANT_SERVER_TRUE@libXferServer_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-@WANT_SERVER_TRUE@libXferServer_la_LIBADD = libamglue.la \
+@WANT_SERVER_TRUE@libXferServer_la_LIBADD = amglue/libamglue.la \
 @WANT_SERVER_TRUE@     $(top_builddir)/server-src/libamserver.la
 
 
@@ -1449,7 +1767,7 @@ libDebugdir = $(amperldir)/auto/Amanda/Debug
 libDebug_LTLIBRARIES = libDebug.la
 libDebug_la_SOURCES = Amanda/Debug.c $(AMGLUE_SWG)
 libDebug_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-libDebug_la_LIBADD = libamglue.la \
+libDebug_la_LIBADD = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 
 
@@ -1458,16 +1776,20 @@ libConfigdir = $(amperldir)/auto/Amanda/Config
 libConfig_LTLIBRARIES = libConfig.la
 libConfig_la_SOURCES = Amanda/Config.c $(AMGLUE_SWG)
 libConfig_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-libConfig_la_LIBADD = libamglue.la \
+libConfig_la_LIBADD = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 
 
+# PACKAGE: Amanda::Config::*
+AmandaConfigdir = $(amperldir)/Amanda/Config
+AmandaConfig_DATA = Amanda/Config/FoldingHash.pm
+
 # PACKAGE: Amanda::Util
 libUtildir = $(amperldir)/auto/Amanda/Util
 libUtil_LTLIBRARIES = libUtil.la
 libUtil_la_SOURCES = Amanda/Util.c $(AMGLUE_SWG)
 libUtil_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-libUtil_la_LIBADD = libamglue.la \
+libUtil_la_LIBADD = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 
 
@@ -1476,7 +1798,7 @@ libHeaderdir = $(amperldir)/auto/Amanda/Header
 libHeader_LTLIBRARIES = libHeader.la
 libHeader_la_SOURCES = Amanda/Header.c $(AMGLUE_SWG)
 libHeader_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-libHeader_la_LIBADD = libamglue.la \
+libHeader_la_LIBADD = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 
 
@@ -1485,7 +1807,7 @@ libTestsdir = $(amperldir)/auto/Amanda/Tests
 libTests_LTLIBRARIES = libTests.la
 libTests_la_SOURCES = Amanda/Tests.c $(AMGLUE_SWG)
 libTests_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-libTests_la_LIBADD = libamglue.la \
+libTests_la_LIBADD = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 
 
@@ -1494,7 +1816,7 @@ libMainLoopdir = $(amperldir)/auto/Amanda/MainLoop
 libMainLoop_LTLIBRARIES = libMainLoop.la
 libMainLoop_la_SOURCES = Amanda/MainLoop.c $(AMGLUE_SWG)
 libMainLoop_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-libMainLoop_la_LIBADD = libamglue.la \
+libMainLoop_la_LIBADD = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 
 
@@ -1507,7 +1829,7 @@ libIPCBinarydir = $(amperldir)/auto/Amanda/IPC/Binary
 libIPCBinary_LTLIBRARIES = libBinary.la
 libBinary_la_SOURCES = Amanda/IPC/Binary.c $(AMGLUE_SWG)
 libBinary_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-libBinary_la_LIBADD = libamglue.la \
+libBinary_la_LIBADD = amglue/libamglue.la \
        $(top_builddir)/common-src/libamanda.la
 
 
@@ -1516,7 +1838,7 @@ libBinary_la_LIBADD = libamglue.la \
 @WANT_CLIENT_TRUE@libApplication_LTLIBRARIES = libApplication.la
 @WANT_CLIENT_TRUE@libApplication_la_SOURCES = Amanda/Application.c $(AMGLUE_SWG)
 @WANT_CLIENT_TRUE@libApplication_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-@WANT_CLIENT_TRUE@libApplication_la_LIBADD = libamglue.la \
+@WANT_CLIENT_TRUE@libApplication_la_LIBADD = amglue/libamglue.la \
 @WANT_CLIENT_TRUE@     $(top_builddir)/client-src/libamclient.la
 
 
@@ -1528,7 +1850,7 @@ libBinary_la_LIBADD = libamglue.la \
 # directory, dll must be copied to their modules directories.
 @WANT_CYGWIN_COPY_PERL_DLL_TRUE@amperldirauto = "$(DESTDIR)$(amperldir)/auto/Amanda"
 all: $(BUILT_SOURCES)
-       $(MAKE) $(AM_MAKEFLAGS) all-am
+       $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
@@ -1553,6 +1875,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
        esac;
+$(top_srcdir)/config/automake/vars.am $(top_srcdir)/config/automake/scripts.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1562,40 +1885,8 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-amlibLTLIBRARIES: $(amlib_LTLIBRARIES)
-       @$(NORMAL_INSTALL)
-       test -z "$(amlibdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibdir)"
-       @list='$(amlib_LTLIBRARIES)'; test -n "$(amlibdir)" || 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)$(amlibdir)'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(amlibdir)"; \
-       }
-
-uninstall-amlibLTLIBRARIES:
-       @$(NORMAL_UNINSTALL)
-       @list='$(amlib_LTLIBRARIES)'; test -n "$(amlibdir)" || list=; \
-       for p in $$list; do \
-         $(am__strip_dir) \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(amlibdir)/$$f'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(amlibdir)/$$f"; \
-       done
-
-clean-amlibLTLIBRARIES:
-       -test -z "$(amlib_LTLIBRARIES)" || rm -f $(amlib_LTLIBRARIES)
-       @list='$(amlib_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
 install-libApplicationLTLIBRARIES: $(libApplication_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libApplicationdir)" || $(MKDIR_P) "$(DESTDIR)$(libApplicationdir)"
        @list='$(libApplication_LTLIBRARIES)'; test -n "$(libApplicationdir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1603,6 +1894,8 @@ install-libApplicationLTLIBRARIES: $(libApplication_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libApplicationdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libApplicationdir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libApplicationdir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libApplicationdir)"; \
        }
@@ -1626,7 +1919,6 @@ clean-libApplicationLTLIBRARIES:
        done
 install-libArchiveLTLIBRARIES: $(libArchive_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libArchivedir)" || $(MKDIR_P) "$(DESTDIR)$(libArchivedir)"
        @list='$(libArchive_LTLIBRARIES)'; test -n "$(libArchivedir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1634,6 +1926,8 @@ install-libArchiveLTLIBRARIES: $(libArchive_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libArchivedir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libArchivedir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libArchivedir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libArchivedir)"; \
        }
@@ -1657,7 +1951,6 @@ clean-libArchiveLTLIBRARIES:
        done
 install-libCmdlineLTLIBRARIES: $(libCmdline_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libCmdlinedir)" || $(MKDIR_P) "$(DESTDIR)$(libCmdlinedir)"
        @list='$(libCmdline_LTLIBRARIES)'; test -n "$(libCmdlinedir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1665,6 +1958,8 @@ install-libCmdlineLTLIBRARIES: $(libCmdline_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libCmdlinedir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libCmdlinedir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libCmdlinedir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libCmdlinedir)"; \
        }
@@ -1688,7 +1983,6 @@ clean-libCmdlineLTLIBRARIES:
        done
 install-libConfigLTLIBRARIES: $(libConfig_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libConfigdir)" || $(MKDIR_P) "$(DESTDIR)$(libConfigdir)"
        @list='$(libConfig_LTLIBRARIES)'; test -n "$(libConfigdir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1696,6 +1990,8 @@ install-libConfigLTLIBRARIES: $(libConfig_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libConfigdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libConfigdir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libConfigdir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libConfigdir)"; \
        }
@@ -1719,7 +2015,6 @@ clean-libConfigLTLIBRARIES:
        done
 install-libDebugLTLIBRARIES: $(libDebug_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libDebugdir)" || $(MKDIR_P) "$(DESTDIR)$(libDebugdir)"
        @list='$(libDebug_LTLIBRARIES)'; test -n "$(libDebugdir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1727,6 +2022,8 @@ install-libDebugLTLIBRARIES: $(libDebug_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libDebugdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libDebugdir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libDebugdir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libDebugdir)"; \
        }
@@ -1750,7 +2047,6 @@ clean-libDebugLTLIBRARIES:
        done
 install-libDeviceLTLIBRARIES: $(libDevice_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libDevicedir)" || $(MKDIR_P) "$(DESTDIR)$(libDevicedir)"
        @list='$(libDevice_LTLIBRARIES)'; test -n "$(libDevicedir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1758,6 +2054,8 @@ install-libDeviceLTLIBRARIES: $(libDevice_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libDevicedir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libDevicedir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libDevicedir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libDevicedir)"; \
        }
@@ -1781,7 +2079,6 @@ clean-libDeviceLTLIBRARIES:
        done
 install-libDisklistLTLIBRARIES: $(libDisklist_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libDisklistdir)" || $(MKDIR_P) "$(DESTDIR)$(libDisklistdir)"
        @list='$(libDisklist_LTLIBRARIES)'; test -n "$(libDisklistdir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1789,6 +2086,8 @@ install-libDisklistLTLIBRARIES: $(libDisklist_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libDisklistdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libDisklistdir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libDisklistdir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libDisklistdir)"; \
        }
@@ -1812,7 +2111,6 @@ clean-libDisklistLTLIBRARIES:
        done
 install-libFeatureLTLIBRARIES: $(libFeature_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libFeaturedir)" || $(MKDIR_P) "$(DESTDIR)$(libFeaturedir)"
        @list='$(libFeature_LTLIBRARIES)'; test -n "$(libFeaturedir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1820,6 +2118,8 @@ install-libFeatureLTLIBRARIES: $(libFeature_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libFeaturedir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libFeaturedir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libFeaturedir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libFeaturedir)"; \
        }
@@ -1843,7 +2143,6 @@ clean-libFeatureLTLIBRARIES:
        done
 install-libHeaderLTLIBRARIES: $(libHeader_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libHeaderdir)" || $(MKDIR_P) "$(DESTDIR)$(libHeaderdir)"
        @list='$(libHeader_LTLIBRARIES)'; test -n "$(libHeaderdir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1851,6 +2150,8 @@ install-libHeaderLTLIBRARIES: $(libHeader_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libHeaderdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libHeaderdir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libHeaderdir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libHeaderdir)"; \
        }
@@ -1874,7 +2175,6 @@ clean-libHeaderLTLIBRARIES:
        done
 install-libIPCBinaryLTLIBRARIES: $(libIPCBinary_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libIPCBinarydir)" || $(MKDIR_P) "$(DESTDIR)$(libIPCBinarydir)"
        @list='$(libIPCBinary_LTLIBRARIES)'; test -n "$(libIPCBinarydir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1882,6 +2182,8 @@ install-libIPCBinaryLTLIBRARIES: $(libIPCBinary_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libIPCBinarydir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libIPCBinarydir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libIPCBinarydir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libIPCBinarydir)"; \
        }
@@ -1905,7 +2207,6 @@ clean-libIPCBinaryLTLIBRARIES:
        done
 install-libLogfileLTLIBRARIES: $(libLogfile_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libLogfiledir)" || $(MKDIR_P) "$(DESTDIR)$(libLogfiledir)"
        @list='$(libLogfile_LTLIBRARIES)'; test -n "$(libLogfiledir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1913,6 +2214,8 @@ install-libLogfileLTLIBRARIES: $(libLogfile_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libLogfiledir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libLogfiledir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libLogfiledir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libLogfiledir)"; \
        }
@@ -1936,7 +2239,6 @@ clean-libLogfileLTLIBRARIES:
        done
 install-libMainLoopLTLIBRARIES: $(libMainLoop_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libMainLoopdir)" || $(MKDIR_P) "$(DESTDIR)$(libMainLoopdir)"
        @list='$(libMainLoop_LTLIBRARIES)'; test -n "$(libMainLoopdir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1944,6 +2246,8 @@ install-libMainLoopLTLIBRARIES: $(libMainLoop_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libMainLoopdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libMainLoopdir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libMainLoopdir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libMainLoopdir)"; \
        }
@@ -1967,7 +2271,6 @@ clean-libMainLoopLTLIBRARIES:
        done
 install-libNDMPLTLIBRARIES: $(libNDMP_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libNDMPdir)" || $(MKDIR_P) "$(DESTDIR)$(libNDMPdir)"
        @list='$(libNDMP_LTLIBRARIES)'; test -n "$(libNDMPdir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -1975,6 +2278,8 @@ install-libNDMPLTLIBRARIES: $(libNDMP_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libNDMPdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libNDMPdir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libNDMPdir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libNDMPdir)"; \
        }
@@ -1998,7 +2303,6 @@ clean-libNDMPLTLIBRARIES:
        done
 install-libTapelistLTLIBRARIES: $(libTapelist_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libTapelistdir)" || $(MKDIR_P) "$(DESTDIR)$(libTapelistdir)"
        @list='$(libTapelist_LTLIBRARIES)'; test -n "$(libTapelistdir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -2006,6 +2310,8 @@ install-libTapelistLTLIBRARIES: $(libTapelist_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libTapelistdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libTapelistdir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libTapelistdir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libTapelistdir)"; \
        }
@@ -2029,7 +2335,6 @@ clean-libTapelistLTLIBRARIES:
        done
 install-libTestsLTLIBRARIES: $(libTests_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libTestsdir)" || $(MKDIR_P) "$(DESTDIR)$(libTestsdir)"
        @list='$(libTests_LTLIBRARIES)'; test -n "$(libTestsdir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -2037,6 +2342,8 @@ install-libTestsLTLIBRARIES: $(libTests_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libTestsdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libTestsdir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libTestsdir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libTestsdir)"; \
        }
@@ -2060,7 +2367,6 @@ clean-libTestsLTLIBRARIES:
        done
 install-libUtilLTLIBRARIES: $(libUtil_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libUtildir)" || $(MKDIR_P) "$(DESTDIR)$(libUtildir)"
        @list='$(libUtil_LTLIBRARIES)'; test -n "$(libUtildir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -2068,6 +2374,8 @@ install-libUtilLTLIBRARIES: $(libUtil_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libUtildir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libUtildir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libUtildir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libUtildir)"; \
        }
@@ -2091,7 +2399,6 @@ clean-libUtilLTLIBRARIES:
        done
 install-libXferLTLIBRARIES: $(libXfer_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libXferdir)" || $(MKDIR_P) "$(DESTDIR)$(libXferdir)"
        @list='$(libXfer_LTLIBRARIES)'; test -n "$(libXferdir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -2099,6 +2406,8 @@ install-libXferLTLIBRARIES: $(libXfer_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libXferdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libXferdir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libXferdir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libXferdir)"; \
        }
@@ -2122,7 +2431,6 @@ clean-libXferLTLIBRARIES:
        done
 install-libXferServerLTLIBRARIES: $(libXferServer_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(libXferServerdir)" || $(MKDIR_P) "$(DESTDIR)$(libXferServerdir)"
        @list='$(libXferServer_LTLIBRARIES)'; test -n "$(libXferServerdir)" || list=; \
        list2=; for p in $$list; do \
          if test -f $$p; then \
@@ -2130,6 +2438,8 @@ install-libXferServerLTLIBRARIES: $(libXferServer_LTLIBRARIES)
          else :; fi; \
        done; \
        test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libXferServerdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libXferServerdir)" || exit 1; \
          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libXferServerdir)'"; \
          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libXferServerdir)"; \
        }
@@ -2151,44 +2461,42 @@ clean-libXferServerLTLIBRARIES:
          echo "rm -f \"$${dir}/so_locations\""; \
          rm -f "$${dir}/so_locations"; \
        done
-libApplication.la: $(libApplication_la_OBJECTS) $(libApplication_la_DEPENDENCIES) 
+libApplication.la: $(libApplication_la_OBJECTS) $(libApplication_la_DEPENDENCIES) $(EXTRA_libApplication_la_DEPENDENCIES) 
        $(libApplication_la_LINK) $(am_libApplication_la_rpath) $(libApplication_la_OBJECTS) $(libApplication_la_LIBADD) $(LIBS)
-libArchive.la: $(libArchive_la_OBJECTS) $(libArchive_la_DEPENDENCIES) 
+libArchive.la: $(libArchive_la_OBJECTS) $(libArchive_la_DEPENDENCIES) $(EXTRA_libArchive_la_DEPENDENCIES) 
        $(libArchive_la_LINK) -rpath $(libArchivedir) $(libArchive_la_OBJECTS) $(libArchive_la_LIBADD) $(LIBS)
-libBinary.la: $(libBinary_la_OBJECTS) $(libBinary_la_DEPENDENCIES) 
+libBinary.la: $(libBinary_la_OBJECTS) $(libBinary_la_DEPENDENCIES) $(EXTRA_libBinary_la_DEPENDENCIES) 
        $(libBinary_la_LINK) -rpath $(libIPCBinarydir) $(libBinary_la_OBJECTS) $(libBinary_la_LIBADD) $(LIBS)
-libCmdline.la: $(libCmdline_la_OBJECTS) $(libCmdline_la_DEPENDENCIES) 
+libCmdline.la: $(libCmdline_la_OBJECTS) $(libCmdline_la_DEPENDENCIES) $(EXTRA_libCmdline_la_DEPENDENCIES) 
        $(libCmdline_la_LINK) $(am_libCmdline_la_rpath) $(libCmdline_la_OBJECTS) $(libCmdline_la_LIBADD) $(LIBS)
-libConfig.la: $(libConfig_la_OBJECTS) $(libConfig_la_DEPENDENCIES) 
+libConfig.la: $(libConfig_la_OBJECTS) $(libConfig_la_DEPENDENCIES) $(EXTRA_libConfig_la_DEPENDENCIES) 
        $(libConfig_la_LINK) -rpath $(libConfigdir) $(libConfig_la_OBJECTS) $(libConfig_la_LIBADD) $(LIBS)
-libDebug.la: $(libDebug_la_OBJECTS) $(libDebug_la_DEPENDENCIES) 
+libDebug.la: $(libDebug_la_OBJECTS) $(libDebug_la_DEPENDENCIES) $(EXTRA_libDebug_la_DEPENDENCIES) 
        $(libDebug_la_LINK) -rpath $(libDebugdir) $(libDebug_la_OBJECTS) $(libDebug_la_LIBADD) $(LIBS)
-libDevice.la: $(libDevice_la_OBJECTS) $(libDevice_la_DEPENDENCIES) 
+libDevice.la: $(libDevice_la_OBJECTS) $(libDevice_la_DEPENDENCIES) $(EXTRA_libDevice_la_DEPENDENCIES) 
        $(libDevice_la_LINK) $(am_libDevice_la_rpath) $(libDevice_la_OBJECTS) $(libDevice_la_LIBADD) $(LIBS)
-libDisklist.la: $(libDisklist_la_OBJECTS) $(libDisklist_la_DEPENDENCIES) 
+libDisklist.la: $(libDisklist_la_OBJECTS) $(libDisklist_la_DEPENDENCIES) $(EXTRA_libDisklist_la_DEPENDENCIES) 
        $(libDisklist_la_LINK) $(am_libDisklist_la_rpath) $(libDisklist_la_OBJECTS) $(libDisklist_la_LIBADD) $(LIBS)
-libFeature.la: $(libFeature_la_OBJECTS) $(libFeature_la_DEPENDENCIES) 
+libFeature.la: $(libFeature_la_OBJECTS) $(libFeature_la_DEPENDENCIES) $(EXTRA_libFeature_la_DEPENDENCIES) 
        $(libFeature_la_LINK) -rpath $(libFeaturedir) $(libFeature_la_OBJECTS) $(libFeature_la_LIBADD) $(LIBS)
-libHeader.la: $(libHeader_la_OBJECTS) $(libHeader_la_DEPENDENCIES) 
+libHeader.la: $(libHeader_la_OBJECTS) $(libHeader_la_DEPENDENCIES) $(EXTRA_libHeader_la_DEPENDENCIES) 
        $(libHeader_la_LINK) -rpath $(libHeaderdir) $(libHeader_la_OBJECTS) $(libHeader_la_LIBADD) $(LIBS)
-libLogfile.la: $(libLogfile_la_OBJECTS) $(libLogfile_la_DEPENDENCIES) 
+libLogfile.la: $(libLogfile_la_OBJECTS) $(libLogfile_la_DEPENDENCIES) $(EXTRA_libLogfile_la_DEPENDENCIES) 
        $(libLogfile_la_LINK) $(am_libLogfile_la_rpath) $(libLogfile_la_OBJECTS) $(libLogfile_la_LIBADD) $(LIBS)
-libMainLoop.la: $(libMainLoop_la_OBJECTS) $(libMainLoop_la_DEPENDENCIES) 
+libMainLoop.la: $(libMainLoop_la_OBJECTS) $(libMainLoop_la_DEPENDENCIES) $(EXTRA_libMainLoop_la_DEPENDENCIES) 
        $(libMainLoop_la_LINK) -rpath $(libMainLoopdir) $(libMainLoop_la_OBJECTS) $(libMainLoop_la_LIBADD) $(LIBS)
-libNDMP.la: $(libNDMP_la_OBJECTS) $(libNDMP_la_DEPENDENCIES) 
+libNDMP.la: $(libNDMP_la_OBJECTS) $(libNDMP_la_DEPENDENCIES) $(EXTRA_libNDMP_la_DEPENDENCIES) 
        $(libNDMP_la_LINK) $(am_libNDMP_la_rpath) $(libNDMP_la_OBJECTS) $(libNDMP_la_LIBADD) $(LIBS)
-libTapelist.la: $(libTapelist_la_OBJECTS) $(libTapelist_la_DEPENDENCIES) 
+libTapelist.la: $(libTapelist_la_OBJECTS) $(libTapelist_la_DEPENDENCIES) $(EXTRA_libTapelist_la_DEPENDENCIES) 
        $(libTapelist_la_LINK) $(am_libTapelist_la_rpath) $(libTapelist_la_OBJECTS) $(libTapelist_la_LIBADD) $(LIBS)
-libTests.la: $(libTests_la_OBJECTS) $(libTests_la_DEPENDENCIES) 
+libTests.la: $(libTests_la_OBJECTS) $(libTests_la_DEPENDENCIES) $(EXTRA_libTests_la_DEPENDENCIES) 
        $(libTests_la_LINK) -rpath $(libTestsdir) $(libTests_la_OBJECTS) $(libTests_la_LIBADD) $(LIBS)
-libUtil.la: $(libUtil_la_OBJECTS) $(libUtil_la_DEPENDENCIES) 
+libUtil.la: $(libUtil_la_OBJECTS) $(libUtil_la_DEPENDENCIES) $(EXTRA_libUtil_la_DEPENDENCIES) 
        $(libUtil_la_LINK) -rpath $(libUtildir) $(libUtil_la_OBJECTS) $(libUtil_la_LIBADD) $(LIBS)
-libXfer.la: $(libXfer_la_OBJECTS) $(libXfer_la_DEPENDENCIES) 
+libXfer.la: $(libXfer_la_OBJECTS) $(libXfer_la_DEPENDENCIES) $(EXTRA_libXfer_la_DEPENDENCIES) 
        $(libXfer_la_LINK) -rpath $(libXferdir) $(libXfer_la_OBJECTS) $(libXfer_la_LIBADD) $(LIBS)
-libXferServer.la: $(libXferServer_la_OBJECTS) $(libXferServer_la_DEPENDENCIES) 
+libXferServer.la: $(libXferServer_la_OBJECTS) $(libXferServer_la_DEPENDENCIES) $(EXTRA_libXferServer_la_DEPENDENCIES) 
        $(libXferServer_la_LINK) $(am_libXferServer_la_rpath) $(libXferServer_la_OBJECTS) $(libXferServer_la_LIBADD) $(LIBS)
-libamglue.la: $(libamglue_la_OBJECTS) $(libamglue_la_DEPENDENCIES) 
-       $(libamglue_la_LINK) -rpath $(amlibdir) $(libamglue_la_OBJECTS) $(libamglue_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -2214,12 +2522,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Xfer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XferServer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bigint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gerror.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ghashtable.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objwrap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/source.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xferwrap.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -2368,48 +2670,6 @@ XferServer.lo: Amanda/XferServer.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o XferServer.lo `test -f 'Amanda/XferServer.c' || echo '$(srcdir)/'`Amanda/XferServer.c
 
-ghashtable.lo: amglue/ghashtable.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ghashtable.lo -MD -MP -MF $(DEPDIR)/ghashtable.Tpo -c -o ghashtable.lo `test -f 'amglue/ghashtable.c' || echo '$(srcdir)/'`amglue/ghashtable.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/ghashtable.Tpo $(DEPDIR)/ghashtable.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='amglue/ghashtable.c' object='ghashtable.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ghashtable.lo `test -f 'amglue/ghashtable.c' || echo '$(srcdir)/'`amglue/ghashtable.c
-
-gerror.lo: amglue/gerror.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gerror.lo -MD -MP -MF $(DEPDIR)/gerror.Tpo -c -o gerror.lo `test -f 'amglue/gerror.c' || echo '$(srcdir)/'`amglue/gerror.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/gerror.Tpo $(DEPDIR)/gerror.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='amglue/gerror.c' object='gerror.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gerror.lo `test -f 'amglue/gerror.c' || echo '$(srcdir)/'`amglue/gerror.c
-
-bigint.lo: amglue/bigint.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bigint.lo -MD -MP -MF $(DEPDIR)/bigint.Tpo -c -o bigint.lo `test -f 'amglue/bigint.c' || echo '$(srcdir)/'`amglue/bigint.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/bigint.Tpo $(DEPDIR)/bigint.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='amglue/bigint.c' object='bigint.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bigint.lo `test -f 'amglue/bigint.c' || echo '$(srcdir)/'`amglue/bigint.c
-
-source.lo: amglue/source.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT source.lo -MD -MP -MF $(DEPDIR)/source.Tpo -c -o source.lo `test -f 'amglue/source.c' || echo '$(srcdir)/'`amglue/source.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/source.Tpo $(DEPDIR)/source.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='amglue/source.c' object='source.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o source.lo `test -f 'amglue/source.c' || echo '$(srcdir)/'`amglue/source.c
-
-objwrap.lo: amglue/objwrap.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT objwrap.lo -MD -MP -MF $(DEPDIR)/objwrap.Tpo -c -o objwrap.lo `test -f 'amglue/objwrap.c' || echo '$(srcdir)/'`amglue/objwrap.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/objwrap.Tpo $(DEPDIR)/objwrap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='amglue/objwrap.c' object='objwrap.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o objwrap.lo `test -f 'amglue/objwrap.c' || echo '$(srcdir)/'`amglue/objwrap.c
-
-xferwrap.lo: amglue/xferwrap.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xferwrap.lo -MD -MP -MF $(DEPDIR)/xferwrap.Tpo -c -o xferwrap.lo `test -f 'amglue/xferwrap.c' || echo '$(srcdir)/'`amglue/xferwrap.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/xferwrap.Tpo $(DEPDIR)/xferwrap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='amglue/xferwrap.c' object='xferwrap.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xferwrap.lo `test -f 'amglue/xferwrap.c' || echo '$(srcdir)/'`amglue/xferwrap.c
-
 mostlyclean-libtool:
        -rm -f *.lo
 
@@ -2417,8 +2677,11 @@ clean-libtool:
        -rm -rf .libs _libs
 install-AmandaDATA: $(Amanda_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(Amandadir)" || $(MKDIR_P) "$(DESTDIR)$(Amandadir)"
        @list='$(Amanda_DATA)'; test -n "$(Amandadir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(Amandadir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(Amandadir)" || exit 1; \
+       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -2432,13 +2695,14 @@ uninstall-AmandaDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(Amanda_DATA)'; test -n "$(Amandadir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(Amandadir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(Amandadir)" && rm -f $$files
+       dir='$(DESTDIR)$(Amandadir)'; $(am__uninstall_files_from_dir)
 install-AmandaApplicationDATA: $(AmandaApplication_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(AmandaApplicationdir)" || $(MKDIR_P) "$(DESTDIR)$(AmandaApplicationdir)"
        @list='$(AmandaApplication_DATA)'; test -n "$(AmandaApplicationdir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(AmandaApplicationdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(AmandaApplicationdir)" || exit 1; \
+       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -2452,13 +2716,14 @@ uninstall-AmandaApplicationDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(AmandaApplication_DATA)'; test -n "$(AmandaApplicationdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(AmandaApplicationdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(AmandaApplicationdir)" && rm -f $$files
+       dir='$(DESTDIR)$(AmandaApplicationdir)'; $(am__uninstall_files_from_dir)
 install-AmandaChangerDATA: $(AmandaChanger_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(AmandaChangerdir)" || $(MKDIR_P) "$(DESTDIR)$(AmandaChangerdir)"
        @list='$(AmandaChanger_DATA)'; test -n "$(AmandaChangerdir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(AmandaChangerdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(AmandaChangerdir)" || exit 1; \
+       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -2472,13 +2737,35 @@ uninstall-AmandaChangerDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(AmandaChanger_DATA)'; test -n "$(AmandaChangerdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(AmandaChangerdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(AmandaChangerdir)" && rm -f $$files
+       dir='$(DESTDIR)$(AmandaChangerdir)'; $(am__uninstall_files_from_dir)
+install-AmandaConfigDATA: $(AmandaConfig_DATA)
+       @$(NORMAL_INSTALL)
+       @list='$(AmandaConfig_DATA)'; test -n "$(AmandaConfigdir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(AmandaConfigdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(AmandaConfigdir)" || exit 1; \
+       fi; \
+       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)$(AmandaConfigdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(AmandaConfigdir)" || exit $$?; \
+       done
+
+uninstall-AmandaConfigDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(AmandaConfig_DATA)'; test -n "$(AmandaConfigdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(AmandaConfigdir)'; $(am__uninstall_files_from_dir)
 install-AmandaCurinfoDATA: $(AmandaCurinfo_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(AmandaCurinfodir)" || $(MKDIR_P) "$(DESTDIR)$(AmandaCurinfodir)"
        @list='$(AmandaCurinfo_DATA)'; test -n "$(AmandaCurinfodir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(AmandaCurinfodir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(AmandaCurinfodir)" || exit 1; \
+       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -2492,13 +2779,14 @@ uninstall-AmandaCurinfoDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(AmandaCurinfo_DATA)'; test -n "$(AmandaCurinfodir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(AmandaCurinfodir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(AmandaCurinfodir)" && rm -f $$files
+       dir='$(DESTDIR)$(AmandaCurinfodir)'; $(am__uninstall_files_from_dir)
 install-AmandaIPCDATA: $(AmandaIPC_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(AmandaIPCdir)" || $(MKDIR_P) "$(DESTDIR)$(AmandaIPCdir)"
        @list='$(AmandaIPC_DATA)'; test -n "$(AmandaIPCdir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(AmandaIPCdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(AmandaIPCdir)" || exit 1; \
+       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -2512,33 +2800,35 @@ uninstall-AmandaIPCDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(AmandaIPC_DATA)'; test -n "$(AmandaIPCdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(AmandaIPCdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(AmandaIPCdir)" && rm -f $$files
-install-AmandaInteractiveDATA: $(AmandaInteractive_DATA)
+       dir='$(DESTDIR)$(AmandaIPCdir)'; $(am__uninstall_files_from_dir)
+install-AmandaInteractivityDATA: $(AmandaInteractivity_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(AmandaInteractivedir)" || $(MKDIR_P) "$(DESTDIR)$(AmandaInteractivedir)"
-       @list='$(AmandaInteractive_DATA)'; test -n "$(AmandaInteractivedir)" || list=; \
+       @list='$(AmandaInteractivity_DATA)'; test -n "$(AmandaInteractivitydir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(AmandaInteractivitydir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(AmandaInteractivitydir)" || exit 1; \
+       fi; \
        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)$(AmandaInteractivedir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(AmandaInteractivedir)" || exit $$?; \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(AmandaInteractivitydir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(AmandaInteractivitydir)" || exit $$?; \
        done
 
-uninstall-AmandaInteractiveDATA:
+uninstall-AmandaInteractivityDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(AmandaInteractive_DATA)'; test -n "$(AmandaInteractivedir)" || list=; \
+       @list='$(AmandaInteractivity_DATA)'; test -n "$(AmandaInteractivitydir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(AmandaInteractivedir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(AmandaInteractivedir)" && rm -f $$files
+       dir='$(DESTDIR)$(AmandaInteractivitydir)'; $(am__uninstall_files_from_dir)
 install-AmandaRecoveryDATA: $(AmandaRecovery_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(AmandaRecoverydir)" || $(MKDIR_P) "$(DESTDIR)$(AmandaRecoverydir)"
        @list='$(AmandaRecovery_DATA)'; test -n "$(AmandaRecoverydir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(AmandaRecoverydir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(AmandaRecoverydir)" || exit 1; \
+       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -2552,13 +2842,14 @@ uninstall-AmandaRecoveryDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(AmandaRecovery_DATA)'; test -n "$(AmandaRecoverydir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(AmandaRecoverydir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(AmandaRecoverydir)" && rm -f $$files
+       dir='$(DESTDIR)$(AmandaRecoverydir)'; $(am__uninstall_files_from_dir)
 install-AmandaReportDATA: $(AmandaReport_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(AmandaReportdir)" || $(MKDIR_P) "$(DESTDIR)$(AmandaReportdir)"
        @list='$(AmandaReport_DATA)'; test -n "$(AmandaReportdir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(AmandaReportdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(AmandaReportdir)" || exit 1; \
+       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -2572,13 +2863,14 @@ uninstall-AmandaReportDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(AmandaReport_DATA)'; test -n "$(AmandaReportdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(AmandaReportdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(AmandaReportdir)" && rm -f $$files
+       dir='$(DESTDIR)$(AmandaReportdir)'; $(am__uninstall_files_from_dir)
 install-AmandaTaperDATA: $(AmandaTaper_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(AmandaTaperdir)" || $(MKDIR_P) "$(DESTDIR)$(AmandaTaperdir)"
        @list='$(AmandaTaper_DATA)'; test -n "$(AmandaTaperdir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(AmandaTaperdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(AmandaTaperdir)" || exit 1; \
+       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -2592,13 +2884,14 @@ uninstall-AmandaTaperDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(AmandaTaper_DATA)'; test -n "$(AmandaTaperdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(AmandaTaperdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(AmandaTaperdir)" && rm -f $$files
+       dir='$(DESTDIR)$(AmandaTaperdir)'; $(am__uninstall_files_from_dir)
 install-AmandaTaperScanDATA: $(AmandaTaperScan_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(AmandaTaperScandir)" || $(MKDIR_P) "$(DESTDIR)$(AmandaTaperScandir)"
        @list='$(AmandaTaperScan_DATA)'; test -n "$(AmandaTaperScandir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(AmandaTaperScandir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(AmandaTaperScandir)" || exit 1; \
+       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -2612,13 +2905,14 @@ uninstall-AmandaTaperScanDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(AmandaTaperScan_DATA)'; test -n "$(AmandaTaperScandir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(AmandaTaperScandir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(AmandaTaperScandir)" && rm -f $$files
+       dir='$(DESTDIR)$(AmandaTaperScandir)'; $(am__uninstall_files_from_dir)
 install-Amanda_DBDATA: $(Amanda_DB_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(Amanda_DBdir)" || $(MKDIR_P) "$(DESTDIR)$(Amanda_DBdir)"
        @list='$(Amanda_DB_DATA)'; test -n "$(Amanda_DBdir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(Amanda_DBdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(Amanda_DBdir)" || exit 1; \
+       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
@@ -2632,9 +2926,77 @@ uninstall-Amanda_DBDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(Amanda_DB_DATA)'; test -n "$(Amanda_DBdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(Amanda_DBdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(Amanda_DBdir)" && rm -f $$files
+       dir='$(DESTDIR)$(Amanda_DBdir)'; $(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; \
+       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)'; \
@@ -2646,10 +3008,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        mkid -fID $$unique
 tags: TAGS
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+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; \
@@ -2668,7 +3043,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
          fi; \
        fi
 ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
@@ -2718,33 +3093,65 @@ distdir: $(DISTFILES)
            || 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
        $(MAKE) $(AM_MAKEFLAGS) \
          top_distdir="$(top_distdir)" distdir="$(distdir)" \
          dist-hook
+@SYNTAX_CHECKS_FALSE@check-local:
 check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-local
 check: $(BUILT_SOURCES)
-       $(MAKE) $(AM_MAKEFLAGS) check-am
+       $(MAKE) $(AM_MAKEFLAGS) check-recursive
 all-am: Makefile $(LTLIBRARIES) $(DATA)
-installdirs:
-       for dir in "$(DESTDIR)$(amlibdir)" "$(DESTDIR)$(libApplicationdir)" "$(DESTDIR)$(libArchivedir)" "$(DESTDIR)$(libCmdlinedir)" "$(DESTDIR)$(libConfigdir)" "$(DESTDIR)$(libDebugdir)" "$(DESTDIR)$(libDevicedir)" "$(DESTDIR)$(libDisklistdir)" "$(DESTDIR)$(libFeaturedir)" "$(DESTDIR)$(libHeaderdir)" "$(DESTDIR)$(libIPCBinarydir)" "$(DESTDIR)$(libLogfiledir)" "$(DESTDIR)$(libMainLoopdir)" "$(DESTDIR)$(libNDMPdir)" "$(DESTDIR)$(libTapelistdir)" "$(DESTDIR)$(libTestsdir)" "$(DESTDIR)$(libUtildir)" "$(DESTDIR)$(libXferdir)" "$(DESTDIR)$(libXferServerdir)" "$(DESTDIR)$(Amandadir)" "$(DESTDIR)$(AmandaApplicationdir)" "$(DESTDIR)$(AmandaChangerdir)" "$(DESTDIR)$(AmandaCurinfodir)" "$(DESTDIR)$(AmandaIPCdir)" "$(DESTDIR)$(AmandaInteractivedir)" "$(DESTDIR)$(AmandaRecoverydir)" "$(DESTDIR)$(AmandaReportdir)" "$(DESTDIR)$(AmandaTaperdir)" "$(DESTDIR)$(AmandaTaperScandir)" "$(DESTDIR)$(Amanda_DBdir)"; do \
+installdirs: installdirs-recursive
+installdirs-am:
+       for dir in "$(DESTDIR)$(libApplicationdir)" "$(DESTDIR)$(libArchivedir)" "$(DESTDIR)$(libCmdlinedir)" "$(DESTDIR)$(libConfigdir)" "$(DESTDIR)$(libDebugdir)" "$(DESTDIR)$(libDevicedir)" "$(DESTDIR)$(libDisklistdir)" "$(DESTDIR)$(libFeaturedir)" "$(DESTDIR)$(libHeaderdir)" "$(DESTDIR)$(libIPCBinarydir)" "$(DESTDIR)$(libLogfiledir)" "$(DESTDIR)$(libMainLoopdir)" "$(DESTDIR)$(libNDMPdir)" "$(DESTDIR)$(libTapelistdir)" "$(DESTDIR)$(libTestsdir)" "$(DESTDIR)$(libUtildir)" "$(DESTDIR)$(libXferdir)" "$(DESTDIR)$(libXferServerdir)" "$(DESTDIR)$(Amandadir)" "$(DESTDIR)$(AmandaApplicationdir)" "$(DESTDIR)$(AmandaChangerdir)" "$(DESTDIR)$(AmandaConfigdir)" "$(DESTDIR)$(AmandaCurinfodir)" "$(DESTDIR)$(AmandaIPCdir)" "$(DESTDIR)$(AmandaInteractivitydir)" "$(DESTDIR)$(AmandaRecoverydir)" "$(DESTDIR)$(AmandaReportdir)" "$(DESTDIR)$(AmandaTaperdir)" "$(DESTDIR)$(AmandaTaperScandir)" "$(DESTDIR)$(Amanda_DBdir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: $(BUILT_SOURCES)
-       $(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+       $(MAKE) $(AM_MAKEFLAGS) 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-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
+       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:
        -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
@@ -2761,44 +3168,46 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+@WANT_MANDATORY_THREAD_CHECK_FALSE@install-data-local:
+@WANT_MANDATORY_THREAD_CHECK_TRUE@installcheck-local:
 @WANT_CYGWIN_COPY_PERL_DLL_FALSE@install-data-hook:
-clean: clean-am
-
-clean-am: clean-amlibLTLIBRARIES clean-generic \
-       clean-libApplicationLTLIBRARIES clean-libArchiveLTLIBRARIES \
-       clean-libCmdlineLTLIBRARIES clean-libConfigLTLIBRARIES \
-       clean-libDebugLTLIBRARIES clean-libDeviceLTLIBRARIES \
-       clean-libDisklistLTLIBRARIES clean-libFeatureLTLIBRARIES \
-       clean-libHeaderLTLIBRARIES clean-libIPCBinaryLTLIBRARIES \
-       clean-libLogfileLTLIBRARIES clean-libMainLoopLTLIBRARIES \
-       clean-libNDMPLTLIBRARIES clean-libTapelistLTLIBRARIES \
-       clean-libTestsLTLIBRARIES clean-libUtilLTLIBRARIES \
-       clean-libXferLTLIBRARIES clean-libXferServerLTLIBRARIES \
-       clean-libtool mostlyclean-am
-
-distclean: distclean-am
+clean: clean-recursive
+
+clean-am: clean-generic clean-libApplicationLTLIBRARIES \
+       clean-libArchiveLTLIBRARIES clean-libCmdlineLTLIBRARIES \
+       clean-libConfigLTLIBRARIES clean-libDebugLTLIBRARIES \
+       clean-libDeviceLTLIBRARIES clean-libDisklistLTLIBRARIES \
+       clean-libFeatureLTLIBRARIES clean-libHeaderLTLIBRARIES \
+       clean-libIPCBinaryLTLIBRARIES clean-libLogfileLTLIBRARIES \
+       clean-libMainLoopLTLIBRARIES clean-libNDMPLTLIBRARIES \
+       clean-libTapelistLTLIBRARIES clean-libTestsLTLIBRARIES \
+       clean-libUtilLTLIBRARIES clean-libXferLTLIBRARIES \
+       clean-libXferServerLTLIBRARIES clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
        -rm -rf ./$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-tags
 
-dvi: dvi-am
+dvi: dvi-recursive
 
 dvi-am:
 
 html-am:
 
-info: info-am
+info: info-recursive
 
 info-am:
 
 install-data-am: install-AmandaApplicationDATA \
-       install-AmandaChangerDATA install-AmandaCurinfoDATA \
-       install-AmandaDATA install-AmandaIPCDATA \
-       install-AmandaInteractiveDATA install-AmandaRecoveryDATA \
-       install-AmandaReportDATA install-AmandaTaperDATA \
-       install-AmandaTaperScanDATA install-Amanda_DBDATA \
-       install-amlibLTLIBRARIES install-libApplicationLTLIBRARIES \
+       install-AmandaChangerDATA install-AmandaConfigDATA \
+       install-AmandaCurinfoDATA install-AmandaDATA \
+       install-AmandaIPCDATA install-AmandaInteractivityDATA \
+       install-AmandaRecoveryDATA install-AmandaReportDATA \
+       install-AmandaTaperDATA install-AmandaTaperScanDATA \
+       install-Amanda_DBDATA install-data-local \
+       install-libApplicationLTLIBRARIES \
        install-libArchiveLTLIBRARIES install-libCmdlineLTLIBRARIES \
        install-libConfigLTLIBRARIES install-libDebugLTLIBRARIES \
        install-libDeviceLTLIBRARIES install-libDisklistLTLIBRARIES \
@@ -2810,57 +3219,57 @@ install-data-am: install-AmandaApplicationDATA \
        install-libXferServerLTLIBRARIES
        @$(NORMAL_INSTALL)
        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am:
 
-install-html: install-html-am
+install-html: install-html-recursive
 
 install-html-am:
 
-install-info: install-info-am
+install-info: install-info-recursive
 
 install-info-am:
 
 install-man:
 
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
 
 install-pdf-am:
 
-install-ps: install-ps-am
+install-ps: install-ps-recursive
 
 install-ps-am:
 
 installcheck-am: installcheck-local
 
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
        -rm -rf ./$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
        mostlyclean-libtool
 
-pdf: pdf-am
+pdf: pdf-recursive
 
 pdf-am:
 
-ps: ps-am
+ps: ps-recursive
 
 ps-am:
 
 uninstall-am: uninstall-AmandaApplicationDATA \
-       uninstall-AmandaChangerDATA uninstall-AmandaCurinfoDATA \
-       uninstall-AmandaDATA uninstall-AmandaIPCDATA \
-       uninstall-AmandaInteractiveDATA uninstall-AmandaRecoveryDATA \
-       uninstall-AmandaReportDATA uninstall-AmandaTaperDATA \
-       uninstall-AmandaTaperScanDATA uninstall-Amanda_DBDATA \
-       uninstall-amlibLTLIBRARIES uninstall-libApplicationLTLIBRARIES \
+       uninstall-AmandaChangerDATA uninstall-AmandaConfigDATA \
+       uninstall-AmandaCurinfoDATA uninstall-AmandaDATA \
+       uninstall-AmandaIPCDATA uninstall-AmandaInteractivityDATA \
+       uninstall-AmandaRecoveryDATA uninstall-AmandaReportDATA \
+       uninstall-AmandaTaperDATA uninstall-AmandaTaperScanDATA \
+       uninstall-Amanda_DBDATA uninstall-libApplicationLTLIBRARIES \
        uninstall-libArchiveLTLIBRARIES \
        uninstall-libCmdlineLTLIBRARIES uninstall-libConfigLTLIBRARIES \
        uninstall-libDebugLTLIBRARIES uninstall-libDeviceLTLIBRARIES \
@@ -2873,11 +3282,12 @@ uninstall-am: uninstall-AmandaApplicationDATA \
        uninstall-libUtilLTLIBRARIES uninstall-libXferLTLIBRARIES \
        uninstall-libXferServerLTLIBRARIES
 
-.MAKE: all check check-am install install-am install-data-am \
-       install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+       check-am ctags-recursive install install-am install-data-am \
+       install-strip tags-recursive
 
-.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
-       clean-amlibLTLIBRARIES clean-generic \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+       all all-am check check-am check-local clean clean-generic \
        clean-libApplicationLTLIBRARIES clean-libArchiveLTLIBRARIES \
        clean-libCmdlineLTLIBRARIES clean-libConfigLTLIBRARIES \
        clean-libDebugLTLIBRARIES clean-libDeviceLTLIBRARIES \
@@ -2887,16 +3297,17 @@ uninstall-am: uninstall-AmandaApplicationDATA \
        clean-libNDMPLTLIBRARIES clean-libTapelistLTLIBRARIES \
        clean-libTestsLTLIBRARIES clean-libUtilLTLIBRARIES \
        clean-libXferLTLIBRARIES clean-libXferServerLTLIBRARIES \
-       clean-libtool ctags dist-hook distclean distclean-compile \
-       distclean-generic distclean-libtool distclean-tags distdir dvi \
-       dvi-am html html-am info info-am install \
-       install-AmandaApplicationDATA install-AmandaChangerDATA \
+       clean-libtool ctags ctags-recursive dist-hook distclean \
+       distclean-compile distclean-generic distclean-libtool \
+       distclean-tags distdir dvi dvi-am html html-am info info-am \
+       install install-AmandaApplicationDATA \
+       install-AmandaChangerDATA install-AmandaConfigDATA \
        install-AmandaCurinfoDATA install-AmandaDATA \
-       install-AmandaIPCDATA install-AmandaInteractiveDATA \
+       install-AmandaIPCDATA install-AmandaInteractivityDATA \
        install-AmandaRecoveryDATA install-AmandaReportDATA \
        install-AmandaTaperDATA install-AmandaTaperScanDATA \
-       install-Amanda_DBDATA install-am install-amlibLTLIBRARIES \
-       install-data install-data-am install-data-hook install-dvi \
+       install-Amanda_DBDATA install-am install-data install-data-am \
+       install-data-hook install-data-local install-dvi \
        install-dvi-am install-exec install-exec-am install-html \
        install-html-am install-info install-info-am \
        install-libApplicationLTLIBRARIES \
@@ -2911,16 +3322,17 @@ uninstall-am: uninstall-AmandaApplicationDATA \
        install-libXferServerLTLIBRARIES install-man install-pdf \
        install-pdf-am install-ps install-ps-am install-strip \
        installcheck installcheck-am installcheck-local installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-       pdf pdf-am ps ps-am tags uninstall \
-       uninstall-AmandaApplicationDATA uninstall-AmandaChangerDATA \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+       uninstall uninstall-AmandaApplicationDATA \
+       uninstall-AmandaChangerDATA uninstall-AmandaConfigDATA \
        uninstall-AmandaCurinfoDATA uninstall-AmandaDATA \
-       uninstall-AmandaIPCDATA uninstall-AmandaInteractiveDATA \
+       uninstall-AmandaIPCDATA uninstall-AmandaInteractivityDATA \
        uninstall-AmandaRecoveryDATA uninstall-AmandaReportDATA \
        uninstall-AmandaTaperDATA uninstall-AmandaTaperScanDATA \
        uninstall-Amanda_DBDATA uninstall-am \
-       uninstall-amlibLTLIBRARIES uninstall-libApplicationLTLIBRARIES \
+       uninstall-libApplicationLTLIBRARIES \
        uninstall-libArchiveLTLIBRARIES \
        uninstall-libCmdlineLTLIBRARIES uninstall-libConfigLTLIBRARIES \
        uninstall-libDebugLTLIBRARIES uninstall-libDeviceLTLIBRARIES \
@@ -2938,11 +3350,13 @@ uninstall-am: uninstall-AmandaApplicationDATA \
 %: %.pl $(top_builddir)/config.status
        $(top_builddir)/config.status --file=$@:$<
        chmod a+x $@
-@CHECK_SCRIPTS_AT_BUILD_TRUE@  @if test -f $(top_builddir)/perl/.libs/libCmdline.so -o -f $(top_builddir)/perl/libCmdline.so; then \
-@CHECK_SCRIPTS_AT_BUILD_TRUE@          sed "s,^use lib ['\"]$(amperldir)['\"],# use lib '$(amperldir)' # nouselib," < $@ > $@.nouselib; \
-@CHECK_SCRIPTS_AT_BUILD_TRUE@          $(PERL) $(CHECK_PERL_FLAGS) -I$(top_builddir)/perl -I$(top_builddir)/perl/.libs -I$(top_srcdir)/perl -c -w $@.nouselib || exit 1; \
-@CHECK_SCRIPTS_AT_BUILD_TRUE@          rm $@.nouselib; \
-@CHECK_SCRIPTS_AT_BUILD_TRUE@  fi
+@SYNTAX_CHECKS_TRUE@   @if test -f $(top_builddir)/perl/.libs/libCmdline.so -o -f $(top_builddir)/perl/libCmdline.so; then \
+@SYNTAX_CHECKS_TRUE@           sed "s,^use lib ['\"]$(amperldir)['\"],# use lib '$(amperldir)' # nouselib," < $@ > $@.nouselib; \
+@SYNTAX_CHECKS_TRUE@           $(PERL) $(CHECK_PERL_FLAGS) -I$(top_builddir)/perl -I$(top_builddir)/perl/.libs -I$(top_srcdir)/perl -c -w $@.nouselib || exit 1; \
+@SYNTAX_CHECKS_TRUE@           rm $@.nouselib; \
+@SYNTAX_CHECKS_TRUE@   else \
+@SYNTAX_CHECKS_TRUE@           echo "skipping syntax check of $@ because perl packages are not compiled yet"; \
+@SYNTAX_CHECKS_TRUE@   fi
 
 %.pl: %.pl.in $(top_builddir)/config.status
        $(top_builddir)/config.status --file=$@:$<
@@ -2966,33 +3380,22 @@ uninstall-am: uninstall-AmandaApplicationDATA \
 %.awk: %.awk.in $(top_builddir)/config.status
        $(top_builddir)/config.status --file=$@:$<
 
-# syntax-check perl scripts on 'make check'
+# syntax-check perl scripts on an explicit 'make check', but only if
+# SYNTAX_CHECKS are enabled, as this is sensitive to the presence of perl
+# modules in the install tree, and can trip up unsuspecting users.
 check-perl: $(SCRIPTS_PERL)
        @SCRIPTS_PERL="$(SCRIPTS_PERL)"; \
        if test x"$(SKIP_CHECKS)" = x"" && \
            test -f $(top_builddir)/perl/.libs/libCmdline.so -o -f $(top_builddir)/perl/libCmdline.so; then \
-           if test -n "$(PERL)"; then \
-                   for perlobj in $$SCRIPTS_PERL; do \
-                           sed "s,^use lib ['\"]$(amperldir)['\"],# use lib '$(amperldir)' # nouselib," < $$perlobj > $$perlobj.nouselib; \
-                           $(PERL) $(CHECK_PERL_FLAGS) -I$(top_builddir)/perl -I$(top_builddir)/perl/.libs -I$(top_srcdir)/perl -c -w $$perlobj.nouselib || exit 1; \
-                           rm $$perlobj.nouselib; \
-                   done; \
-           fi \
-       fi
-check-local: check-perl
-
-# syntax-check perl scripts on 'make installcheck'
-installcheck-perl: $(SCRIPTS_PERL)
-       @SCRIPTS_PERL="$(SCRIPTS_PERL)"; \
-       if test x"$(SKIP_CHECKS)" = x"" && \
-           test -n "$(PERL)"; then \
-               for perlobj in $$SCRIPTS_PERL; do \
-                       $(PERL) $(CHECK_PERL_FLAGS) -c -w $$perlobj || exit 1; \
-               done; \
+           for perlobj in $$SCRIPTS_PERL; do \
+               sed "s,^use lib ['\"]$(amperldir)['\"],# use lib '$(amperldir)' # nouselib," < $$perlobj > $$perlobj.nouselib; \
+               $(PERL) $(CHECK_PERL_FLAGS) -I$(top_builddir)/perl -I$(top_builddir)/perl/.libs -I$(top_srcdir)/perl -c -w $$perlobj.nouselib || exit 1; \
+               rm $$perlobj.nouselib; \
+           done; \
        fi
-installcheck-local: installcheck-perl
+@SYNTAX_CHECKS_TRUE@check-local: check-perl
 
-# syntax-check shell scripts on 'make check'
+# syntax-check shell scripts on an explicit 'make check'
 check-shell: $(SCRIPTS_SHELL)
        @SCRIPTS_SHELL="$(SCRIPTS_SHELL)"; \
        if test x"$(SKIP_CHECKS)" = x"" && \
@@ -3010,7 +3413,7 @@ check-shell: $(SCRIPTS_SHELL)
                        echo "No 'bash' available -- cannot syntax-check shell scripts"; \
                fi; \
        fi
-check-local: check-shell
+@SYNTAX_CHECKS_TRUE@check-local: check-shell
 
 # make sure that the sources for all shell and perl scripts get included
 # in the distribution
@@ -3047,6 +3450,8 @@ dist-scripts:
        true
 dist-hook: dist-scripts
 
+# (amplot has a conditional, but doesn't have any header files)
+
 # This isn't a very robust implementation, as it's only meant to make the HTML
 # available online as part of the automated compilation process.  It assumes
 # that all perl modules were built (not just server or client), and that the
@@ -3055,7 +3460,7 @@ dist-hook: dist-scripts
 html: make_html amperl.css $(PM_FILES)
        rm -rf html-tmp/ && mkdir html-tmp/
        cp amperl.css html-tmp/
-       $(PERL) make_html html-tmp/ $(PM_FILES)
+       $(PERL) make_html --homeurl "$(POD_HOME_URL)" html-tmp/ $(PM_FILES)
        cd html-tmp/ && tar -zcf $(abs_builddir)/html.tar.gz .
        rm -rf html-tmp/
 
@@ -3075,32 +3480,33 @@ html: make_html amperl.css $(PM_FILES)
 # PACKAGE: Amanda::Feature
 Amanda/Feature.pm: ../common-src/amfeatures.h
 @WANT_CYGWIN_COPY_PERL_DLL_TRUE@install-data-hook:
-@WANT_CYGWIN_COPY_PERL_DLL_TRUE@       @for cygdll in $(amperldirauto)/bin/cyg*.dll; do \
+@WANT_CYGWIN_COPY_PERL_DLL_TRUE@       @for cygdll in $(wildcard $(amperldirauto)/bin/cyg*.dll); do \
 @WANT_CYGWIN_COPY_PERL_DLL_TRUE@           destfname=`echo $$cygdll|sed 's!/bin/cyg\([^.]*\).dll!/\1/\1.dll!'`; \
 @WANT_CYGWIN_COPY_PERL_DLL_TRUE@          cp "$$cygdll" "$$destfname"; \
 @WANT_CYGWIN_COPY_PERL_DLL_TRUE@       done
 
-check-local: syntax-check thread-check
-
-syntax-check:
+# only syntax-check the .pm files if SYNTAX_CHECKS are enabled
+check-pm:
        @MODULES_TO_CHECK="$(PM_FILES)"; \
        if test -f $(top_builddir)/perl/.libs/libConfig.so -o -f $(top_builddir)/perl/libConfig.so; then \
-               if test -n "$(PERL)"; then \
-                       for perlobj in $$MODULES_TO_CHECK; do \
-                               if test -f $$perlobj; then \
-                                       $(PERL) $(CHECK_PERL_FLAGS) -I$(top_builddir)/perl -I$(top_builddir)/perl/.libs -I$(top_srcdir)/perl -c -T $$perlobj || exit 1; \
-                               else \
-                                       $(PERL) $(CHECK_PERL_FLAGS) -I$(top_builddir)/perl -I$(top_builddir)/perl/.libs -I$(top_srcdir)/perl -c -T $(top_srcdir)/perl/$$perlobj || exit 1; \
-                               fi \
-                       done; \
+           for perlobj in $$MODULES_TO_CHECK; do \
+               if test -f $$perlobj; then \
+                   $(PERL) $(CHECK_PERL_FLAGS) -I$(top_builddir)/perl -I$(top_builddir)/perl/.libs -I$(top_srcdir)/perl -c -T $$perlobj || exit 1; \
+               else \
+                   $(PERL) $(CHECK_PERL_FLAGS) -I$(top_builddir)/perl -I$(top_builddir)/perl/.libs -I$(top_srcdir)/perl -c -T $(top_srcdir)/perl/$$perlobj || exit 1; \
                fi \
+           done; \
         fi
+@SYNTAX_CHECKS_TRUE@check-local: check-pm
+
+@WANT_MANDATORY_THREAD_CHECK_TRUE@install-data-local: thread-check
+@WANT_MANDATORY_THREAD_CHECK_FALSE@installcheck-local: thread-check
 
 @WANT_SERVER_TRUE@thread-check: libTests.la
 @WANT_SERVER_TRUE@     $(PERL) -I$(builddir) -I$(builddir)/.libs -I$(srcdir) \
 @WANT_SERVER_TRUE@                     -MAmanda::Tests -e 'alarm(10); Amanda::Tests::try_threads' \
-@WANT_SERVER_TRUE@     || echo "Perl cannot run extensions which use threads; consider linking perl" \
-@WANT_SERVER_TRUE@             "with -pthreads or compiling perl with threading enabled"
+@WANT_SERVER_TRUE@     || echo "Perl cannot run extensions which use threads; consider linking perl" \
+@WANT_SERVER_TRUE@             "with -pthread or compiling perl with threading enabled"; false; }
 @WANT_SERVER_FALSE@thread-check:
 @WANT_SERVER_FALSE@    @echo "skipping thread check: server component not being built"