mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-08 06:53:45 +00:00
ICU-7972 update to autoconf 2.67, remove unneeded .mk file
X-SVN-Rev: 28751
This commit is contained in:
parent
b7ca1b4068
commit
63e1b55fea
3 changed files with 2244 additions and 5979 deletions
8198
icu4c/source/configure
vendored
8198
icu4c/source/configure
vendored
File diff suppressed because it is too large
Load diff
|
@ -4,7 +4,7 @@ AC_COPYRIGHT([ Copyright (c) 1999-2010, International Business Machines Corporat
|
|||
# Stephen F. Booth, heavily modified by Yves and others
|
||||
|
||||
# Check for autoconf version
|
||||
AC_PREREQ(2.63)
|
||||
AC_PREREQ(2.67)
|
||||
|
||||
|
||||
# Process this file with autoconf to produce a configure script
|
||||
|
@ -86,6 +86,11 @@ AC_PROG_INSTALL
|
|||
|
||||
AC_SUBST(cross_compiling)
|
||||
|
||||
dnl use the pld hack to get ac_fn_cxx_try_link defined globally and not local
|
||||
AC_LANG_PUSH([C++])
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM()])
|
||||
AC_LANG_POP([C++])
|
||||
|
||||
# make sure install is relative to srcdir - if a script
|
||||
if test "$srcdir" = "."; then
|
||||
# If srcdir isn't just ., then (srcdir) is already prepended.
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
# Copyright (c) 2008-2010, International Business Machines Corporation and others. All Rights Reserved.
|
||||
#
|
||||
#
|
||||
# Makefile for regenerating configure in the face of a bad ^M
|
||||
# This should become unnecessary for autoconf past 2.63
|
||||
#
|
||||
# Usage: MAKE -f configure.mk configure
|
||||
|
||||
AUTOCONF=autoconf
|
||||
all: configure common/icucfg.h.in
|
||||
|
||||
common/icucfg.h.in: configure.in
|
||||
autoheader
|
||||
|
||||
configure: configure.in ./aclocal.m4
|
||||
( $(AUTOCONF) && mv configure configure.tmp && sed -e 's%^ac_cr=.*%ac_cr=`echo X |tr X "\\015"`%' < configure.tmp > configure && chmod a+rx $@ && rm configure.tmp ) || ( rm $@ ; "echo configure build failed" ; /usr/bin/false )
|
||||
|
||||
-include configure-local.mk
|
Loading…
Add table
Reference in a new issue