From b990e60a01b99de500cbf6d7c7ff52221db46068 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 20 Aug 2008 15:22:02 +0200 Subject: [PATCH] configure: Require autoconf version 2.59d. --- configure.ac | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 290e802e897..2c11335fba6 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,8 @@ dnl See ChangeLog file for detailed change history. m4_define(WINE_VERSION,regexp(m4_include(VERSION),[version \([-.0-9A-Za-z]+\)],[\1])) -AC_PREREQ(2.53b) +dnl autoconf versions before 2.59d don't handle multi-line subst variables correctly +AC_PREREQ(2.59d) AC_INIT([Wine],[WINE_VERSION],[wine-devel@winehq.org]) AC_CONFIG_SRCDIR(server/atom.c) AC_CONFIG_HEADERS(include/config.h) @@ -1657,21 +1658,7 @@ esac dnl **** Generate output files **** -dnl autoconf versions before 2.59d need backslashes to escape newlines in subst variables -AC_SUBST(DEPENDENCIES,m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.59d]), -1, -["### Dependencies:\\ -\\ -.INIT: Makefile\\ -.BEGIN: Makefile\\ -Makefile: dummy\\ - -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)\\ -\\ -\$(OBJS): \$(IDL_GEN_HEADERS)\\ -\$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)\\ -\$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb)\\ -\$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)\\ -\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"], -["### Dependencies: +AC_SUBST(DEPENDENCIES,["### Dependencies: .INIT: Makefile .BEGIN: Makefile @@ -1682,7 +1669,7 @@ Makefile: dummy \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) -\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"])) +\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"]) AH_TOP([#define __WINE_CONFIG_H]) -- 2.11.4.GIT