mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-01-12 14:06:37 +08:00
General cleanup of autoconf-2.50 upgrade:
* configure.ac: Mark as needing autoconf-mode in emacs. Pass arguments to AC_INIT. * cdemo/configure.ac: Ditto. * demo/configure.ac: Ditto. * depdemo/configure.ac: Ditto. * libtldl/configure.ac: Ditto. * mdemo/configure.ac: Ditto. * pdemo/configure.ac: Ditto. * tagdemo/configure.ac: Ditto. * ltdl.m4: Mark as needing autoconf-mode in emacs. * libtool.m4: Mark as needing autoconf-mode in emacs. Don't add () to AS_MESSAGE_LOG_FD. * libltdl/configure.ac: Use config-h.in as template for config.h. * tagdemo/configure.ac: Drop the AC_DIAGNOSTIC. Move AC_LANG([C++]) after the OBJEXT/EXEEXT check.
This commit is contained in:
Tim Van Holder
Gary V. Vaughan
parent
ab6753a139
commit
4925d0771e
21
ChangeLog
21
ChangeLog
@ -1,3 +1,24 @@
|
||||
2001-06-29 Tim Van Holder <tim.van.holder@pandora.be>
|
||||
|
||||
General cleanup of autoconf-2.50 upgrade:
|
||||
* configure.ac: Mark as needing autoconf-mode in
|
||||
emacs. Pass arguments to AC_INIT.
|
||||
* cdemo/configure.ac: Ditto.
|
||||
* demo/configure.ac: Ditto.
|
||||
* depdemo/configure.ac: Ditto.
|
||||
* libtldl/configure.ac: Ditto.
|
||||
* mdemo/configure.ac: Ditto.
|
||||
* pdemo/configure.ac: Ditto.
|
||||
* tagdemo/configure.ac: Ditto.
|
||||
* ltdl.m4: Mark as needing autoconf-mode in
|
||||
emacs.
|
||||
* libtool.m4: Mark as needing autoconf-mode in
|
||||
emacs. Don't add () to AS_MESSAGE_LOG_FD.
|
||||
* libltdl/configure.ac: Use config-h.in as
|
||||
template for config.h.
|
||||
* tagdemo/configure.ac: Drop the AC_DIAGNOSTIC. Move
|
||||
AC_LANG([C++]) after the OBJEXT/EXEEXT check.
|
||||
|
||||
2001-06-29 Gary V. Vaughan <gary@gnu.org>
|
||||
|
||||
From Tim Van Holder <tim.van.holder@pandora.be>
|
||||
|
||||
4
README
4
README
@ -61,6 +61,10 @@ NOTE: Libtool has only been tested with the Siemens C-compiler and
|
||||
an old version of gcc provided by Marco Walther you can find on
|
||||
ftp://ftp.mch.sni.de/sni/mr/pd/gnu/gcc/gcc.2.7.2.3 on Reliant Unix.
|
||||
|
||||
NOTE: libtool.m4, ltdl.m4 and the configure.ac files are marked to use
|
||||
autoconf-mode, which is distributed with GNU Emacs 21, and all recent
|
||||
releases of XEmacs.
|
||||
|
||||
Libtool's home page is:
|
||||
|
||||
http://www.gnu.org/software/libtool/libtool.html
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
dnl Process this file with autoconf to create configure.
|
||||
dnl Process this file with autoconf to create configure. -*-Autoconf-*-
|
||||
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT
|
||||
AC_INIT(cdemo, 0.1)
|
||||
AC_CONFIG_SRCDIR([main.c])
|
||||
AM_INIT_AUTOMAKE(cdemo,0.1)
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
## Process this file with autoconf to create configure.
|
||||
## Process this file with autoconf to create configure. -*- autoconf -*-
|
||||
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT
|
||||
AC_INIT([libtool], [1.4a], [bug-libtool@gnu.org])
|
||||
AC_CONFIG_SRCDIR([ltmain.in])
|
||||
|
||||
AM_INIT_AUTOMAKE(libtool, 1.4a)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
dnl Process this file with autoconf to create configure.
|
||||
dnl Process this file with autoconf to create configure. -*-Autoconf-*-
|
||||
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT
|
||||
AC_INIT(hell, 1.0)
|
||||
AC_CONFIG_SRCDIR([hello.c])
|
||||
AM_INIT_AUTOMAKE(hell,1.0)
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
dnl Process this file with autoconf to create configure.
|
||||
dnl Process this file with autoconf to create configure. -*-Autoconf-*-
|
||||
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT
|
||||
AC_INIT(depdemo, 0.1)
|
||||
AC_CONFIG_SRCDIR([main.c])
|
||||
AM_INIT_AUTOMAKE(depdemo,0.1)
|
||||
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
dnl Process this file with autoconf to create configure.
|
||||
dnl Process this file with autoconf to create configure. -*- autoconf -*-
|
||||
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT(ltdl.c)
|
||||
AC_INIT(libltdl, 1.1)
|
||||
AC_CONFIG_SRCDIR(ltdl.c)
|
||||
|
||||
dnl We shouldn't be using these internal macros of autoconf,
|
||||
dnl but CONFIG_AUX_DIR($with_auxdir) breaks automake.
|
||||
@ -23,7 +24,7 @@ if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then
|
||||
fi
|
||||
|
||||
AM_INIT_AUTOMAKE(libltdl,1.1,-)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
AM_CONFIG_HEADER(config.h:config-h.in)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
AC_PROG_CC
|
||||
@ -38,8 +39,3 @@ AC_LIB_LTDL
|
||||
|
||||
dnl Output the makefile
|
||||
AC_OUTPUT(Makefile)
|
||||
|
||||
# Local Variables:
|
||||
# mode:shell-script
|
||||
# sh-indentation:2
|
||||
# End:
|
||||
|
||||
17
libtool.m4
vendored
17
libtool.m4
vendored
@ -1,4 +1,4 @@
|
||||
# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
|
||||
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
||||
## Copyright 1996, 1997, 1998, 1999, 2000, 2001
|
||||
## Free Software Foundation, Inc.
|
||||
## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||
@ -24,7 +24,6 @@
|
||||
|
||||
# serial 47 AC_PROG_LIBTOOL
|
||||
|
||||
# The next line was added by Bruno Haible 2001-06-28.
|
||||
builtin([undefine],[symbols])
|
||||
|
||||
# AC_PROG_LIBTOOL
|
||||
@ -486,7 +485,7 @@ AC_DEFUN(AC_LIBTOOL_COMPILER_OPTION,
|
||||
# So say no if there are warnings
|
||||
if test -s conftest.err; then
|
||||
# Append any errors to the config.log.
|
||||
cat conftest.err 1>&AS_MESSAGE_LOG_FD()
|
||||
cat conftest.err 1>&AS_MESSAGE_LOG_FD
|
||||
else
|
||||
$2=yes
|
||||
fi
|
||||
@ -518,7 +517,7 @@ AC_DEFUN(AC_LIBTOOL_LINKER_OPTION,
|
||||
# So say no if there are warnings
|
||||
if test -s conftest.err; then
|
||||
# Append any errors to the config.log.
|
||||
cat conftest.err 1>&AS_MESSAGE_LOG_FD()
|
||||
cat conftest.err 1>&AS_MESSAGE_LOG_FD
|
||||
else
|
||||
$2=yes
|
||||
fi
|
||||
@ -802,7 +801,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
|
||||
# So say no if there are warnings
|
||||
if test -s out/conftest.err; then
|
||||
# Append any errors to the config.log.
|
||||
cat out/conftest.err 1>&AS_MESSAGE_LOG_FD()
|
||||
cat out/conftest.err 1>&AS_MESSAGE_LOG_FD
|
||||
else
|
||||
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
|
||||
fi
|
||||
@ -3627,16 +3626,16 @@ EOF
|
||||
LIBS="$lt_save_LIBS"
|
||||
CFLAGS="$lt_save_CFLAGS"
|
||||
else
|
||||
echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD()
|
||||
echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
|
||||
fi
|
||||
else
|
||||
echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD()
|
||||
echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
|
||||
fi
|
||||
else
|
||||
echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD()
|
||||
echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
|
||||
fi
|
||||
else
|
||||
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD()
|
||||
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
|
||||
cat conftest.$ac_ext >&5
|
||||
fi
|
||||
rm -f conftest* conftst*
|
||||
|
||||
2
ltdl.m4
2
ltdl.m4
@ -1,4 +1,4 @@
|
||||
## ltdl.m4 - Configure ltdl for the target system. -*-Shell-script-*-
|
||||
## ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
|
||||
## Copyright (C) 1999-2000 Free Software Foundation, Inc.
|
||||
##
|
||||
## This program is free software; you can redistribute it and/or modify
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
dnl Process this file with autoconf to create configure.
|
||||
dnl Process this file with autoconf to create configure. -*-Autoconf-*-
|
||||
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT
|
||||
AC_INIT(mdemo, 0.1)
|
||||
AC_CONFIG_SRCDIR([main.c])
|
||||
AM_INIT_AUTOMAKE(mdemo,0.1)
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
dnl Process this file with autoconf to create configure.
|
||||
dnl Process this file with autoconf to create configure. -*-Autoconf-*-
|
||||
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT
|
||||
AC_INIT(hell, 1.0)
|
||||
AC_CONFIG_SRCDIR([longer_file_name_hello.c])
|
||||
AM_INIT_AUTOMAKE(hell,1.0)
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
dnl
|
||||
dnl -*-Autoconf-*-
|
||||
dnl $Id$
|
||||
|
||||
dnl
|
||||
@ -7,8 +7,9 @@ dnl application.
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl
|
||||
|
||||
|
||||
AC_INIT
|
||||
AC_PREREQ(2.50)
|
||||
dnl Can't use $PACKAGE/$VERSION here
|
||||
AC_INIT(foo, 0.1)
|
||||
AC_CONFIG_SRCDIR([foo.cpp])dnl
|
||||
|
||||
dnl Check what platform we are running on.
|
||||
@ -18,8 +19,7 @@ dnl Cause GNU Automake to initialize the state of things and run
|
||||
dnl some sanity checks
|
||||
PACKAGE=foo
|
||||
VERSION=0.1
|
||||
|
||||
AM_INIT_AUTOMAKE("$PACKAGE", "$VERSION", DUMMY)dnl
|
||||
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
|
||||
|
||||
dnl Check the C compiler and preprocessor.
|
||||
AC_PROG_CC
|
||||
@ -30,9 +30,6 @@ dnl Check the C++ compiler and preprocessor.
|
||||
AC_PROG_CXX
|
||||
AC_PROG_CXXCPP
|
||||
|
||||
dnl Set the test language to C++.
|
||||
AC_LANG([C++])
|
||||
|
||||
# As of the writing of this demo, GNU Autoconf's AC_OBJEXT and
|
||||
# AC_EXEEXT macros only works for C compilers!
|
||||
# Libtool's setup macro calls AC_OBJEXT and AC_EXEEXT without setting
|
||||
@ -40,9 +37,6 @@ AC_LANG([C++])
|
||||
# called so that the proper values are cached beforehand. We also do
|
||||
# it before any linker flags (LDFLAGS) are set so that C++ specific
|
||||
# ones don't break the tests.
|
||||
AC_DIAGNOSE([obsolete],[instead of using `AC_LANG', `AC_LANG_SAVE',
|
||||
and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.])
|
||||
|
||||
AC_LANG_PUSH([C])
|
||||
AC_OBJEXT
|
||||
AC_EXEEXT
|
||||
@ -50,6 +44,9 @@ AC_LANG_POP
|
||||
|
||||
dnl Setup Libtool
|
||||
|
||||
dnl Set the test language to C++.
|
||||
AC_LANG([C++])
|
||||
|
||||
dnl Check for libtool and turn on Automake processing for Libtool
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
@ -58,10 +55,6 @@ AC_CHECK_HEADERS(math.h)
|
||||
AC_CHECK_LIBM
|
||||
AC_SUBST(LIBM)
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
])
|
||||
AC_CONFIG_COMMANDS([default],[[
|
||||
echo "Done configuring package $PACKAGE"
|
||||
]],[[]])
|
||||
AC_CONFIG_FILES(Makefile)
|
||||
AC_CONFIG_COMMANDS([default], [[echo "Done configuring package $PACKAGE"]])
|
||||
AC_OUTPUT
|
||||
|
||||
Loading…
Reference in New Issue
Block a user