From 975202345851dde638829f4eee8537bb660d7b92 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 26 Dec 2001 17:38:30 +0000 Subject: [PATCH] * m4/multi.m4: Fix quoting in AC_OUTPUT_COMMANDS. --- ChangeLog | 4 ++++ m4/multi.m4 | 15 +++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3859e6..12fab1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-12-26 Ralf Corsepius + + * m4/multi.m4: Fix quoting in AC_OUTPUT_COMMANDS. + 2001-12-26 Alexandre Duret-Lutz * configure.in: Test for Autoconf >= 2.52. diff --git a/m4/multi.m4 b/m4/multi.m4 index 7442ae4..016c3b5 100644 --- a/m4/multi.m4 +++ b/m4/multi.m4 @@ -1,9 +1,3 @@ -# serial 2 - -# AM_ENABLE_MULTILIB([MAKEFILE], [REL-TO-TOP-SRCDIR]) -# --------------------------------------------------- -# Add --enable-multilib to configure. - # Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -21,6 +15,11 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. +# serial 3 + +# AM_ENABLE_MULTILIB([MAKEFILE], [REL-TO-TOP-SRCDIR]) +# --------------------------------------------------- +# Add --enable-multilib to configure. AC_DEFUN([AM_ENABLE_MULTILIB], [# Default to --enable-multilib AC_ARG_ENABLE(multilib, @@ -51,8 +50,8 @@ AC_OUTPUT_COMMANDS([ # Only add multilib support code if we just rebuilt the top-level # Makefile. case " $CONFIG_FILES " in - *" ifelse([$1],,Makefile,[$1]) "*) - ac_file=ifelse([$1],,Makefile,[$1]) . ${multi_basedir}/config-ml.in + *" ]m4_default([$1],Makefile)[ "*) + ac_file=]m4_default([$1],Makefile)[ . ${multi_basedir}/config-ml.in ;; esac], [ -- 2.7.4