commit 9673fbcd710b13fb06fee88ddb6d578701bfc32c
parent 5eca41802c5ea014692365963a800850bdad161a
Author: Christian Grothoff <christian@grothoff.org>
Date: Mon, 24 Dec 2007 06:04:06 +0000
fixing #1307
Diffstat:
4 files changed, 15 insertions(+), 81 deletions(-)
diff --git a/bootstrap b/bootstrap
@@ -1,10 +1,4 @@
#!/bin/sh
-export WANT_AUTOMAKE="1.8"
-export MKDIR_P="mkdir -p"
-export AUTOMAKE="automake-1.8"
-export ACLOCAL="aclocal-1.8"
-automake-1.8 -fi
-cd libltdl
-autoreconf -f -i
-cd ..
+aclocal
+automake
autoreconf -f -i
diff --git a/configure.ac b/configure.ac
@@ -10,16 +10,28 @@ AH_TOP([#define _GNU_SOURCE 1])
# Checks for programs.
AC_CANONICAL_HOST
+AC_PROG_AWK
AC_PROG_CC
AC_PROG_CPP
AC_PROG_CXX
AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
AM_CONDITIONAL(HAVE_CXX, test "x$HAVE_CXX" = "xyes")
-AC_PROG_MKDIR_P
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
+AC_LIBTOOL_DLOPEN
AC_DISABLE_STATIC
+AC_LIBTOOL_WIN32_DLL
+AC_LIBLTDL_INSTALLABLE
+AC_PROG_LIBTOOL
+AC_CONFIG_SUBDIRS(libltdl)
+AC_CANONICAL_HOST
+AC_LIB_LTDL
+AC_SUBST(LTDLINCL)
+AC_SUBST(LIBLTDL)
+AC_SUBST(MKDIR_P)
+
+
case "$host_os" in
linux*)
@@ -94,14 +106,6 @@ mingw*)
;;
esac
-AC_LIBTOOL_DLOPEN
-AC_LIBLTDL_INSTALLABLE
-AC_SUBST(LTDLINCL)
-AC_SUBST(LIBLTDL)
-AM_PROG_LIBTOOL
-AC_LIB_LTDL
-AC_CONFIG_SUBDIRS(libltdl)
-
AM_ICONV
# We define the paths here, because MinGW/GCC expands paths
diff --git a/m4/Makefile.am b/m4/Makefile.am
@@ -21,7 +21,6 @@ EXTRA_DIST = glibc2.m4 intl.m4 intldir.m4 lock.m4 visibility.m4 \
lib-prefix.m4 \
longdouble.m4 \
longlong.m4 \
- mkdirp.m4 \
nls.m4 \
pkg.m4 \
po.m4 \
diff --git a/m4/mkdirp.m4 b/m4/mkdirp.m4
@@ -1,63 +0,0 @@
-## -*- Autoconf -*-
-# Copyright (C) 2003, 2004, 2005 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.
-
-# AC_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake. There are at least two reasons why we must not
-# use `-m 0755':
-# - it causes special bits like SGID to be ignored,
-# - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out. Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AC_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
- else
- mkdir_p='$(install_sh) -d'
- fi
-fi
-AC_SUBST([mkdir_p])])
