summaryrefslogtreecommitdiff
path: root/m4/ax_warning_default_pkgconfig.m4
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2008-04-12 20:25:45 +0200
committerPeter Simons <simons@cryp.to>2008-04-12 20:25:45 +0200
commit18d1c6b5de2139c328df473643d99991ec1f2320 (patch)
tree62ca6a8b2792e20963e195dfb9df449c88cec566 /m4/ax_warning_default_pkgconfig.m4
parentdb46aa7b5cd0d94ea7f1deb2d5718494faa6c347 (diff)
downloadautoconf-archive-18d1c6b5de2139c328df473643d99991ec1f2320.tar.gz
ALL: updated m4 distribution format
The markup format distributed by the Autoconf Macro Archive underwent the following changes: * All archive entries use '#' comment delimiters, rather than 'dnl', because we would like those comments to go into the generated configure script. It should be simple for everyone to determine where the macro came from originally, who wrote it, and where the latest version can be retrieved. To achieve this, every macro used to start with a distinguished line that shows the URL of its respective home page, i.e.: | ##### http://autoconf-archive.cryp.to/ax_prog_acme.html As it happens, the aclocal utility distributed with Automake ignores all comment lines that start with a double hash '##', thus those home page URLs will not make it into any automatically generated aclocal.m4 file. Duh. To remedy the situation, the following markup is now used instead: | # ================================================================= | # http://autoconf-archive.cryp.to/ax_prog_acme.html | # ================================================================= * The 2.x versions of the GNU GPL and LGPL contain the following clause: | You should have received a copy of the <GNU LICENSE NAME> along | with this program; if not, write to the Free Software Foundation, | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Version 3.x, however, smartly refers the reader to the Web: | You should have received a copy of the GNU General Public License | along with this program. If not, see <http://www.gnu.org/licenses/>. This patch changes all GPL2 and LGPL2 macros to do the same, i.e. to refer to the GNU web site for the full text of the respective license. * Since all m4 files had to be changed in this commit anyway, the opportunity was used to increase the auto-fill column for documentation from 65 to 75 characters per line. It's a trivial change, but it just looks nicer.
Diffstat (limited to 'm4/ax_warning_default_pkgconfig.m4')
-rw-r--r--m4/ax_warning_default_pkgconfig.m489
1 files changed, 43 insertions, 46 deletions
diff --git a/m4/ax_warning_default_pkgconfig.m4 b/m4/ax_warning_default_pkgconfig.m4
index bc1bb5d..4666b68 100644
--- a/m4/ax_warning_default_pkgconfig.m4
+++ b/m4/ax_warning_default_pkgconfig.m4
@@ -1,4 +1,6 @@
-##### http://autoconf-archive.cryp.to/ax_warning_default_pkgconfig.html
+# ===========================================================================
+# http://autoconf-archive.cryp.to/ax_warning_default_pkgconfig.html
+# ===========================================================================
#
# SYNOPSIS
#
@@ -7,68 +9,63 @@
#
# DESCRIPTION
#
-# print a warning message if the $(datadir)/aclocal directory is not
-# in the dirlist searched by the aclocal tool. This macro is useful
-# if some `make install` would target $(datadir)/aclocal to install
-# an autoconf m4 file of your project to be picked up by other
-# projects.
+# print a warning message if the $(datadir)/aclocal directory is not in
+# the dirlist searched by the aclocal tool. This macro is useful if some
+# `make install` would target $(datadir)/aclocal to install an autoconf m4
+# file of your project to be picked up by other projects.
#
# default $1 dirvariable = pkgconfigdir
# default $2 defsetting = ${libdir}/pkgconfig
# default $3 action = nothing to do
# default $4 action = warn the user about mismatch
#
-# In the _WARNING_ variant, the defsetting is not placed in
-# dirvariable nor is it ac_subst'ed in any way. The default
-# fail-action $4 is to send a warning message to the user, and the
-# default accept-action $3 is nothing. It is expected that a Makefile
-# is generated with pkgconfigdir=${libdir}/pkgconfig
+# In the _WARNING_ variant, the defsetting is not placed in dirvariable
+# nor is it ac_subst'ed in any way. The default fail-action $4 is to send
+# a warning message to the user, and the default accept-action $3 is
+# nothing. It is expected that a Makefile is generated with
+# pkgconfigdir=${libdir}/pkgconfig
#
-# The _ENABLE_ variant however will set not only the $pkgconfigdir
-# shell var of the script, but it is also AC-SUBST'ed on default -
-# and furthermore a configure option "--enable-default-pkgconfigdir"
-# is provided. Only if that option is set then $2 default is not set
-# to the canonic default in the a $prefix subpath but instead $2
-# default is set to the primary path where `pkg-config` looks for .pc
-# files. The user may also override the default on the command line.
+# The _ENABLE_ variant however will set not only the $pkgconfigdir shell
+# var of the script, but it is also AC-SUBST'ed on default - and
+# furthermore a configure option "--enable-default-pkgconfigdir" is
+# provided. Only if that option is set then $2 default is not set to the
+# canonic default in the a $prefix subpath but instead $2 default is set
+# to the primary path where `pkg-config` looks for .pc files. The user may
+# also override the default on the command line.
#
# LAST MODIFICATION
#
-# 2006-10-13
+# 2008-04-12
#
# COPYLEFT
#
-# Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
+# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-#
-# As a special exception, the respective Autoconf Macro's copyright
-# owner gives unlimited permission to copy, distribute and modify the
-# configure scripts that are the output of Autoconf when processing
-# the Macro. You need not follow the terms of the GNU General Public
-# License when using or distributing such scripts, even though
-# portions of the text of the Macro appear in them. The GNU General
-# Public License (GPL) does govern all other use of the material that
-# constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the
-# Autoconf Macro released by the Autoconf Macro Archive. When you
-# make and distribute a modified version of the Autoconf Macro, you
-# may extend this special exception to the GPL to apply to your
-# modified version as well.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Macro Archive. When you make and
+# distribute a modified version of the Autoconf Macro, you may extend this
+# special exception to the GPL to apply to your modified version as well.
AC_DEFUN([AX_WARNING_DEFAULT_PKGCONFIGDIR],[dnl
AC_REQUIRE([AX_EXPAND_PREFIX])dnl