From 444176e8aa3a958f147f15542793678b619be262 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 28 Oct 2013 16:33:41 +0100 Subject: fix host build stuff and update-patches, convert cifs-utils and libaudiofile to new autotool infrastructure --- mk/buildhlp.mk | 8 +- mk/host-bottom.mk | 69 +- mk/host.mk | 13 +- mk/package.mk | 9 +- mk/pkg-bottom.mk | 27 +- mk/vars.mk | 1 + package/Makefile | 6 + package/cifs-utils/Makefile | 2 + package/cifs-utils/patches/autotools.patch | 7192 -- package/cifs-utils/patches/patch-Makefile_am | 46 + package/cifs-utils/patches/patch-cifs_idmap_c | 16 + package/cifs-utils/patches/patch-cifs_upcall_c | 16 + package/cifs-utils/patches/patch-cifscreds_c | 16 + package/cifs-utils/patches/patch-configure_ac | 33 + package/cifs-utils/patches/patch-getcifsacl_c | 16 + package/cifs-utils/patches/patch-mount_cifs_c | 16 + package/cifs-utils/patches/patch-mtab_c | 10 + package/cifs-utils/src/gnu_getopt.c | 656 + package/cifs-utils/src/gnu_getopt.h | 70 + package/file/Makefile | 1 + package/glib/Makefile | 2 +- package/libaudiofile/Makefile | 5 +- .../patches/001-audiofile-config-libdirs.patch | 13 - package/libaudiofile/patches/autotool.patch | 71516 ------------------- .../libaudiofile/patches/patch-audiofile-config_in | 13 + package/libtool/Makefile | 6 +- package/ncurses/Makefile | 1 + package/python/Makefile | 63 - package/python/patches/patch-Makefile_pre_in | 118 - .../python/patches/patch-Modules__io__iomodule_h | 14 - package/python/patches/patch-configure | 27 - package/python/patches/patch-setup_py | 84 - package/ruby/Makefile | 1 + scripts/scan-pkgs.sh | 33 - scripts/scan-tools.sh | 6 +- scripts/update-patches | 11 + target/Makefile | 2 +- tools/adk/pkgmaker.c | 7 +- 38 files changed, 1021 insertions(+), 79124 deletions(-) delete mode 100644 package/cifs-utils/patches/autotools.patch create mode 100644 package/cifs-utils/patches/patch-Makefile_am create mode 100644 package/cifs-utils/patches/patch-cifs_idmap_c create mode 100644 package/cifs-utils/patches/patch-cifs_upcall_c create mode 100644 package/cifs-utils/patches/patch-cifscreds_c create mode 100644 package/cifs-utils/patches/patch-configure_ac create mode 100644 package/cifs-utils/patches/patch-getcifsacl_c create mode 100644 package/cifs-utils/patches/patch-mount_cifs_c create mode 100644 package/cifs-utils/patches/patch-mtab_c create mode 100644 package/cifs-utils/src/gnu_getopt.c create mode 100644 package/cifs-utils/src/gnu_getopt.h delete mode 100644 package/libaudiofile/patches/001-audiofile-config-libdirs.patch delete mode 100644 package/libaudiofile/patches/autotool.patch create mode 100644 package/libaudiofile/patches/patch-audiofile-config_in delete mode 100644 package/python/Makefile delete mode 100644 package/python/patches/patch-Makefile_pre_in delete mode 100644 package/python/patches/patch-Modules__io__iomodule_h delete mode 100644 package/python/patches/patch-configure delete mode 100644 package/python/patches/patch-setup_py diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 19b761f46..8b6a4a8c8 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -93,13 +93,17 @@ ifeq ($(strip ${_IN_PACKAGE})$(strip ${_IN_CVTC}),1) else @$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PREVENT_PATCH=: NO_CHECKSUM=1 endif + @-test -r ${WRKDIR}/.autoreconf_done && \ + (cd ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}; \ + env ${AUTOTOOL_ENV} autoreconf -if) + @rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache @# restore config.sub/config.guess - @for i in $$(find ${WRKDIR} -name config.sub);do \ + @for i in $$(find ${WRKDIR}.orig -name config.sub);do \ if [ -f $$i.bak ];then \ mv $$i.bak $$i; \ fi;\ done - @for i in $$(find ${WRKDIR} -name config.guess);do \ + @for i in $$(find ${WRKDIR}.orig -name config.guess);do \ if [ -f $$i.bak ];then \ mv $$i.bak $$i; \ fi;\ diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 072254087..327883a95 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -5,35 +5,39 @@ host-extract: ${_HOST_PATCH_COOKIE} host-configure: ${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE} - #@sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \ - #tsort | while read f; do \ - # cd ${WRKSRC}; \ - # case $$f in \ - # /*) \ - # find . -name "$${f#/}" -print | while read i; do \ - # touch "$$i"; \ - # done;; \ - # *) \ - # if test -e "$$f" ; then \ - # touch "$$f"; \ - # fi;; \ - # esac; \ - #done - @mkdir -p ${WRKBUILD} - @$(CMD_TRACE) "configuring... " - @cd ${WRKBUILD}; \ - for i in $$(find . -name config.sub);do \ - if [ -f $$i ]; then \ - ${CP} $$i $$i.bak; \ - ${CP} ${SCRIPT_DIR}/config.sub $$i; \ - fi; \ - done; \ - for i in $$(find . -name config.guess);do \ - if [ -f $$i ]; then \ + @mkdir -p ${WRKBUILD} + @$(CMD_TRACE) "host configuring... " + @cd ${WRKBUILD}; \ + for i in $$(find . -name config.sub);do \ + if [ -f $$i ]; then \ ${CP} $$i $$i.bak; \ - ${CP} ${SCRIPT_DIR}/config.guess $$i; \ + ${CP} ${SCRIPT_DIR}/config.sub $$i; \ fi; \ + done; \ + for i in $$(find . -name config.guess);do \ + if [ -f $$i ]; then \ + ${CP} $$i $$i.bak; \ + ${CP} ${SCRIPT_DIR}/config.guess $$i; \ + fi; \ done; +ifneq ($(filter auto,${HOST_STYLE}),) + cd ${WRKBUILD}; rm -f config.{cache,status}; \ + env ${HOST_CONFIGURE_ENV} \ + ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ + --program-prefix= \ + --program-suffix= \ + --prefix=${STAGING_HOST_DIR}/usr \ + --bindir=${STAGING_HOST_DIR}/usr/bin \ + --datadir=${STAGING_HOST_DIR}/usr/share \ + --mandir=${STAGING_HOST_DIR}/usr/share/man \ + --libexecdir=${STAGING_HOST_DIR}/usr/libexec \ + --sysconfdir=${STAGING_HOST_DIR}/etc \ + --disable-dependency-tracking \ + --disable-libtool-lock \ + --disable-nls \ + ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) + +else cd ${WRKBUILD}; rm -f config.{cache,status}; \ env ${HOST_CONFIGURE_ENV} \ ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ @@ -50,11 +54,12 @@ ${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE} --disable-libtool-lock \ --disable-nls \ ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) +endif touch $@ host-build: ${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE} - @$(CMD_TRACE) "compiling... " + @$(CMD_TRACE) "host compiling... " cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) touch $@ @@ -62,16 +67,24 @@ ${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE} hpkg-install: ${ALL_HOSTINST} host-install: ${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE} + @$(CMD_TRACE) "host installing... " +ifneq ($(filter auto,${HOST_STYLE}),) + cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) +else cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ DESTDIR='${HOST_WRKINST}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE) +endif rm -rf ${WRKBUILD} ${WRKDIST} ${WRKSRC} exec ${MAKE} host-extract $(MAKE_TRACE) + mkdir -p ${HOST_WRKINST} touch $@ + # avoid rebuild + touch ${_HOST_BUILD_COOKIE} ${_HOST_CONFIGURE_COOKIE} ${_HOST_COOKIE}: exec ${MAKE} hostpackage hostpackage: ${ALL_HOSTDIRS} touch ${_HOST_COOKIE} - diff --git a/mk/host.mk b/mk/host.mk index f9326da17..855adf0d1 100644 --- a/mk/host.mk +++ b/mk/host.mk @@ -1,7 +1,9 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -HOST_CONFIGURE_ENV+= CONFIG_SHELL='$(strip ${SHELL})' \ +HOST_CONFIGURE_ENV+= AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \ + CONFIG_SHELL='$(strip ${SHELL})' \ + PATH='${TARGET_PATH}' \ CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \ CXXFLAGS='$(strip ${CXXFLAGS_FOR_BUILD})' \ CPPFLAGS='$(strip ${CPPFLAGS_FOR_BUILD})' \ @@ -25,8 +27,8 @@ HOST_WRKINST= ${WRKDIR}/host _HOST_EXTRACT_COOKIE= ${WRKDIST}/.extract_done _HOST_PATCH_COOKIE= ${WRKDIST}/.prepared -_HOST_CONFIGURE_COOKIE= ${WRKBUILD}/.host_configure_done -_HOST_BUILD_COOKIE= ${WRKBUILD}/.host_build_done +_HOST_CONFIGURE_COOKIE= ${WRKDIR}/.host_configure_done +_HOST_BUILD_COOKIE= ${WRKDIR}/.host_build_done _HOST_FAKE_COOKIE= ${HOST_WRKINST}/.host_fake_done _HOST_COOKIE= ${PACKAGE_DIR}/.stamps/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE}-host @@ -46,11 +48,12 @@ define HOST_template ALL_PKGOPTS+= $(1) PKGNAME_$(1)= $(2) HOSTDIR_$(1)= $(WRKDIR)/host -ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) ALL_HOSTDIRS+= $${HOSTDIR_$(1)} ALL_HOSTINST+= $(2)-hostinstall -endif $$(HOSTDIR_$(1)): ${_HOST_PATCH_COOKIE} ${_HOST_FAKE_COOKIE} endef + +.PHONY: all hostextract hostpatch hostconfigure \ + hostbuild hostpackage hostfake diff --git a/mk/package.mk b/mk/package.mk index b74e8ec5b..8eae35938 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -10,7 +10,14 @@ CONFIGURE_ARGS+= --enable-debug endif endif +AUTOTOOL_ENV+= AUTOM4TE='${STAGING_HOST_DIR}/usr/bin/autom4te' \ + M4='${STAGING_HOST_DIR}/usr/bin/m4' \ + LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \ + PATH='${AUTOTOOL_PATH}' + CONFIGURE_ENV+= GCC_HONOUR_COPTS=s \ + AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \ + M4='${STAGING_HOST_DIR}/usr/bin/m4' \ PATH='${TARGET_PATH}' \ CONFIG_SHELL='$(strip ${SHELL})' \ CFLAGS='$(strip ${TARGET_CFLAGS})' \ @@ -258,7 +265,7 @@ ifeq (,$(filter noremove,$(7))) done <'$${STAGING_PKG_DIR}/$(1)'; \ fi endif - rm -f '$${STAGING_PKG_DIR}/$(1)' + @rm -f '$${STAGING_PKG_DIR}/$(1)' $$(INFO_$(1)): $$(IPKG_$(1)) $(PKG_INSTALL) $$(IPKG_$(1)) diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index f0af93810..bf8ed4ea3 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -11,27 +11,17 @@ # * if you have a style -> define a pre-foo: and post-foo: if they # are required, but the do-foo: magic is done here -REORDER_DEPENDENCIES= ${TOPDIR}/scripts/automake.dep PKG_LIBNAME?= $(PKG_NAME) pre-configure: do-configure: post-configure: -${_CONFIGURE_COOKIE}: ${_HOST_COOKIE} ${_PATCH_COOKIE} - @sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \ - tsort | while read f; do \ - cd ${WRKSRC}; \ - case $$f in \ - /*) \ - find . -name "$${f#/}" -print | while read i; do \ - touch "$$i"; \ - done;; \ - *) \ - if test -e "$$f" ; then \ - touch "$$f"; \ - fi;; \ - esac; \ - done +${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE} +ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE})) + cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoreconf -if + rm -rf ${WRKSRC}/autom4te.cache + touch ${WRKDIR}/.autoreconf_done +endif mkdir -p ${WRKBUILD} @${MAKE} pre-configure $(MAKE_TRACE) @@ -109,7 +99,6 @@ post-build: ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE} @env ${MAKE_ENV} ${MAKE} pre-build $(MAKE_TRACE) @$(CMD_TRACE) "compiling... " - ifneq ($(filter manual,${BUILD_STYLE}),) env ${MAKE_ENV} ${MAKE} do-build $(MAKE_TRACE) else ifeq ($(strip ${BUILD_STYLE}),) @@ -127,7 +116,7 @@ do-install: post-install: spkg-install: ${ALL_POSTINST} ${_FAKE_COOKIE}: ${_BUILD_COOKIE} - -rm -f ${_ALL_CONTROLS} + @-rm -f ${_ALL_CONTROLS} @mkdir -p '${STAGING_PKG_DIR}' ${WRKINST} '${STAGING_DIR}/scripts' @${MAKE} ${_ALL_CONTROLS} $(MAKE_TRACE) @env ${MAKE_ENV} ${MAKE} pre-install $(MAKE_TRACE) @@ -222,6 +211,7 @@ ${_IPKGS_COOKIE}: exec ${MAKE} package package: ${ALL_IPKGS} +ifneq ($(DEVELOPER),) @cd ${WRKDIR}/fake-${CPU_ARCH} || exit 1; \ y=; sp=; for x in ${ALL_IDIRS}; do \ y="$$y$$sp$${x#$(WRKDIR)/fake-${CPU_ARCH}/}"; \ @@ -257,6 +247,7 @@ package: ${ALL_IPKGS} ln=$$name; \ li=$$inode; \ done +endif touch ${_IPKGS_COOKIE} clean-targets: clean-dev-generic diff --git a/mk/vars.mk b/mk/vars.mk index 8e147b23d..dad3d939a 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -44,6 +44,7 @@ PACKAGE_DIR:= $(BIN_DIR)/packages TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC} TARGET_DIR_PFX:= $(BASE_DIR)/root_* TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} +AUTOTOOL_PATH= ${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux diff --git a/package/Makefile b/package/Makefile index 112fe66c0..f6f608a69 100644 --- a/package/Makefile +++ b/package/Makefile @@ -60,6 +60,12 @@ endif $(CMD_TRACE) " done" $(END_TRACE) +%-host-compile: + $(START_TRACE) "package/$(patsubst %-host-compile,%,$@)-host-compile: " + $(MAKE) -C $(patsubst %-host-compile,%,$@) hostpackage + $(CMD_TRACE) " done" + $(END_TRACE) + %-compile: $(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: " $(MAKE) -C $(patsubst %-compile,%,$@) fake build-all-pkgs diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile index 306b027ca..1abda4ba1 100644 --- a/package/cifs-utils/Makefile +++ b/package/cifs-utils/Makefile @@ -10,6 +10,7 @@ PKG_MD5SUM:= f83ef48ab1154aa74dd4cf1c1202bf04 PKG_DESCR:= CIFS utilities PKG_SECTION:= net/fs PKG_DEPENDS:= kmod-cifs kmod-nls-utf8 +PKG_BUILDDEP:= autotool PKG_URL:= https://wiki.samba.org/index.php/LinuxCIFS_utils PKG_SITES:= ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/ @@ -23,6 +24,7 @@ ifeq ($(ADK_STATIC),y) TARGET_LDFLAGS+= -static endif +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --disable-cifsupcall \ --disable-cifsidmap \ --disable-cifsacl \ diff --git a/package/cifs-utils/patches/autotools.patch b/package/cifs-utils/patches/autotools.patch deleted file mode 100644 index a1056a12d..000000000 --- a/package/cifs-utils/patches/autotools.patch +++ /dev/null @@ -1,7192 +0,0 @@ -diff -Nur cifs-utils-6.1.orig/aclocal.m4 cifs-utils-6.1/aclocal.m4 ---- cifs-utils-6.1.orig/aclocal.m4 2013-07-02 21:20:30.000000000 +0200 -+++ cifs-utils-6.1/aclocal.m4 2013-10-05 18:12:37.000000000 +0200 -@@ -1,7 +1,8 @@ --# generated automatically by aclocal 1.12.2 -*- Autoconf -*- -- --# Copyright (C) 1996-2012 Free Software Foundation, Inc. -+# generated automatically by aclocal 1.11.6 -*- Autoconf -*- - -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -+# Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -17,48 +18,7 @@ - [m4_warning([this file was generated for autoconf 2.69. - You have another version of autoconf. It may work, but is not guaranteed to. - If you have problems, you may need to regenerate the build system entirely. --To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -- --# libcap-ng.m4 - Checks for the libcap-ng support --# Copyright (c) 2009 Steve Grubb sgrubb@redhat.com --# --AC_DEFUN([LIBCAP_NG_PATH], --[ -- AC_ARG_WITH(libcap-ng, -- [ --with-libcap-ng=[auto/yes/no] Add Libcap-ng support [default=auto]],, -- with_libcap_ng=auto) -- -- # Check for Libcap-ng API -- # -- # libcap-ng detection -- -- if test x$with_libcap_ng = xno ; then -- have_libcap_ng=no; -- else -- # Start by checking for header file -- AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no) -- -- # See if we have libcap-ng library -- AC_CHECK_LIB(cap-ng, capng_clear, -- CAPNG_LDADD=-lcap-ng,) -- -- # Check results are usable -- if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then -- AC_MSG_ERROR(libcap-ng support was requested and the library was not found) -- fi -- if test x$CAPNG_LDADD != x -a $capng_headers = no ; then -- AC_MSG_ERROR(libcap-ng libraries found but headers are missing) -- fi -- fi -- AC_SUBST(CAPNG_LDADD) -- AC_MSG_CHECKING(whether to use libcap-ng) -- if test x$CAPNG_LDADD != x ; then -- AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support]) -- AC_MSG_RESULT(yes) -- else -- AC_MSG_RESULT(no) -- fi --]) -+To do so, use the procedure documented by the package, typically `autoreconf'.])]) - - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- - # serial 1 (pkg-config-0.24) -@@ -220,53 +180,14 @@ - fi[]dnl - ])# PKG_CHECK_MODULES - -- --# PKG_INSTALLDIR(DIRECTORY) --# ------------------------- --# Substitutes the variable pkgconfigdir as the location where a module --# should install pkg-config .pc files. By default the directory is --# $libdir/pkgconfig, but the default can be changed by passing --# DIRECTORY. The user can override through the --with-pkgconfigdir --# parameter. --AC_DEFUN([PKG_INSTALLDIR], --[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) --m4_pushdef([pkg_description], -- [pkg-config installation directory @<:@]pkg_default[@:>@]) --AC_ARG_WITH([pkgconfigdir], -- [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, -- [with_pkgconfigdir=]pkg_default) --AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) --m4_popdef([pkg_default]) --m4_popdef([pkg_description]) --]) dnl PKG_INSTALLDIR -- -- --# PKG_NOARCH_INSTALLDIR(DIRECTORY) --# ------------------------- --# Substitutes the variable noarch_pkgconfigdir as the location where a --# module should install arch-independent pkg-config .pc files. By --# default the directory is $datadir/pkgconfig, but the default can be --# changed by passing DIRECTORY. The user can override through the --# --with-noarch-pkgconfigdir parameter. --AC_DEFUN([PKG_NOARCH_INSTALLDIR], --[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) --m4_pushdef([pkg_description], -- [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) --AC_ARG_WITH([noarch-pkgconfigdir], -- [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, -- [with_noarch_pkgconfigdir=]pkg_default) --AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) --m4_popdef([pkg_default]) --m4_popdef([pkg_description]) --]) dnl PKG_NOARCH_INSTALLDIR -- --# Copyright (C) 2002-2012 Free Software Foundation, Inc. -+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -+# Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 8 -+# serial 1 - - # AM_AUTOMAKE_VERSION(VERSION) - # ---------------------------- -@@ -274,10 +195,10 @@ - # generated from the m4 files accompanying Automake X.Y. - # (This private macro should not be called outside this file.) - AC_DEFUN([AM_AUTOMAKE_VERSION], --[am__api_version='1.12' -+[am__api_version='1.11' - dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to - dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.12.2], [], -+m4_if([$1], [1.11.6], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - -@@ -293,24 +214,24 @@ - # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.12.2])dnl -+[AM_AUTOMAKE_VERSION([1.11.6])dnl - m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl - _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - - # AM_AUX_DIR_EXPAND -*- Autoconf -*- - --# Copyright (C) 2001-2012 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 2 -+# serial 1 - - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets --# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to --# '$srcdir', '$srcdir/..', or '$srcdir/../..'. -+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -+# `$srcdir', `$srcdir/..', or `$srcdir/../..'. - # - # Of course, Automake must honor this variable whenever it calls a - # tool from the auxiliary directory. The problem is that $srcdir (and -@@ -329,7 +250,7 @@ - # - # The reason of the latter failure is that $top_srcdir and $ac_aux_dir - # are both prefixed by $srcdir. In an in-source build this is usually --# harmless because $srcdir is '.', but things will broke when you -+# harmless because $srcdir is `.', but things will broke when you - # start a VPATH build or use an absolute $srcdir. - # - # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -@@ -355,21 +276,22 @@ - - # AM_CONDITIONAL -*- Autoconf -*- - --# Copyright (C) 1997-2012 Free Software Foundation, Inc. -+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -+# Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 10 -+# serial 9 - - # AM_CONDITIONAL(NAME, SHELL-CONDITION) - # ------------------------------------- - # Define a conditional. - AC_DEFUN([AM_CONDITIONAL], --[AC_PREREQ([2.52])dnl -- m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -+[AC_PREREQ(2.52)dnl -+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl - AC_SUBST([$1_TRUE])dnl - AC_SUBST([$1_FALSE])dnl - _AM_SUBST_NOTMAKE([$1_TRUE])dnl -@@ -388,15 +310,16 @@ - Usually this means the macro was only invoked conditionally.]]) - fi])]) - --# Copyright (C) 1999-2012 Free Software Foundation, Inc. -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -+# 2010, 2011 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 17 -+# serial 12 - --# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be -+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be - # written in clear, in which case automake, when reading aclocal.m4, - # will think it sees a *use*, and therefore will trigger all it's - # C support machinery. Also note that it means that autoscan, seeing -@@ -406,7 +329,7 @@ - # _AM_DEPENDENCIES(NAME) - # ---------------------- - # See how the compiler implements dependency checking. --# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". -+# NAME is "CC", "CXX", "GCJ", or "OBJC". - # We try a few techniques and use that to set a single cache variable. - # - # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -@@ -419,13 +342,12 @@ - AC_REQUIRE([AM_MAKE_INCLUDE])dnl - AC_REQUIRE([AM_DEP_TRACK])dnl - --m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], -- [$1], [CXX], [depcc="$CXX" am_compiler_list=], -- [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -- [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], -- [$1], [UPC], [depcc="$UPC" am_compiler_list=], -- [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -- [depcc="$$1" am_compiler_list=]) -+ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -+ [$1], CXX, [depcc="$CXX" am_compiler_list=], -+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -+ [$1], UPC, [depcc="$UPC" am_compiler_list=], -+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -+ [depcc="$$1" am_compiler_list=]) - - AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -@@ -433,8 +355,8 @@ - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named 'D' -- because '-MD' means "put the output -- # in D". -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're -@@ -474,16 +396,16 @@ - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with -- # Solaris 10 /bin/sh. -- echo '/* dummy */' > sub/conftst$i.h -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- # We check with '-c' and '-o' for the sake of the "dashmstdout" -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly -- # handle '-M -o', and we need to detect this. Also, some Intel -- # versions had trouble with output in subdirs. -+ # handle `-M -o', and we need to detect this. Also, some Intel -+ # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in -@@ -492,8 +414,8 @@ - test "$am__universal" = false || continue - ;; - nosideeffect) -- # After this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested. -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else -@@ -501,7 +423,7 @@ - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) -- # This compiler won't grok '-c -o', but also, the minuso test has -+ # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} -@@ -549,7 +471,7 @@ - # AM_SET_DEPDIR - # ------------- - # Choose a directory name for dependency files. --# This macro is AC_REQUIREd in _AM_DEPENDENCIES. -+# This macro is AC_REQUIREd in _AM_DEPENDENCIES - AC_DEFUN([AM_SET_DEPDIR], - [AC_REQUIRE([AM_SET_LEADING_DOT])dnl - AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -@@ -559,13 +481,9 @@ - # AM_DEP_TRACK - # ------------ - AC_DEFUN([AM_DEP_TRACK], --[AC_ARG_ENABLE([dependency-tracking], [dnl --AS_HELP_STRING( -- [--enable-dependency-tracking], -- [do not reject slow dependency extractors]) --AS_HELP_STRING( -- [--disable-dependency-tracking], -- [speeds up one-time build])]) -+[AC_ARG_ENABLE(dependency-tracking, -+[ --disable-dependency-tracking speeds up one-time build -+ --enable-dependency-tracking do not reject slow dependency extractors]) - if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -@@ -580,13 +498,14 @@ - - # Generate code to set up dependency tracking. -*- Autoconf -*- - --# Copyright (C) 1999-2012 Free Software Foundation, Inc. -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -+# Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 6 -+#serial 5 - - # _AM_OUTPUT_DEPENDENCY_COMMANDS - # ------------------------------ -@@ -605,7 +524,7 @@ - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. -- # We used to match only the files named 'Makefile.in', but -+ # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. -@@ -617,19 +536,21 @@ - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote -- # from the Makefile without running 'make'. -+ # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -+ # When using ansi2knr, U may be empty or an underscore; expand it -+ U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` -@@ -647,7 +568,7 @@ - # This macro should only be invoked once -- use via AC_REQUIRE. - # - # This code is only required when automatic dependency tracking --# is enabled. FIXME. This creates each '.P' file that we will -+# is enabled. FIXME. This creates each `.P' file that we will - # need in order to bootstrap the dependency handling code. - AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], - [AC_CONFIG_COMMANDS([depfiles], -@@ -657,13 +578,14 @@ - - # Do all the work for Automake. -*- Autoconf -*- - --# Copyright (C) 1996-2012 Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 19 -+# serial 16 - - # This macro actually does too much. Some checks are only needed if - # your package does certain things. But this isn't really a big deal. -@@ -709,41 +631,31 @@ - # Define the identity of the package. - dnl Distinguish between old-style and new-style calls. - m4_ifval([$2], --[AC_DIAGNOSE([obsolete], --[$0: two- and three-arguments forms are deprecated. For more info, see: --http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) --m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], - [_AM_SET_OPTIONS([$1])dnl - dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. --m4_if( -- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), -- [ok:ok],, -+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - - _AM_IF_OPTION([no-define],, --[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) -- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl -+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - - # Some tools Automake needs. - AC_REQUIRE([AM_SANITY_CHECK])dnl - AC_REQUIRE([AC_ARG_PROGRAM])dnl --AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) --AM_MISSING_PROG([AUTOCONF], [autoconf]) --AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) --AM_MISSING_PROG([AUTOHEADER], [autoheader]) --AM_MISSING_PROG([MAKEINFO], [makeinfo]) -+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -+AM_MISSING_PROG(AUTOCONF, autoconf) -+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -+AM_MISSING_PROG(AUTOHEADER, autoheader) -+AM_MISSING_PROG(MAKEINFO, makeinfo) - AC_REQUIRE([AM_PROG_INSTALL_SH])dnl - AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl --AC_REQUIRE([AC_PROG_MKDIR_P])dnl --# For better backward compatibility. To be removed once Automake 1.9.x --# dies out for good. For more background, see: --# --# --AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -+AC_REQUIRE([AM_PROG_MKDIR_P])dnl - # We need awk for the "check" target. The system "awk" is bad on - # some platforms. - AC_REQUIRE([AC_PROG_AWK])dnl -@@ -754,35 +666,28 @@ - [_AM_PROG_TAR([v7])])]) - _AM_IF_OPTION([no-dependencies],, - [AC_PROVIDE_IFELSE([AC_PROG_CC], -- [_AM_DEPENDENCIES([CC])], -- [m4_define([AC_PROG_CC], -- m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl -+ [_AM_DEPENDENCIES(CC)], -+ [define([AC_PROG_CC], -+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl - AC_PROVIDE_IFELSE([AC_PROG_CXX], -- [_AM_DEPENDENCIES([CXX])], -- [m4_define([AC_PROG_CXX], -- m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl -+ [_AM_DEPENDENCIES(CXX)], -+ [define([AC_PROG_CXX], -+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl - AC_PROVIDE_IFELSE([AC_PROG_OBJC], -- [_AM_DEPENDENCIES([OBJC])], -- [m4_define([AC_PROG_OBJC], -- m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl --dnl Support for Objective C++ was only introduced in Autoconf 2.65, --dnl but we still cater to Autoconf 2.62. --m4_ifdef([AC_PROG_OBJCXX], --[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], -- [_AM_DEPENDENCIES([OBJCXX])], -- [m4_define([AC_PROG_OBJCXX], -- m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl -+ [_AM_DEPENDENCIES(OBJC)], -+ [define([AC_PROG_OBJC], -+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl - ]) - _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl --dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the --dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro - dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. - AC_CONFIG_COMMANDS_PRE(dnl - [m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl - ]) - --dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not - dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further - dnl mangled by Autoconf and run in a shell conditional statement. - m4_define([_AC_COMPILER_EXEEXT], -@@ -810,13 +715,14 @@ - done - echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - --# Copyright (C) 2001-2012 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -+# Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 8 -+# serial 1 - - # AM_PROG_INSTALL_SH - # ------------------ -@@ -831,9 +737,9 @@ - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac - fi --AC_SUBST([install_sh])]) -+AC_SUBST(install_sh)]) - --# Copyright (C) 2003-2012 Free Software Foundation, Inc. -+# Copyright (C) 2003, 2005 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -856,13 +762,13 @@ - - # Check to see how 'make' treats includes. -*- Autoconf -*- - --# Copyright (C) 2001-2012 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 5 -+# serial 4 - - # AM_MAKE_INCLUDE() - # ----------------- -@@ -881,7 +787,7 @@ - _am_result=none - # First try GNU make style include. - echo "include confinc" > confmf --# Ignore all kinds of additional output from 'make'. -+# Ignore all kinds of additional output from `make'. - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=include -@@ -906,7 +812,8 @@ - rm -f confinc confmf - ]) - --# Copyright (C) 1999-2012 Free Software Foundation, Inc. -+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -+# Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -942,13 +849,14 @@ - - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - --# Copyright (C) 1997-2012 Free Software Foundation, Inc. -+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -+# Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 7 -+# serial 6 - - # AM_MISSING_PROG(NAME, PROGRAM) - # ------------------------------ -@@ -978,19 +886,49 @@ - am_missing_run="$MISSING --run " - else - am_missing_run= -- AC_MSG_WARN(['missing' script is too old or missing]) -+ AC_MSG_WARN([`missing' script is too old or missing]) - fi - ]) - -+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -+# Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 1 -+ -+# AM_PROG_MKDIR_P -+# --------------- -+# Check for `mkdir -p'. -+AC_DEFUN([AM_PROG_MKDIR_P], -+[AC_PREREQ([2.60])dnl -+AC_REQUIRE([AC_PROG_MKDIR_P])dnl -+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -+dnl while keeping a definition of mkdir_p for backward compatibility. -+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -+dnl Makefile.ins that do not define MKDIR_P, so we do our own -+dnl adjustment using top_builddir (which is defined more often than -+dnl MKDIR_P). -+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -+case $mkdir_p in -+ [[\\/$]]* | ?:[[\\/]]*) ;; -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -+esac -+]) -+ - # Helper functions for option handling. -*- Autoconf -*- - --# Copyright (C) 2001-2012 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -+# Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 6 -+# serial 5 - - # _AM_MANGLE_OPTION(NAME) - # ----------------------- -@@ -1001,7 +939,7 @@ - # -------------------- - # Set option NAME. Presently that only means defining a flag for this option. - AC_DEFUN([_AM_SET_OPTION], --[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) -+[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - - # _AM_SET_OPTIONS(OPTIONS) - # ------------------------ -@@ -1017,18 +955,22 @@ - - # Check to make sure that the build environment is sane. -*- Autoconf -*- - --# Copyright (C) 1996-2012 Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -+# Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 9 -+# serial 5 - - # AM_SANITY_CHECK - # --------------- - AC_DEFUN([AM_SANITY_CHECK], - [AC_MSG_CHECKING([whether build environment is sane]) -+# Just in case -+sleep 1 -+echo timestamp > conftest.file - # Reject unsafe characters in $srcdir or the absolute working directory - # name. Accept space and tab only in the latter. - am_lf=' -@@ -1039,40 +981,32 @@ - esac - case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) -- AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; -+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; - esac - --# Do 'set' in a subshell so we don't clobber the current shell's -+# Do `set' in a subshell so we don't clobber the current shell's - # arguments. Must try -L first in case configure is actually a - # symlink; some systems play weird games with the mod time of symlinks - # (eg FreeBSD returns the mod time of the symlink's containing - # directory). - if ( -- am_has_slept=no -- for am_try in 1 2; do -- echo "timestamp, slept: $am_has_slept" > conftest.file -- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` -- if test "$[*]" = "X"; then -- # -L didn't work. -- set X `ls -t "$srcdir/configure" conftest.file` -- fi -- if test "$[*]" != "X $srcdir/configure conftest.file" \ -- && test "$[*]" != "X conftest.file $srcdir/configure"; then -- -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -- alias in your environment]) -- fi -- if test "$[2]" = conftest.file || test $am_try -eq 2; then -- break -- fi -- # Just in case. -- sleep 1 -- am_has_slept=yes -- done -+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` -+ if test "$[*]" = "X"; then -+ # -L didn't work. -+ set X `ls -t "$srcdir/configure" conftest.file` -+ fi -+ rm -f conftest.file -+ if test "$[*]" != "X $srcdir/configure conftest.file" \ -+ && test "$[*]" != "X conftest.file $srcdir/configure"; then -+ -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". -+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -+alias in your environment]) -+ fi -+ - test "$[2]" = conftest.file - ) - then -@@ -1082,55 +1016,39 @@ - AC_MSG_ERROR([newly created file is older than distributed files! - Check your system clock]) - fi --AC_MSG_RESULT([yes]) --# If we didn't sleep, we still need to ensure time stamps of config.status and --# generated files are strictly newer. --am_sleep_pid= --if grep 'slept: no' conftest.file >/dev/null 2>&1; then -- ( sleep 1 ) & -- am_sleep_pid=$! --fi --AC_CONFIG_COMMANDS_PRE( -- [AC_MSG_CHECKING([that generated files are newer than configure]) -- if test -n "$am_sleep_pid"; then -- # Hide warnings about reused PIDs. -- wait $am_sleep_pid 2>/dev/null -- fi -- AC_MSG_RESULT([done])]) --rm -f conftest.file --]) -+AC_MSG_RESULT(yes)]) - --# Copyright (C) 2001-2012 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 2 -+# serial 1 - - # AM_PROG_INSTALL_STRIP - # --------------------- --# One issue with vendor 'install' (even GNU) is that you can't -+# One issue with vendor `install' (even GNU) is that you can't - # specify the program used to strip binaries. This is especially - # annoying in cross-compiling environments, where the build's strip - # is unlikely to handle the host's binaries. - # Fortunately install-sh will honor a STRIPPROG variable, so we --# always use install-sh in "make install-strip", and initialize -+# always use install-sh in `make install-strip', and initialize - # STRIPPROG with the value of the STRIP variable (set by the user). - AC_DEFUN([AM_PROG_INSTALL_STRIP], - [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl --# Installed binaries are usually stripped using 'strip' when the user --# run "make install-strip". However 'strip' might not be the right -+# Installed binaries are usually stripped using `strip' when the user -+# run `make install-strip'. However `strip' might not be the right - # tool to use in cross-compilation environments, therefore Automake --# will honor the 'STRIP' environment variable to overrule this program. --dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. -+# will honor the `STRIP' environment variable to overrule this program. -+dnl Don't test for $cross_compiling = yes, because it might be `maybe'. - if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) - fi - INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - AC_SUBST([INSTALL_STRIP_PROGRAM])]) - --# Copyright (C) 2006-2012 Free Software Foundation, Inc. -+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -1151,18 +1069,18 @@ - - # Check how to create a tarball. -*- Autoconf -*- - --# Copyright (C) 2004-2012 Free Software Foundation, Inc. -+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 3 -+# serial 2 - - # _AM_PROG_TAR(FORMAT) - # -------------------- - # Check how to create a tarball in format FORMAT. --# FORMAT should be one of 'v7', 'ustar', or 'pax'. -+# FORMAT should be one of `v7', `ustar', or `pax'. - # - # Substitute a variable $(am__tar) that is a command - # writing to stdout a FORMAT-tarball containing the directory -@@ -1185,7 +1103,7 @@ - _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' - _am_tools=${am_cv_prog_tar_$1-$_am_tools} - # Do not fold the above two line into one, because Tru64 sh and --# Solaris sh will not grok spaces in the rhs of '-'. -+# Solaris sh will not grok spaces in the rhs of `-'. - for _am_tool in $_am_tools - do - case $_am_tool in -diff -Nur cifs-utils-6.1.orig/autom4te.cache/output.0 cifs-utils-6.1/autom4te.cache/output.0 ---- cifs-utils-6.1.orig/autom4te.cache/output.0 2013-07-02 21:20:30.000000000 +0200 -+++ cifs-utils-6.1/autom4te.cache/output.0 2013-10-05 18:12:37.000000000 +0200 -@@ -626,7 +626,6 @@ - am__EXEEXT_TRUE - LTLIBOBJS - LIBCAP --CAPNG_LDADD - CONFIG_PLUGIN_FALSE - CONFIG_PLUGIN_TRUE - CONFIG_CIFSACL_FALSE -@@ -646,14 +645,6 @@ - RELRO_CFLAGS - PIE_CFLAGS - RT_LDADD --host_os --host_vendor --host_cpu --host --build_os --build_vendor --build_cpu --build - LIB@&t@OBJS - SED - EGREP -@@ -751,7 +742,6 @@ - enable_systemd - with_idmap_plugin - enable_dependency_tracking --with_libcap_ng - with_libcap - ' - ac_precious_vars='build_alias -@@ -1370,10 +1360,6 @@ - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names -- --System types: -- --build=BUILD configure for building on BUILD [guessed] -- --host=HOST cross-compile to build programs to run on HOST [BUILD] - _ACEOF - fi - -@@ -1396,10 +1382,8 @@ - --enable-cifsacl Create get/set cifsacl binary @<:@default=yes@:>@ - --enable-systemd Enable systemd specific behavior for mount.cifs - @<:@default=yes@:>@ -- --enable-dependency-tracking -- do not reject slow dependency extractors -- --disable-dependency-tracking -- speeds up one-time build -+ --disable-dependency-tracking speeds up one-time build -+ --enable-dependency-tracking do not reject slow dependency extractors - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -1408,7 +1392,6 @@ - Define the path to the plugin that the idmapping - infrastructure should use - @<:@default=/etc/cifs-utils/idmap-plugin@:>@ -- --with-libcap-ng=auto/yes/no Add Libcap-ng support default=auto - --with-libcap Add libcap support default=yes, if libcap-ng not available - - Some influential environment variables: -@@ -2323,7 +2306,7 @@ - - - --am__api_version='1.12' -+am__api_version='1.11' - - ac_aux_dir= - for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -@@ -2449,6 +2432,9 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 - $as_echo_n "checking whether build environment is sane... " >&6; } -+# Just in case -+sleep 1 -+echo timestamp > conftest.file - # Reject unsafe characters in $srcdir or the absolute working directory - # name. Accept space and tab only in the latter. - am_lf=' -@@ -2459,40 +2445,32 @@ - esac - case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) -- as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; -+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; - esac - --# Do 'set' in a subshell so we don't clobber the current shell's -+# Do `set' in a subshell so we don't clobber the current shell's - # arguments. Must try -L first in case configure is actually a - # symlink; some systems play weird games with the mod time of symlinks - # (eg FreeBSD returns the mod time of the symlink's containing - # directory). - if ( -- am_has_slept=no -- for am_try in 1 2; do -- echo "timestamp, slept: $am_has_slept" > conftest.file -- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` -- if test "$*" = "X"; then -- # -L didn't work. -- set X `ls -t "$srcdir/configure" conftest.file` -- fi -- if test "$*" != "X $srcdir/configure conftest.file" \ -- && test "$*" != "X conftest.file $srcdir/configure"; then -+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` -+ if test "$*" = "X"; then -+ # -L didn't work. -+ set X `ls -t "$srcdir/configure" conftest.file` -+ fi -+ rm -f conftest.file -+ if test "$*" != "X $srcdir/configure conftest.file" \ -+ && test "$*" != "X conftest.file $srcdir/configure"; then -+ -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". -+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -+alias in your environment" "$LINENO" 5 -+ fi - -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -- alias in your environment" "$LINENO" 5 -- fi -- if test "$2" = conftest.file || test $am_try -eq 2; then -- break -- fi -- # Just in case. -- sleep 1 -- am_has_slept=yes -- done - test "$2" = conftest.file - ) - then -@@ -2504,16 +2482,6 @@ - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } --# If we didn't sleep, we still need to ensure time stamps of config.status and --# generated files are strictly newer. --am_sleep_pid= --if grep 'slept: no' conftest.file >/dev/null 2>&1; then -- ( sleep 1 ) & -- am_sleep_pid=$! --fi -- --rm -f conftest.file -- - test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" - # Use a double $ so make ignores it. -@@ -2540,8 +2508,8 @@ - am_missing_run="$MISSING --run " - else - am_missing_run= -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 --$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} - fi - - if test x"${install_sh}" != xset; then -@@ -2553,10 +2521,10 @@ - esac - fi - --# Installed binaries are usually stripped using 'strip' when the user --# run "make install-strip". However 'strip' might not be the right -+# Installed binaries are usually stripped using `strip' when the user -+# run `make install-strip'. However `strip' might not be the right - # tool to use in cross-compilation environments, therefore Automake --# will honor the 'STRIP' environment variable to overrule this program. -+# will honor the `STRIP' environment variable to overrule this program. - if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -2695,6 +2663,12 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 - $as_echo "$MKDIR_P" >&6; } - -+mkdir_p="$MKDIR_P" -+case $mkdir_p in -+ [\\/$]* | ?:[\\/]*) ;; -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -+esac -+ - for ac_prog in gawk mawk nawk awk - do - # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -2827,12 +2801,6 @@ - - MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - --# For better backward compatibility. To be removed once Automake 1.9.x --# dies out for good. For more background, see: --# --# --mkdir_p='$(MKDIR_P)' -- - # We need awk for the "check" target. The system "awk" is bad on - # some platforms. - # Always define AMTAR for backward compatibility. Yes, it's still used -@@ -3735,7 +3703,7 @@ - _am_result=none - # First try GNU make style include. - echo "include confinc" > confmf --# Ignore all kinds of additional output from 'make'. -+# Ignore all kinds of additional output from `make'. - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=include -@@ -3791,8 +3759,8 @@ - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named 'D' -- because '-MD' means "put the output -- # in D". -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're -@@ -3827,16 +3795,16 @@ - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with -- # Solaris 10 /bin/sh. -- echo '/* dummy */' > sub/conftst$i.h -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- # We check with '-c' and '-o' for the sake of the "dashmstdout" -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly -- # handle '-M -o', and we need to detect this. Also, some Intel -- # versions had trouble with output in subdirs. -+ # handle `-M -o', and we need to detect this. Also, some Intel -+ # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in -@@ -3845,8 +3813,8 @@ - test "$am__universal" = false || continue - ;; - nosideeffect) -- # After this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested. -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else -@@ -3854,7 +3822,7 @@ - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) -- # This compiler won't grok '-c -o', but also, the minuso test has -+ # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} -@@ -4827,346 +4795,76 @@ - fi - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 --$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } --if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- rm -f conftest.sym conftest.file --echo >conftest.file --if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then -- if test "$cross_compiling" = yes; then : -- ac_cv_func_lstat_dereferences_slashed_symlink=no --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --struct stat sbuf; -- /* Linux will dereference the symlink and fail, as required by POSIX. -- That is better in the sense that it means we will not -- have to compile and use the lstat wrapper. */ -- return lstat ("conftest.sym/", &sbuf) == 0; -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- ac_cv_func_lstat_dereferences_slashed_symlink=yes --else -- ac_cv_func_lstat_dereferences_slashed_symlink=no --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi - --else -- # If the `ln -s' command failed, then we probably don't even -- # have an lstat function. -- ac_cv_func_lstat_dereferences_slashed_symlink=no --fi --rm -f conftest.sym conftest.file -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 --$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } -- --test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && -- --cat >>confdefs.h <<_ACEOF --@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 --_ACEOF -- -- --if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then -- case " $LIB@&t@OBJS " in -- *" lstat.$ac_objext "* ) ;; -- *) LIB@&t@OBJS="$LIB@&t@OBJS lstat.$ac_objext" -- ;; --esac -- --fi -- --for ac_header in stdlib.h -+# check for required functions -+for ac_func in alarm atexit endpwent getmntent getpass gettimeofday inet_ntop malloc memset realloc realpath setenv strchr strcmp strdup strerror strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul tolower uname - do : -- ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" --if test "x$ac_cv_header_stdlib_h" = xyes; then : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF --@%:@define HAVE_STDLIB_H 1 -+@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - --fi -- --done -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 --$as_echo_n "checking for GNU libc compatible malloc... " >&6; } --if ${ac_cv_func_malloc_0_nonnull+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then : -- ac_cv_func_malloc_0_nonnull=no - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#if defined STDC_HEADERS || defined HAVE_STDLIB_H --# include --#else --char *malloc (); --#endif -- --int --main () --{ --return ! malloc (0); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- ac_cv_func_malloc_0_nonnull=yes --else -- ac_cv_func_malloc_0_nonnull=no --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 --$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } --if test $ac_cv_func_malloc_0_nonnull = yes; then : -- --$as_echo "@%:@define HAVE_MALLOC 1" >>confdefs.h -- --else -- $as_echo "@%:@define HAVE_MALLOC 0" >>confdefs.h -- -- case " $LIB@&t@OBJS " in -- *" malloc.$ac_objext "* ) ;; -- *) LIB@&t@OBJS="$LIB@&t@OBJS malloc.$ac_objext" -- ;; --esac -- -- --$as_echo "@%:@define malloc rpl_malloc" >>confdefs.h -- -+ as_fn_error $? "necessary functions(s) not found" "$LINENO" 5 - fi -+done - - --for ac_header in stdlib.h -+for ac_func in getopt_long - do : -- ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" --if test "x$ac_cv_header_stdlib_h" = xyes; then : -+ ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long" -+if test "x$ac_cv_func_getopt_long" = xyes; then : - cat >>confdefs.h <<_ACEOF --@%:@define HAVE_STDLIB_H 1 -+@%:@define HAVE_GETOPT_LONG 1 - _ACEOF - -+else -+ as_fn_error $? "getopt_long function not found" "$LINENO" 5 - fi -- - done - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5 --$as_echo_n "checking for GNU libc compatible realloc... " >&6; } --if ${ac_cv_func_realloc_0_nonnull+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then : -- ac_cv_func_realloc_0_nonnull=no --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if getopt_long is GNU specific" >&5 -+$as_echo_n "checking if getopt_long is GNU specific... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#if defined STDC_HEADERS || defined HAVE_STDLIB_H --# include --#else --char *realloc (); --#endif - -+#include -+#ifndef __GLIBC__ -+#error No GNU extension -+#endif -+ - int - main () - { --return ! realloc (0, 0); -+; - ; - return 0; - } -+ - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- ac_cv_func_realloc_0_nonnull=yes --else -- ac_cv_func_realloc_0_nonnull=no --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 --$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; } --if test $ac_cv_func_realloc_0_nonnull = yes; then : -+if ac_fn_c_try_cpp "$LINENO"; then : - --$as_echo "@%:@define HAVE_REALLOC 1" >>confdefs.h -- --else -- $as_echo "@%:@define HAVE_REALLOC 0" >>confdefs.h -- -- case " $LIB@&t@OBJS " in -- *" realloc.$ac_objext "* ) ;; -- *) LIB@&t@OBJS="$LIB@&t@OBJS realloc.$ac_objext" --