mirror of
git://git.sv.gnu.org/autoconf
synced 2025-01-18 10:45:15 +08:00
Give an identity to `configure' scripts.
* acgeneral.m4 (AC_PACKAGE): New macro. (_AC_COPYRIGHT_SEPARATOR): Remove. (AC_COPYRIGHT): Adjust. (_AC_INIT_HELP, _AC_INIT_VERSION): Name the package you configure when you want. (_AC_INIT): Adjust. * configure.in (AC_PACKAGE): Add.
This commit is contained in:
Akim Demaille
parent
25a01c40c0
commit
264330cef7
12
ChangeLog
12
ChangeLog
@ -10,6 +10,18 @@
|
||||
|
||||
2000-03-20 Akim Demaille <akim@epita.fr>
|
||||
|
||||
Give an identity to `configure' scripts.
|
||||
|
||||
* acgeneral.m4 (AC_PACKAGE): New macro.
|
||||
(_AC_COPYRIGHT_SEPARATOR): Remove.
|
||||
(AC_COPYRIGHT): Adjust.
|
||||
(_AC_INIT_HELP, _AC_INIT_VERSION): Name the package you configure
|
||||
when you want.
|
||||
(_AC_INIT): Adjust.
|
||||
* configure.in (AC_PACKAGE): Add.
|
||||
|
||||
2000-03-18 Akim Demaille <akim@epita.fr>
|
||||
|
||||
* acgeneral.m4: Formatting changes.
|
||||
|
||||
2000-03-20 Akim Demaille <akim@epita.fr>
|
||||
|
||||
41
acgeneral.m4
41
acgeneral.m4
@ -634,10 +634,13 @@ popdef([AC_Prefix])dnl
|
||||
|
||||
|
||||
|
||||
# _AC_COPYRIGHT_SEPARATOR
|
||||
# -----------------------
|
||||
# Empty at the first call to AC_COPYRIGHT, then set to two new lines.
|
||||
define(_AC_COPYRIGHT_SEPARATOR)
|
||||
# AC_PACKAGE(PACKAGE, VERSION, [BUG-REPORT])
|
||||
# ------------------------------------------
|
||||
AC_DEFUN(AC_PACKAGE,
|
||||
[define([AC_PACKAGE_NAME], [$1])dnl
|
||||
define([AC_PACKAGE_VERSION], [$2])dnl
|
||||
define([AC_PACKAGE_BUGREPORT], [$3])dnl
|
||||
])
|
||||
|
||||
|
||||
# AC_COPYRIGHT(TEXT)
|
||||
@ -655,15 +658,11 @@ define(_AC_COPYRIGHT_SEPARATOR)
|
||||
AC_DEFUN(AC_COPYRIGHT,
|
||||
[AC_REQUIRE([AC_INIT])dnl
|
||||
AC_DIVERT([NOTICE],
|
||||
[patsubst([]_AC_COPYRIGHT_SEPARATOR()dnl
|
||||
[$1], [^], [@%:@ ])])dnl
|
||||
[patsubst([
|
||||
$1], [^], [@%:@ ])])dnl
|
||||
AC_DIVERT([VERSION_BEGIN],
|
||||
[_AC_COPYRIGHT_SEPARATOR()dnl
|
||||
$1])dnl
|
||||
define([_AC_COPYRIGHT_SEPARATOR],
|
||||
[
|
||||
|
||||
])dnl
|
||||
$1])dnl
|
||||
])# _AC_INIT_COPYRIGHT
|
||||
|
||||
|
||||
@ -1114,14 +1113,18 @@ AC_DIVERT_POP()dnl
|
||||
# Handle the `configure --help' message.
|
||||
define([_AC_INIT_HELP],
|
||||
[AC_DIVERT_PUSH([HELP_BEGIN])dnl
|
||||
[if $ac_init_help; then
|
||||
if $ac_init_help; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<\EOF
|
||||
`configure' configures software source code packages to adapt to many kinds
|
||||
ifset([AC_PACKAGE_NAME],
|
||||
[`configure' configures AC_PACKAGE_NAME AC_PACKAGE_VERSION to adapt to many kinds
|
||||
of systems.
|
||||
],
|
||||
[`configure' configures software source code packages to adapt to many kinds
|
||||
of systems.])
|
||||
|
||||
Usage: configure [OPTION]... [VAR=VALUE]... [HOST]
|
||||
[Usage: configure [OPTION]... [VAR=VALUE]... [HOST]
|
||||
|
||||
To safely assign special values to environment variables (e.g., CC,
|
||||
CFLAGS...), give to `configure' the definition as VAR=VALUE.
|
||||
@ -1185,6 +1188,9 @@ AC_DEFUN([_AC_INIT_VERSION],
|
||||
[AC_DIVERT([VERSION_BEGIN],
|
||||
[if $ac_init_version; then
|
||||
cat <<\EOF])dnl
|
||||
ifset([AC_PACKAGE_NAME],
|
||||
[AC_DIVERT([VERSION_BEGIN],
|
||||
[configure (AC_PACKAGE_NAME AC_PACKAGE_VERSION) AC_ACVERSION])])
|
||||
AC_DIVERT([VERSION_END],
|
||||
[EOF
|
||||
exit 0
|
||||
@ -1392,12 +1398,11 @@ _AC_INIT_PREPARE([$1])dnl
|
||||
dnl AC_COPYRIGHT must be called after _AC_INIT_VERSION, since it dumps
|
||||
dnl into a diversion prepared by _AC_INIT_VERSION.
|
||||
AC_DIVERT([NOTICE],
|
||||
[@%:@ Guess values for system-dependent variables and create Makefiles.])dnl
|
||||
[# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by Autoconf ]AC_ACVERSION[.])dnl
|
||||
AC_COPYRIGHT(
|
||||
[Generated automatically using Autoconf version ]AC_ACVERSION[.
|
||||
Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000
|
||||
[Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This configure script is free software; the Free Software Foundation
|
||||
gives unlimited permission to copy, distribute and modify it.])dnl
|
||||
])
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
AC_PREREQ(2.14a)
|
||||
AC_PACKAGE(Autoconf, 2.14a, bug-autoconf@gnu.org)
|
||||
|
||||
AC_INIT(acgeneral.m4)
|
||||
AM_INIT_AUTOMAKE(autoconf, 2.14a)
|
||||
|
||||
|
||||
@ -634,10 +634,13 @@ popdef([AC_Prefix])dnl
|
||||
|
||||
|
||||
|
||||
# _AC_COPYRIGHT_SEPARATOR
|
||||
# -----------------------
|
||||
# Empty at the first call to AC_COPYRIGHT, then set to two new lines.
|
||||
define(_AC_COPYRIGHT_SEPARATOR)
|
||||
# AC_PACKAGE(PACKAGE, VERSION, [BUG-REPORT])
|
||||
# ------------------------------------------
|
||||
AC_DEFUN(AC_PACKAGE,
|
||||
[define([AC_PACKAGE_NAME], [$1])dnl
|
||||
define([AC_PACKAGE_VERSION], [$2])dnl
|
||||
define([AC_PACKAGE_BUGREPORT], [$3])dnl
|
||||
])
|
||||
|
||||
|
||||
# AC_COPYRIGHT(TEXT)
|
||||
@ -655,15 +658,11 @@ define(_AC_COPYRIGHT_SEPARATOR)
|
||||
AC_DEFUN(AC_COPYRIGHT,
|
||||
[AC_REQUIRE([AC_INIT])dnl
|
||||
AC_DIVERT([NOTICE],
|
||||
[patsubst([]_AC_COPYRIGHT_SEPARATOR()dnl
|
||||
[$1], [^], [@%:@ ])])dnl
|
||||
[patsubst([
|
||||
$1], [^], [@%:@ ])])dnl
|
||||
AC_DIVERT([VERSION_BEGIN],
|
||||
[_AC_COPYRIGHT_SEPARATOR()dnl
|
||||
$1])dnl
|
||||
define([_AC_COPYRIGHT_SEPARATOR],
|
||||
[
|
||||
|
||||
])dnl
|
||||
$1])dnl
|
||||
])# _AC_INIT_COPYRIGHT
|
||||
|
||||
|
||||
@ -1114,14 +1113,18 @@ AC_DIVERT_POP()dnl
|
||||
# Handle the `configure --help' message.
|
||||
define([_AC_INIT_HELP],
|
||||
[AC_DIVERT_PUSH([HELP_BEGIN])dnl
|
||||
[if $ac_init_help; then
|
||||
if $ac_init_help; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<\EOF
|
||||
`configure' configures software source code packages to adapt to many kinds
|
||||
ifset([AC_PACKAGE_NAME],
|
||||
[`configure' configures AC_PACKAGE_NAME AC_PACKAGE_VERSION to adapt to many kinds
|
||||
of systems.
|
||||
],
|
||||
[`configure' configures software source code packages to adapt to many kinds
|
||||
of systems.])
|
||||
|
||||
Usage: configure [OPTION]... [VAR=VALUE]... [HOST]
|
||||
[Usage: configure [OPTION]... [VAR=VALUE]... [HOST]
|
||||
|
||||
To safely assign special values to environment variables (e.g., CC,
|
||||
CFLAGS...), give to `configure' the definition as VAR=VALUE.
|
||||
@ -1185,6 +1188,9 @@ AC_DEFUN([_AC_INIT_VERSION],
|
||||
[AC_DIVERT([VERSION_BEGIN],
|
||||
[if $ac_init_version; then
|
||||
cat <<\EOF])dnl
|
||||
ifset([AC_PACKAGE_NAME],
|
||||
[AC_DIVERT([VERSION_BEGIN],
|
||||
[configure (AC_PACKAGE_NAME AC_PACKAGE_VERSION) AC_ACVERSION])])
|
||||
AC_DIVERT([VERSION_END],
|
||||
[EOF
|
||||
exit 0
|
||||
@ -1392,12 +1398,11 @@ _AC_INIT_PREPARE([$1])dnl
|
||||
dnl AC_COPYRIGHT must be called after _AC_INIT_VERSION, since it dumps
|
||||
dnl into a diversion prepared by _AC_INIT_VERSION.
|
||||
AC_DIVERT([NOTICE],
|
||||
[@%:@ Guess values for system-dependent variables and create Makefiles.])dnl
|
||||
[# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by Autoconf ]AC_ACVERSION[.])dnl
|
||||
AC_COPYRIGHT(
|
||||
[Generated automatically using Autoconf version ]AC_ACVERSION[.
|
||||
Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000
|
||||
[Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This configure script is free software; the Free Software Foundation
|
||||
gives unlimited permission to copy, distribute and modify it.])dnl
|
||||
])
|
||||
|
||||
Loading…
Reference in New Issue
Block a user