- replace the questionable magic to conditionally install headers in
authorpmatilai <pmatilai>
Mon, 8 May 2006 14:48:12 +0000 (14:48 +0000)
committerpmatilai <pmatilai>
Mon, 8 May 2006 14:48:12 +0000 (14:48 +0000)
  buildlib/Makefile.am with AC_CONFIG_LINK'ed files, get rid of
  buildlib/Makefile* (Ralf)

12 files changed:
Makefile.am
Makefile.in
apt-pkg/Makefile.in
buildlib/Makefile.am [deleted file]
buildlib/Makefile.in [deleted file]
cmdline/Makefile.in
configure
configure.in
doc/Makefile.in
lua/Makefile.in
methods/Makefile.in
tools/Makefile.in

index 4882f84..cfa4573 100644 (file)
@@ -1,5 +1,5 @@
 
-SUBDIRS = buildlib lua apt-pkg methods cmdline tools doc po
+SUBDIRS = lua apt-pkg methods cmdline tools doc po
 
 ACLOCAL_AMFLAGS = -I m4 -I buildlib
 
@@ -79,3 +79,6 @@ EXTRA_DIST += contrib/guess/guess.lua
 EXTRA_DIST += contrib/list-nodeps/list-nodeps.conf
 EXTRA_DIST += contrib/list-nodeps/list-nodeps.lua
 EXTRA_DIST += contrib/list-nodeps/README
+
+EXTRA_DIST += buildlib/archtable
+EXTRA_DIST += buildlib/ostable
index f9d0131..42e7df8 100644 (file)
@@ -35,11 +35,17 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = .
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(top_srcdir)/buildlib/config.h.in \
-       $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
-       TODO
+       $(top_srcdir)/buildlib/gettext.h \
+       $(top_srcdir)/buildlib/inttypes.h \
+       $(top_srcdir)/buildlib/netdb.h \
+       $(top_srcdir)/buildlib/statvfs.h $(top_srcdir)/configure \
+       ABOUT-NLS AUTHORS COPYING ChangeLog TODO buildlib/compile \
+       buildlib/config.guess buildlib/config.rpath \
+       buildlib/config.sub buildlib/depcomp buildlib/install-sh \
+       buildlib/ltmain.sh buildlib/missing buildlib/mkinstalldirs
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/buildlib/tools.m4 \
        $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -53,7 +59,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/buildlib/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = include/apti18n.h include/inttypes.h \
+       include/statvfs.h include/netdb.h
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -142,13 +149,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
-NEED_INTTYPES_H_FALSE = @NEED_INTTYPES_H_FALSE@
-NEED_INTTYPES_H_TRUE = @NEED_INTTYPES_H_TRUE@
-NEED_NETDB_H_FALSE = @NEED_NETDB_H_FALSE@
-NEED_NETDB_H_TRUE = @NEED_NETDB_H_TRUE@
 NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
-NEED_STATVFS_H_FALSE = @NEED_STATVFS_H_FALSE@
-NEED_STATVFS_H_TRUE = @NEED_STATVFS_H_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -216,7 +217,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = buildlib lua apt-pkg methods cmdline tools doc po
+SUBDIRS = lua apt-pkg methods cmdline tools doc po
 ACLOCAL_AMFLAGS = -I m4 -I buildlib
 EXTRA_DIST = AUTHORS.RPM COPYING.GPL rpmpriorities test/conf.cc \
        test/extract-control.cc test/hash.cc test/makefile \
@@ -254,7 +255,8 @@ EXTRA_DIST = AUTHORS.RPM COPYING.GPL rpmpriorities test/conf.cc \
        contrib/proxypasswd/README contrib/proxypasswd/proxypasswd.lua \
        contrib/guess/README contrib/guess/guess.conf \
        contrib/guess/guess.lua contrib/list-nodeps/list-nodeps.conf \
-       contrib/list-nodeps/list-nodeps.lua contrib/list-nodeps/README
+       contrib/list-nodeps/list-nodeps.lua contrib/list-nodeps/README \
+       buildlib/archtable buildlib/ostable
 all: all-recursive
 
 .SUFFIXES:
index 3d90d6c..bbc6ff5 100644 (file)
@@ -172,13 +172,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
-NEED_INTTYPES_H_FALSE = @NEED_INTTYPES_H_FALSE@
-NEED_INTTYPES_H_TRUE = @NEED_INTTYPES_H_TRUE@
-NEED_NETDB_H_FALSE = @NEED_NETDB_H_FALSE@
-NEED_NETDB_H_TRUE = @NEED_NETDB_H_TRUE@
 NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
-NEED_STATVFS_H_FALSE = @NEED_STATVFS_H_FALSE@
-NEED_STATVFS_H_TRUE = @NEED_STATVFS_H_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/buildlib/Makefile.am b/buildlib/Makefile.am
deleted file mode 100644 (file)
index 3de5723..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-
-all-local: copy-headers
-
-EXTRA_DIST = \
-            archtable \
-            ostable \
-            config.h.in \
-            gettext.h \
-            inttypes.h \
-            statvfs.h \
-            netdb.h
-
-CLEANFILES  = $(top_builddir)/include/apti18n.h \
-              $(top_builddir)/include/inttypes.h \
-              $(top_builddir)/include/sys/statvfs.h \
-              $(top_builddir)/include/netdb.h
-
-
-COPYHEADERS = copy-apti18n
-
-if NEED_INTTYPES_H
-COPYHEADERS += copy-inttypes
-endif
-if NEED_STATVFS_H
-COPYHEADERS += copy-statvfs
-endif
-if NEED_NETDB_H
-COPYHEADERS += copy-netdb
-endif
-
-copy-headers: $(COPYHEADERS)
-
-copy-apti18n:
-       @$(mkinstalldirs) $(top_builddir)/include
-       @echo "Copying gettext.h to $(top_builddir)/include/apti18n.h"
-       @cp -f -p $(srcdir)/gettext.h $(top_builddir)/include/apti18n.h
-       
-copy-inttypes:
-       @echo "Copying inttypes.h to $(top_builddir)/include/inttypes.h"
-       @cp -f -p $(srcdir)/inttypes.h $(top_builddir)/include/inttypes.h
-
-copy-statvfs:
-       @$(mkinstalldirs) $(top_builddir)/include/sys
-       @echo "Copying statvfs.h to $(top_builddir)/include/sys/statvfs.h"
-       @cp -f -p $(srcdir)/statvfs.h $(top_builddir)/include/sys/statvfs.h
-
-copy-netdb:
-       @echo "Copying netdb.h to $(top_builddir)/include/netdb.h"
-       @cp -f -p $(srcdir)/netdb.h $(top_builddir)/include/netdb.h
diff --git a/buildlib/Makefile.in b/buildlib/Makefile.in
deleted file mode 100644 (file)
index 191f7bd..0000000
+++ /dev/null
@@ -1,401 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@NEED_INTTYPES_H_TRUE@am__append_1 = copy-inttypes
-@NEED_STATVFS_H_TRUE@am__append_2 = copy-statvfs
-@NEED_NETDB_H_TRUE@am__append_3 = copy-netdb
-subdir = buildlib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in compile \
-       config.guess config.rpath config.sub depcomp install-sh \
-       ltmain.sh missing mkinstalldirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/buildlib/tools.m4 \
-       $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-       $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-       $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-       $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/buildlib/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-COMPILE_APTSHELL_FALSE = @COMPILE_APTSHELL_FALSE@
-COMPILE_APTSHELL_TRUE = @COMPILE_APTSHELL_TRUE@
-COMPILE_MANPAGES_FALSE = @COMPILE_MANPAGES_FALSE@
-COMPILE_MANPAGES_TRUE = @COMPILE_MANPAGES_TRUE@
-COMPILE_STATIC_FALSE = @COMPILE_STATIC_FALSE@
-COMPILE_STATIC_TRUE = @COMPILE_STATIC_TRUE@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOCBOOK2MAN = @DOCBOOK2MAN@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GLIBC_VER = @GLIBC_VER@
-GMSGFMT = @GMSGFMT@
-GPG = @GPG@
-HAVE_TIMEGM = @HAVE_TIMEGM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSTDCPP_VER = @LIBSTDCPP_VER@
-LIBTOOL = @LIBTOOL@
-LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
-LIBXML2_LIBS = @LIBXML2_LIBS@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NEED_INTTYPES_H_FALSE = @NEED_INTTYPES_H_FALSE@
-NEED_INTTYPES_H_TRUE = @NEED_INTTYPES_H_TRUE@
-NEED_NETDB_H_FALSE = @NEED_NETDB_H_FALSE@
-NEED_NETDB_H_TRUE = @NEED_NETDB_H_TRUE@
-NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
-NEED_STATVFS_H_FALSE = @NEED_STATVFS_H_FALSE@
-NEED_STATVFS_H_TRUE = @NEED_STATVFS_H_TRUE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-PTHREADLIB = @PTHREADLIB@
-RANLIB = @RANLIB@
-RPMLIBS = @RPMLIBS@
-RPM_PATH = @RPM_PATH@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SOCKETLIBS = @SOCKETLIBS@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WITH_LUA_FALSE = @WITH_LUA_FALSE@
-WITH_LUA_TRUE = @WITH_LUA_TRUE@
-XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-EXTRA_DIST = \
-            archtable \
-            ostable \
-            config.h.in \
-            gettext.h \
-            inttypes.h \
-            statvfs.h \
-            netdb.h
-
-CLEANFILES = $(top_builddir)/include/apti18n.h \
-              $(top_builddir)/include/inttypes.h \
-              $(top_builddir)/include/sys/statvfs.h \
-              $(top_builddir)/include/netdb.h
-
-COPYHEADERS = copy-apti18n $(am__append_1) $(am__append_2) \
-       $(am__append_3)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-               && exit 0; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  buildlib/Makefile'; \
-       cd $(top_srcdir) && \
-         $(AUTOMAKE) --foreign  buildlib/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-
-distclean-libtool:
-       -rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-       list='$(DISTFILES)'; for file in $$list; do \
-         case $$file in \
-           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-         esac; \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-           dir="/$$dir"; \
-           $(mkdir_p) "$(distdir)$$dir"; \
-         else \
-           dir=''; \
-         fi; \
-         if test -d $$d/$$file; then \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-           fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-         else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
-           || exit 1; \
-         fi; \
-       done
-check-am: all-am
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-       -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am all-local check check-am clean clean-generic \
-       clean-libtool distclean distclean-generic distclean-libtool \
-       distdir dvi dvi-am html html-am info info-am install \
-       install-am install-data install-data-am install-exec \
-       install-exec-am install-info install-info-am install-man \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       uninstall uninstall-am uninstall-info-am
-
-
-all-local: copy-headers
-
-copy-headers: $(COPYHEADERS)
-
-copy-apti18n:
-       @$(mkinstalldirs) $(top_builddir)/include
-       @echo "Copying gettext.h to $(top_builddir)/include/apti18n.h"
-       @cp -f -p $(srcdir)/gettext.h $(top_builddir)/include/apti18n.h
-
-copy-inttypes:
-       @echo "Copying inttypes.h to $(top_builddir)/include/inttypes.h"
-       @cp -f -p $(srcdir)/inttypes.h $(top_builddir)/include/inttypes.h
-
-copy-statvfs:
-       @$(mkinstalldirs) $(top_builddir)/include/sys
-       @echo "Copying statvfs.h to $(top_builddir)/include/sys/statvfs.h"
-       @cp -f -p $(srcdir)/statvfs.h $(top_builddir)/include/sys/statvfs.h
-
-copy-netdb:
-       @echo "Copying netdb.h to $(top_builddir)/include/netdb.h"
-       @cp -f -p $(srcdir)/netdb.h $(top_builddir)/include/netdb.h
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
index e7b75f8..ece783b 100644 (file)
@@ -199,13 +199,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
-NEED_INTTYPES_H_FALSE = @NEED_INTTYPES_H_FALSE@
-NEED_INTTYPES_H_TRUE = @NEED_INTTYPES_H_TRUE@
-NEED_NETDB_H_FALSE = @NEED_NETDB_H_FALSE@
-NEED_NETDB_H_TRUE = @NEED_NETDB_H_TRUE@
 NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
-NEED_STATVFS_H_FALSE = @NEED_STATVFS_H_FALSE@
-NEED_STATVFS_H_TRUE = @NEED_STATVFS_H_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
index ea7a6e6..09fb856 100755 (executable)
--- a/configure
+++ b/configure
@@ -465,7 +465,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SOCKETLIBS PTHREADLIB RPM_PATH RPMLIBS PKG_CONFIG ac_pt_PKG_CONFIG LIBXML2_CFLAGS LIBXML2_LIBS WITH_LUA_TRUE WITH_LUA_FALSE COMPILE_STATIC_TRUE COMPILE_STATIC_FALSE COMPILE_APTSHELL_TRUE COMPILE_APTSHELL_FALSE NEED_INTTYPES_H_TRUE NEED_INTTYPES_H_FALSE NEED_STATVFS_H_TRUE NEED_STATVFS_H_FALSE HAVE_TIMEGM NEED_SOCKLEN_T_DEFINE NEED_NETDB_H_TRUE NEED_NETDB_H_FALSE DOCBOOK2MAN COMPILE_MANPAGES_TRUE COMPILE_MANPAGES_FALSE GPG MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GLIBC_VER LIBSTDCPP_VER LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SOCKETLIBS PTHREADLIB RPM_PATH RPMLIBS PKG_CONFIG ac_pt_PKG_CONFIG LIBXML2_CFLAGS LIBXML2_LIBS WITH_LUA_TRUE WITH_LUA_FALSE COMPILE_STATIC_TRUE COMPILE_STATIC_FALSE COMPILE_APTSHELL_TRUE COMPILE_APTSHELL_FALSE HAVE_TIMEGM NEED_SOCKLEN_T_DEFINE DOCBOOK2MAN COMPILE_MANPAGES_TRUE COMPILE_MANPAGES_FALSE GPG MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GLIBC_VER LIBSTDCPP_VER LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
 echo "$as_me:$LINENO: result: $c9x_ints" >&5
 echo "${ECHO_T}$c9x_ints" >&6
 
-
-if test "$c9x_ints" = "no"; then
-  NEED_INTTYPES_H_TRUE=
-  NEED_INTTYPES_H_FALSE='#'
-else
-  NEED_INTTYPES_H_TRUE='#'
-  NEED_INTTYPES_H_FALSE=
-fi
-
-
 echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
 if test "${ac_cv_c_bigendian+set}" = set; then
 
 
 
-if test "$have_statvfs" != "yes"; then
-  NEED_STATVFS_H_TRUE=
-  NEED_STATVFS_H_FALSE='#'
-else
-  NEED_STATVFS_H_TRUE='#'
-  NEED_STATVFS_H_FALSE=
-fi
-
-
-
 
 
 
@@ -24218,16 +24198,6 @@ rm -f conftest*
 
 
 
-
-if test "$NEED_SOCKLEN_T_DEFINE" = "yes"; then
-  NEED_NETDB_H_TRUE=
-  NEED_NETDB_H_FALSE='#'
-else
-  NEED_NETDB_H_TRUE='#'
-  NEED_NETDB_H_FALSE=
-fi
-
-
 echo "$as_me:$LINENO: checking for h_errno" >&5
 echo $ECHO_N "checking for h_errno... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
@@ -26311,7 +26281,34 @@ echo "${ECHO_T}$LIBSTDCPP_VER" >&6
 
 
 
-                                                                                          ac_config_files="$ac_config_files Makefile buildlib/Makefile lua/Makefile apt-pkg/Makefile methods/Makefile cmdline/Makefile tools/Makefile doc/Makefile po/Makefile.in"
+                                                                                ac_config_files="$ac_config_files Makefile lua/Makefile apt-pkg/Makefile methods/Makefile cmdline/Makefile tools/Makefile doc/Makefile po/Makefile.in"
+
+          ac_config_links="$ac_config_links include/apti18n.h:buildlib/gettext.h"
+
+
+if test "$c9x_ints" = "no"; then
+
+          ac_config_links="$ac_config_links include/inttypes.h:buildlib/inttypes.h"
+
+
+fi
+
+
+if test "$have_statvfs" != "yes"; then
+
+          ac_config_links="$ac_config_links include/statvfs.h:buildlib/statvfs.h"
+
+
+fi
+
+
+if test "$NEED_SOCKLEN_T_DEFINE" = "yes"; then
+
+          ac_config_links="$ac_config_links include/netdb.h:buildlib/netdb.h"
+
+
+fi
+
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -26467,27 +26464,6 @@ echo "$as_me: error: conditional \"COMPILE_APTSHELL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${NEED_INTTYPES_H_TRUE}" && test -z "${NEED_INTTYPES_H_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"NEED_INTTYPES_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"NEED_INTTYPES_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${NEED_STATVFS_H_TRUE}" && test -z "${NEED_STATVFS_H_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"NEED_STATVFS_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"NEED_STATVFS_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${NEED_NETDB_H_TRUE}" && test -z "${NEED_NETDB_H_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"NEED_NETDB_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"NEED_NETDB_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${COMPILE_MANPAGES_TRUE}" && test -z "${COMPILE_MANPAGES_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"COMPILE_MANPAGES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -26821,6 +26797,9 @@ $config_files
 Configuration headers:
 $config_headers
 
+Configuration links:
+$config_links
+
 Configuration commands:
 $config_commands
 
@@ -26947,7 +26926,6 @@ do
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "buildlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES buildlib/Makefile" ;;
   "lua/Makefile" ) CONFIG_FILES="$CONFIG_FILES lua/Makefile" ;;
   "apt-pkg/Makefile" ) CONFIG_FILES="$CONFIG_FILES apt-pkg/Makefile" ;;
   "methods/Makefile" ) CONFIG_FILES="$CONFIG_FILES methods/Makefile" ;;
   "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
   "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+  "include/apti18n.h" ) CONFIG_LINKS="$CONFIG_LINKS include/apti18n.h:buildlib/gettext.h" ;;
+  "include/inttypes.h" ) CONFIG_LINKS="$CONFIG_LINKS include/inttypes.h:buildlib/inttypes.h" ;;
+  "include/statvfs.h" ) CONFIG_LINKS="$CONFIG_LINKS include/statvfs.h:buildlib/statvfs.h" ;;
+  "include/netdb.h" ) CONFIG_LINKS="$CONFIG_LINKS include/netdb.h:buildlib/netdb.h" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h:buildlib/config.h.in" ;;
@@ -26971,6 +26953,7 @@ done
 if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
@@ -27125,14 +27108,8 @@ s,@COMPILE_STATIC_TRUE@,$COMPILE_STATIC_TRUE,;t t
 s,@COMPILE_STATIC_FALSE@,$COMPILE_STATIC_FALSE,;t t
 s,@COMPILE_APTSHELL_TRUE@,$COMPILE_APTSHELL_TRUE,;t t
 s,@COMPILE_APTSHELL_FALSE@,$COMPILE_APTSHELL_FALSE,;t t
-s,@NEED_INTTYPES_H_TRUE@,$NEED_INTTYPES_H_TRUE,;t t
-s,@NEED_INTTYPES_H_FALSE@,$NEED_INTTYPES_H_FALSE,;t t
-s,@NEED_STATVFS_H_TRUE@,$NEED_STATVFS_H_TRUE,;t t
-s,@NEED_STATVFS_H_FALSE@,$NEED_STATVFS_H_FALSE,;t t
 s,@HAVE_TIMEGM@,$HAVE_TIMEGM,;t t
 s,@NEED_SOCKLEN_T_DEFINE@,$NEED_SOCKLEN_T_DEFINE,;t t
-s,@NEED_NETDB_H_TRUE@,$NEED_NETDB_H_TRUE,;t t
-s,@NEED_NETDB_H_FALSE@,$NEED_NETDB_H_FALSE,;t t
 s,@DOCBOOK2MAN@,$DOCBOOK2MAN,;t t
 s,@COMPILE_MANPAGES_TRUE@,$COMPILE_MANPAGES_TRUE,;t t
 s,@COMPILE_MANPAGES_FALSE@,$COMPILE_MANPAGES_FALSE,;t t
@@ -27639,6 +27616,144 @@ done
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF
 
+#
+# CONFIG_LINKS section.
+#
+
+for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+
+  { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_dest" >&5
+echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;}
+
+  if test ! -r $srcdir/$ac_source; then
+    { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5
+echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  rm -f $ac_dest
+
+  # Make relative symlinks.
+  ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null ||
+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$ac_dest" : 'X\(//\)[^/]' \| \
+        X"$ac_dest" : 'X\(//\)$' \| \
+        X"$ac_dest" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_dest" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dest_dir"
+  else
+    as_dir="$ac_dest_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$as_dir" : 'X\(//\)[^/]' \| \
+        X"$as_dir" : 'X\(//\)$' \| \
+        X"$as_dir" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dest_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dest_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+  ac_builddir=.
+
+if test "$ac_dest_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dest_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dest_dir";;
+*)
+  case "$ac_dest_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dest_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dest_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
+
+
+  case $srcdir in
+  [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;;
+      *) ac_rel_source=$ac_top_builddir$srcdir/$ac_source ;;
+  esac
+
+  # Try a symlink, then a hard link, then a copy.
+  ln -s $ac_rel_source $ac_dest 2>/dev/null ||
+    ln $srcdir/$ac_source $ac_dest 2>/dev/null ||
+    cp -p $srcdir/$ac_source $ac_dest ||
+    { { echo "$as_me:$LINENO: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&5
+echo "$as_me: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&2;}
+   { (exit 1); exit 1; }; }
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+
 #
 # CONFIG_COMMANDS section.
 #
index 4ddcfd7..fa67e5e 100644 (file)
@@ -171,7 +171,6 @@ AC_CACHE_CHECK([for C99 integer types],c9x_ints,[
     AC_TRY_COMPILE([#include <inttypes.h>],
                    [uint8_t Foo1;uint16_t Foo2;uint32_t Foo3;],
                   c9x_ints=yes,c9x_ints=no)])
-AM_CONDITIONAL(NEED_INTTYPES_H, test "$c9x_ints" = "no")
 
 AC_C_BIGENDIAN
 
@@ -185,7 +184,6 @@ AC_CHECK_SIZEOF(long)
 
 dnl Single Unix Spec statvfs
 AC_CHECK_FUNC(statvfs,[have_statvfs=yes])
-AM_CONDITIONAL(NEED_STATVFS_H, test "$have_statvfs" != "yes")
 
 dnl Arg, linux and bsd put their statfs function in different places
 AH_TEMPLATE(HAVE_VFS_H, [Define to 1 if sys/vfs.h is available])
@@ -210,7 +208,6 @@ AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[
        NEED_SOCKLEN_T_DEFINE=yes
         AC_MSG_RESULT(missing.)])
 AC_SUBST(NEED_SOCKLEN_T_DEFINE)
-AM_CONDITIONAL(NEED_NETDB_H, test "$NEED_SOCKLEN_T_DEFINE" = "yes")
 
 dnl HP-UX needs -d_XOPEN_SOURCE_EXTENDED for h_errno
 AC_MSG_CHECKING(for h_errno)
@@ -251,7 +248,6 @@ dnl ah_GCC3DEP
 
 AC_CONFIG_FILES([
          Makefile
-         buildlib/Makefile
          lua/Makefile
          apt-pkg/Makefile
          methods/Makefile
@@ -260,4 +256,18 @@ AC_CONFIG_FILES([
          doc/Makefile
          po/Makefile.in
          ])
+AC_CONFIG_LINKS([include/apti18n.h:buildlib/gettext.h])
+
+AS_IF([test "$c9x_ints" = "no"],[
+AC_CONFIG_LINKS([include/inttypes.h:buildlib/inttypes.h])
+])
+
+AS_IF([test "$have_statvfs" != "yes"],[
+AC_CONFIG_LINKS([include/statvfs.h:buildlib/statvfs.h])
+])
+
+AS_IF([test "$NEED_SOCKLEN_T_DEFINE" = "yes"],[
+AC_CONFIG_LINKS([include/netdb.h:buildlib/netdb.h])
+])
+
 AC_OUTPUT
index 1b53559..69a927f 100644 (file)
@@ -123,13 +123,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
-NEED_INTTYPES_H_FALSE = @NEED_INTTYPES_H_FALSE@
-NEED_INTTYPES_H_TRUE = @NEED_INTTYPES_H_TRUE@
-NEED_NETDB_H_FALSE = @NEED_NETDB_H_FALSE@
-NEED_NETDB_H_TRUE = @NEED_NETDB_H_TRUE@
 NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
-NEED_STATVFS_H_FALSE = @NEED_STATVFS_H_FALSE@
-NEED_STATVFS_H_TRUE = @NEED_STATVFS_H_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
index 345dfd9..302c063 100644 (file)
@@ -163,13 +163,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
-NEED_INTTYPES_H_FALSE = @NEED_INTTYPES_H_FALSE@
-NEED_INTTYPES_H_TRUE = @NEED_INTTYPES_H_TRUE@
-NEED_NETDB_H_FALSE = @NEED_NETDB_H_FALSE@
-NEED_NETDB_H_TRUE = @NEED_NETDB_H_TRUE@
 NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
-NEED_STATVFS_H_FALSE = @NEED_STATVFS_H_FALSE@
-NEED_STATVFS_H_TRUE = @NEED_STATVFS_H_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
index 9861230..bfc3a60 100644 (file)
@@ -192,13 +192,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
-NEED_INTTYPES_H_FALSE = @NEED_INTTYPES_H_FALSE@
-NEED_INTTYPES_H_TRUE = @NEED_INTTYPES_H_TRUE@
-NEED_NETDB_H_FALSE = @NEED_NETDB_H_FALSE@
-NEED_NETDB_H_TRUE = @NEED_NETDB_H_TRUE@
 NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
-NEED_STATVFS_H_FALSE = @NEED_STATVFS_H_FALSE@
-NEED_STATVFS_H_TRUE = @NEED_STATVFS_H_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
index 4e1f2c9..8957928 100644 (file)
@@ -166,13 +166,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
-NEED_INTTYPES_H_FALSE = @NEED_INTTYPES_H_FALSE@
-NEED_INTTYPES_H_TRUE = @NEED_INTTYPES_H_TRUE@
-NEED_NETDB_H_FALSE = @NEED_NETDB_H_FALSE@
-NEED_NETDB_H_TRUE = @NEED_NETDB_H_TRUE@
 NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
-NEED_STATVFS_H_FALSE = @NEED_STATVFS_H_FALSE@
-NEED_STATVFS_H_TRUE = @NEED_STATVFS_H_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@