From: =?utf-8?q?Guido_G=C3=BCnther?= Date: Wed, 21 Dec 2011 22:43:13 +0100 Subject: Remove GNUmakefile links since it breaks the out of tree build --- configure | 11 ----------- configure.ac | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/configure b/configure index 9e779d3..7e8162d 100755 --- a/configure +++ b/configure @@ -12015,17 +12015,6 @@ cat >>confdefs.h <<_ACEOF #define VERSION_MICRO $VERSION_MICRO _ACEOF - -# Autoconf 2.61a.99 and earlier don't support linking a file only -# in VPATH builds. But since GNUmakefile is for maintainer use -# only, it does not matter if we skip the link with older autoconf. -# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH -# builds, so use a shell variable to bypass this. -GNUmakefile=GNUmakefile -ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" - - - case $ac_cv_prog_cc_stdc in #( no) : ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #( diff --git a/configure.ac b/configure.ac index ff38b17..3568a2b 100644 --- a/configure.ac +++ b/configure.ac @@ -56,17 +56,6 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], [$VERSION_MAJOR], [Major version number of p AC_DEFINE_UNQUOTED([VERSION_MINOR], [$VERSION_MINOR], [Minor version number of package]) AC_DEFINE_UNQUOTED([VERSION_MICRO], [$VERSION_MICRO], [Micro version number of package]) -# Autoconf 2.61a.99 and earlier don't support linking a file only -# in VPATH builds. But since GNUmakefile is for maintainer use -# only, it does not matter if we skip the link with older autoconf. -# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH -# builds, so use a shell variable to bypass this. -GNUmakefile=GNUmakefile -m4_if(m4_version_compare([2.61a.100], - m4_defn([m4_PACKAGE_VERSION])), [1], [], - [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], - [GNUmakefile=$GNUmakefile])]) - dnl ******************************************************************************* dnl Setup core compilers / build helpers dnl *******************************************************************************