From 9c63d67ebe2d63f695175b6a1436d010434b3967 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Sat, 6 Oct 2001 15:35:17 +0000 Subject: [PATCH] * configure.ac: General modernisation and cleanup. * cdemo/configure.ac: Ditto. * demo/configure.ac: Ditto. * depdemo/configrue.ac: Ditto. * ltdl/configure.ac: Ditto. * ltdldemo/configure.ac: Ditto. * mdemo/configure.ac: Ditto. * pdemo/configure.ac: Ditto. * tagdemo/configure.ac: Ditto. --- ChangeLog | 12 +++++ cdemo/configure.ac | 61 +++++++++++++++++++--- configure.ac | 121 +++++++++++++++++++++++++++++-------------- demo/configure.ac | 67 ++++++++++++++++++++---- depdemo/configure.ac | 80 +++++++++++++++++++++------- libltdl/configure.ac | 73 ++++++++++++++++++++------ mdemo/configure.ac | 66 +++++++++++++++++++---- pdemo/configure.ac | 65 +++++++++++++++++++---- tagdemo/configure.ac | 82 +++++++++++++++++++---------- 9 files changed, 488 insertions(+), 139 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb7f579ee..440aade84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2001-10-06 Gary V. Vaughan + + * configure.ac: General modernisation and cleanup. + * cdemo/configure.ac: Ditto. + * demo/configure.ac: Ditto. + * depdemo/configrue.ac: Ditto. + * ltdl/configure.ac: Ditto. + * ltdldemo/configure.ac: Ditto. + * mdemo/configure.ac: Ditto. + * pdemo/configure.ac: Ditto. + * tagdemo/configure.ac: Ditto. + 2001-10-04 Albert Chin-A-Young * libltdl/ltdl.c: Match function return type with prototype diff --git a/cdemo/configure.ac b/cdemo/configure.ac index 4bb14cb55..0340ed981 100644 --- a/cdemo/configure.ac +++ b/cdemo/configure.ac @@ -1,20 +1,65 @@ -dnl Process this file with autoconf to create configure. -*-Autoconf-*- +## Process this file with autoconf to create configure. -*- autoconf -*- +# Copyright 2001 Free Software Foundation, Inc. +# +# 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 AC_PREREQ(2.50) -AC_INIT(cdemo, 0.1) + + +## ------------------------ ## +## Autoconf initialisation. ## +## ------------------------ ## +AC_INIT([cdemo], [0.1], [bug-libtool@gnu.org]) AC_CONFIG_SRCDIR([main.c]) -AM_INIT_AUTOMAKE(cdemo,0.1) + +## ------------------------ ## +## Automake Initialisation. ## +## ------------------------ ## +AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION) + + +## ------------------ ## +## C compiler checks. ## +## ------------------ ## AC_PROG_CC -AC_EXEEXT + + +## ----------------------- ## +## Libtool initialisation. ## +## ----------------------- ## AM_PROG_LIBTOOL -AC_SUBST(LIBTOOL_DEPS) +AC_SUBST([LIBTOOL_DEPS]) + -AC_CHECK_HEADERS(math.h) +## ---------------------------- ## +## C headers required by cdemo. ## +## ---------------------------- ## +AC_CHECK_HEADERS([math.h]) + +## ---------------------------- ## +## Libraries required by cdemo. ## +## ---------------------------- ## AC_CHECK_LIBM -AC_SUBST(LIBM) +AC_SUBST([LIBM]) + -dnl Output the makefile +## -------- ## +## Outputs. ## +## -------- ## AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/configure.ac b/configure.ac index 07a3b78b7..c6a78b8d1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,39 +1,100 @@ ## Process this file with autoconf to create configure. -*- autoconf -*- - +# Copyright 2001 Free Software Foundation, Inc. +# +# 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 + + +## FIXME: Is this really new enough? ## AC_PREREQ(2.50) + + + +## ------------------------ ## +## Autoconf initialisation. ## +## ------------------------ ## AC_INIT([libtool], [1.4c], [bug-libtool@gnu.org]) AC_CONFIG_SRCDIR([ltmain.in]) -AM_INIT_AUTOMAKE(libtool, 1.4c) + + +## ---------------------------------------- ## +## Display a configure time version banner. ## +## ---------------------------------------- ## # This is a sanity check so we can see which version is used in bug reports. # It is assumed that we only want to see the date extension for cvs libtool # versions (i.e. "odd" letters) and not actual alpha releases. TIMESTAMP= -case "$VERSION" in +case AC_PACKAGE_VERSION in [*[acegikmoqsuwy])] TIMESTAMP=`${CONFIG_SHELL} ${srcdir}/mkstamp < ${srcdir}/ChangeLog` - banner="Configuring $PACKAGE $VERSION$TIMESTAMP" - dashes=`echo "$banner" | sed 's/./-/g'` - - # Display an obvious version banner - echo - echo $dashes - echo "$banner" - echo $dashes + AS_BOX([Configuring AC_PACKAGE_TARNAME AC_PACKAGE_VERSION$TIMESTAMP]) echo ;; esac -AC_SUBST(TIMESTAMP) +AC_SUBST([TIMESTAMP]) + + +## ------------------------------- ## +## Libtool specific configuration. ## +## ------------------------------- ## pkgdatadir='${datadir}'"/${PACKAGE}" -AC_SUBST(pkgdatadir) # automake does not need this, but libtoolize does +AC_SUBST([pkgdatadir]) # automake does not need this, but libtoolize does + aclocaldir='${datadir}/aclocal' -AC_SUBST(aclocaldir) +AC_SUBST([aclocaldir]) + +AC_ARG_ENABLE(ltdl-install, + [AC_HELP_STRING([--disable-ltdl-install], [do not install libltdl])]) +if test x"${enable_ltdl_install+set}" != xset; then + enable_ltdl_install=yes + ac_configure_args="$ac_configure_args --enable-ltdl-install" +fi +AC_CONFIG_SUBDIRS([libltdl]) + +# all subdirectories that are configured on demand, but that must be +# included in the distribution +CONF_SUBDIRS="cdemo pdemo demo depdemo mdemo tagdemo" +AC_SUBST([CONF_SUBDIRS]) + +ACINCLUDE_M4_LIST="${srcdir}/acinclude.m4" +DIST_MAKEFILE_LIST= +for dir in $CONF_SUBDIRS; do + ACINCLUDE_M4_LIST="$ACINCLUDE_M4_LIST ${srcdir}/$dir/acinclude.m4" + DIST_MAKEFILE_LIST="$DIST_MAKEFILE_LIST$dir/Makefile " +done +AC_SUBST([ACINCLUDE_M4_LIST]) +AC_SUBST([DIST_MAKEFILE_LIST]) + + + +## ------------------------ ## +## Automake Initialisation. ## +## ------------------------ ## +AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION) + + + +## ---------------- ## +## compiler checks. ## +## ---------------- ## # Use the specified CC and LD AC_PROG_CC - AM_PROG_LD AC_SUBST(LD) AM_PROG_NM @@ -52,34 +113,18 @@ LT_AC_PROG_RC AM_CONDITIONAL(HAVE_RC, [test "x$RC" != xno]) -# Declare win32 dll support -AC_LIBTOOL_WIN32_DLL -# Check for dlopen support +## ----------------------- ## +## Libtool initialisation. ## +## ----------------------- ## AC_LIBTOOL_DLOPEN +AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL -AC_ARG_ENABLE(ltdl-install, -[ --disable-ltdl-install do not install libltdl]) -if test x"${enable_ltdl_install+set}" != xset; then - enable_ltdl_install=yes - ac_configure_args="$ac_configure_args --enable-ltdl-install" -fi -AC_CONFIG_SUBDIRS(libltdl) - -# all subdirectories that are configured on demand, but that must be -# included in the distribution -CONF_SUBDIRS="cdemo pdemo demo depdemo mdemo tagdemo" -AC_SUBST(CONF_SUBDIRS) -ACINCLUDE_M4_LIST="${srcdir}/acinclude.m4" -DIST_MAKEFILE_LIST= -for dir in $CONF_SUBDIRS; do - ACINCLUDE_M4_LIST="$ACINCLUDE_M4_LIST ${srcdir}/$dir/acinclude.m4" - DIST_MAKEFILE_LIST="$DIST_MAKEFILE_LIST$dir/Makefile " -done -AC_SUBST(ACINCLUDE_M4_LIST) -AC_SUBST(DIST_MAKEFILE_LIST) +## -------- ## +## Outputs. ## +## -------- ## AC_CONFIG_FILES([Makefile doc/Makefile tests/Makefile]) AC_OUTPUT diff --git a/demo/configure.ac b/demo/configure.ac index 7d54ec7a7..d420d409c 100644 --- a/demo/configure.ac +++ b/demo/configure.ac @@ -1,32 +1,77 @@ -dnl Process this file with autoconf to create configure. -*-Autoconf-*- +## Process this file with autoconf to create configure. -*- autoconf -*- +# Copyright 2001 Free Software Foundation, Inc. +# +# 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 AC_PREREQ(2.50) -AC_INIT(hell, 1.0) + + +## ------------------------ ## +## Autoconf initialisation. ## +## ------------------------ ## +AC_INIT([demo], [1.0], [bug-libtool@gnu.org]) AC_CONFIG_SRCDIR([hello.c]) -AM_INIT_AUTOMAKE(hell,1.0) + +## ------------------------ ## +## Automake Initialisation. ## +## ------------------------ ## +AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION) + + +## ---------------- ## +## compiler checks. ## +## ---------------- ## AC_PROG_CC AC_C_CONST -AC_EXEEXT + + +## ----------------------- ## +## Libtool initialisation. ## +## ----------------------- ## AC_LIBTOOL_DLOPEN AM_PROG_LIBTOOL -AC_SUBST(LIBTOOL_DEPS) +AC_SUBST([LIBTOOL_DEPS]) if ./libtool --features | grep '^enable static libraries$' > /dev/null 2>&1; then STATIC=-static else STATIC= fi -AC_SUBST(STATIC) +AC_SUBST([STATIC]) + +AM_CONDITIONAL([BINARY_HELLDL], + [grep '^global_symbol_pipe=..*$' ./libtool >/dev/null]) -AM_CONDITIONAL(BINARY_HELLDL, [dnl -grep '^global_symbol_pipe=..*$' ./libtool >/dev/null]) -AC_CHECK_HEADERS(string.h math.h) +## ---------------------------- ## +## C headers required by cdemo. ## +## ---------------------------- ## +AC_CHECK_HEADERS([string.h math.h]) + +## --------------------------- ## +## Libraries required by demo. ## +## --------------------------- ## AC_CHECK_LIBM -AC_SUBST(LIBM) +AC_SUBST([LIBM]) + -dnl Output the makefile +## -------- ## +## Outputs. ## +## -------- ## AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/depdemo/configure.ac b/depdemo/configure.ac index 865d2f568..f49c31355 100644 --- a/depdemo/configure.ac +++ b/depdemo/configure.ac @@ -1,32 +1,76 @@ -dnl Process this file with autoconf to create configure. -*-Autoconf-*- +## Process this file with autoconf to create configure. -*- autoconf -*- +# Copyright 2001 Free Software Foundation, Inc. +# +# 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 AC_PREREQ(2.50) -AC_INIT(depdemo, 0.1) + + +## ------------------------ ## +## Autoconf initialisation. ## +## ------------------------ ## +AC_INIT([depdemo], [0.1], [bug-libtool@gnu.org]) AC_CONFIG_SRCDIR([main.c]) -AM_INIT_AUTOMAKE(depdemo,0.1) -AC_PROG_CC -AC_EXEEXT -AM_PROG_LIBTOOL -AC_SUBST(LIBTOOL_DEPS) +## ------------------------------- ## +## depdemo specific configuration. ## +## ------------------------------- ## if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then STATIC=-static else STATIC= fi -AC_SUBST(STATIC) +AC_SUBST([STATIC]) + + +## ------------------------ ## +## Automake Initialisation. ## +## ------------------------ ## +AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION) + + +## ---------------- ## +## compiler checks. ## +## ---------------- ## +AC_PROG_CC + + +## ----------------------- ## +## Libtool initialisation. ## +## ----------------------- ## +AM_PROG_LIBTOOL +AC_SUBST([LIBTOOL_DEPS]) -AC_CHECK_HEADERS(math.h) +## ---------------------------- ## +## C headers required by cdemo. ## +## ---------------------------- ## +AC_CHECK_HEADERS([math.h]) + + +## ---------------------------- ## +## Libraries required by cdemo. ## +## ---------------------------- ## AC_CHECK_LIBM -AC_SUBST(LIBM) - -dnl Output the makefile -AC_CONFIG_FILES([Makefile -l1/Makefile -l2/Makefile -l3/Makefile -l4/Makefile -]) +AC_SUBST([LIBM]) + + +## -------- ## +## Outputs. ## +## -------- ## +AC_CONFIG_FILES([Makefile l1/Makefile l2/Makefile l3/Makefile l4/Makefile]) AC_OUTPUT diff --git a/libltdl/configure.ac b/libltdl/configure.ac index 4dc3d6397..225883ee6 100644 --- a/libltdl/configure.ac +++ b/libltdl/configure.ac @@ -1,15 +1,43 @@ -dnl Process this file with autoconf to create configure. -*- autoconf -*- +## Process this file with autoconf to create configure. -*- autoconf -*- +# Copyright 2001 Free Software Foundation, Inc. +# +# 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 + +## FIXME: Is this really new enough? ## AC_PREREQ(2.50) -AC_INIT(libltdl, 1.2) -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. -AC_ARG_WITH(auxdir, -[ --with-auxdir=DIR path to autoconf auxiliary files], -[AC_CONFIG_AUX_DIRS($with_auxdir)], -[AC_CONFIG_AUX_DIR_DEFAULT]) + +## ------------------------ ## +## Autoconf initialisation. ## +## ------------------------ ## +AC_INIT([libltdl], [1.2], [bug-libtool@gnu.org]) +AC_CONFIG_SRCDIR([ltdl.c]) + + +## ------------------------------- ## +## Libltdl specific configuration. ## +## ------------------------------- ## + +# We shouldn't be using these internal macros of autoconf, +# but CONFIG_AUX_DIR($with_auxdir) breaks automake. +AC_ARG_WITH([auxdir], + [AC_HELP_STRING([--with-auxdir=DIR], [path to autoconf auxiliary files])], + [AC_CONFIG_AUX_DIRS($with_auxdir)], + [AC_CONFIG_AUX_DIR_DEFAULT]) if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then if test -f ${srcdir}/ltmain.sh; then @@ -23,19 +51,34 @@ if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then fi fi -AM_INIT_AUTOMAKE(libltdl,1.2,-) -AM_CONFIG_HEADER(config.h:config-h.in) -AM_MAINTAINER_MODE +## ------------------------ ## +## Automake Initialisation. ## +## ------------------------ ## +AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION, -) +AM_CONFIG_HEADER([config.h:config-h.in]) + + +## ------------------ ## +## C compiler checks. ## +## ------------------ ## AC_PROG_CC AC_C_CONST AC_C_INLINE + +## ----------------------- ## +## Libtool initialisation. ## +## ----------------------- ## AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL -AC_SUBST(LIBTOOL_DEPS) +AC_SUBST([LIBTOOL_DEPS]) AC_LIB_LTDL -dnl Output the makefile -AC_OUTPUT(Makefile) + +## -------- ## +## Outputs. ## +## -------- ## +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/mdemo/configure.ac b/mdemo/configure.ac index 27fefcccf..e7f9121b2 100644 --- a/mdemo/configure.ac +++ b/mdemo/configure.ac @@ -1,17 +1,50 @@ -dnl Process this file with autoconf to create configure. -*-Autoconf-*- +## Process this file with autoconf to create configure. -*- autoconf -*- +# Copyright 2001 Free Software Foundation, Inc. +# +# 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 AC_PREREQ(2.50) -AC_INIT(mdemo, 0.1) + + +## ------------------------ ## +## Autoconf initialisation. ## +## ------------------------ ## +AC_INIT([mdemo], [0.1], [bug-libtool@gnu.org]) AC_CONFIG_SRCDIR([main.c]) -AM_INIT_AUTOMAKE(mdemo,0.1) + +## ------------------------ ## +## Automake Initialisation. ## +## ------------------------ ## +AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION) + + +## ------------------ ## +## C compiler checks. ## +## ------------------ ## AC_PROG_CC AC_C_CONST -AC_EXEEXT -AC_LIBLTDL_CONVENIENCE(../libltdl) -AC_SUBST(INCLTDL) -AC_SUBST(LIBLTDL) + +## ----------------------- ## +## Libtool initialisation. ## +## ----------------------- ## +AC_LIBLTDL_CONVENIENCE([../libltdl]) +AC_SUBST([INCLTDL]) +AC_SUBST([LIBLTDL]) AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_DLOPEN @@ -23,13 +56,24 @@ if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then else STATIC= fi -AC_SUBST(STATIC) +AC_SUBST([STATIC]) + -AC_CHECK_HEADERS(math.h) +## ---------------------------- ## +## C headers required by mdemo. ## +## ---------------------------- ## +AC_CHECK_HEADERS([math.h]) + +## ---------------------------- ## +## Libraries required by cdemo. ## +## ---------------------------- ## AC_CHECK_LIBM -AC_SUBST(LIBM) +AC_SUBST([LIBM]) + -dnl Output the makefile +## -------- ## +## Outputs. ## +## -------- ## AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/pdemo/configure.ac b/pdemo/configure.ac index 4725f384e..89bfbe9ad 100644 --- a/pdemo/configure.ac +++ b/pdemo/configure.ac @@ -1,32 +1,77 @@ -dnl Process this file with autoconf to create configure. -*-Autoconf-*- +## Process this file with autoconf to create configure. -*- autoconf -*- +# Copyright 2001 Free Software Foundation, Inc. +# +# 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 AC_PREREQ(2.50) -AC_INIT(hell, 1.0) + + +## ------------------------ ## +## Autoconf initialisation. ## +## ------------------------ ## +AC_INIT([pdemo], [0.1], [bug-libtool@gnu.org]) AC_CONFIG_SRCDIR([longer_file_name_hello.c]) + + +## ------------------------ ## +## Automake Initialisation. ## +## ------------------------ ## AM_INIT_AUTOMAKE(hell,1.0) + +## ------------------ ## +## C compiler checks. ## +## ------------------ ## AC_PROG_CC AC_C_CONST -AC_EXEEXT + + +## ----------------------- ## +## Libtool initialisation. ## +## ----------------------- ## AC_LIBTOOL_DLOPEN AM_PROG_LIBTOOL -AC_SUBST(LIBTOOL_DEPS) +AC_SUBST([LIBTOOL_DEPS]) if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then STATIC=-static else STATIC= fi -AC_SUBST(STATIC) +AC_SUBST([STATIC]) + +AM_CONDITIONAL([BINARY_HELLDL], + [grep '^global_symbol_pipe=..*$' ./libtool >/dev/null]) -AM_CONDITIONAL(BINARY_HELLDL, [dnl -grep '^global_symbol_pipe=..*$' ./libtool >/dev/null]) -AC_CHECK_HEADERS(string.h math.h) +## ---------------------------- ## +## C headers required by cdemo. ## +## ---------------------------- ## +AC_CHECK_HEADERS([string.h math.h]) + +## ---------------------------- ## +## Libraries required by cdemo. ## +## ---------------------------- ## AC_CHECK_LIBM -AC_SUBST(LIBM) +AC_SUBST([LIBM]) + -dnl Output the makefile +## -------- ## +## Outputs. ## +## -------- ## AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/tagdemo/configure.ac b/tagdemo/configure.ac index 40ce74c7a..c4f50d739 100644 --- a/tagdemo/configure.ac +++ b/tagdemo/configure.ac @@ -1,32 +1,46 @@ -dnl -*-Autoconf-*- -dnl $Id$ - -dnl -dnl An autoconf script to automatically configure the sample C++ "foo" -dnl application. -dnl Process this file with autoconf to produce a configure script. -dnl +## Process this file with autoconf to create configure. -*- autoconf -*- +# Copyright 2001 Free Software Foundation, Inc. +# +# 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 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. -AC_CANONICAL_TARGET([]) -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) +## ------------------------ ## +## Autoconf initialisation. ## +## ------------------------ ## +AC_INIT([tagdemo], [0.1], [bug-libtool@gnu.org]) +AC_CONFIG_SRCDIR([foo.cpp]) + +AC_CANONICAL_TARGET + + +## ------------------------ ## +## Automake Initialisation. ## +## ------------------------ ## +AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION) + -dnl Check the C compiler and preprocessor. +## ---------------- ## +## Compiler checks. ## +## ---------------- ## AC_PROG_CC AC_PROG_CPP AC_PROG_CC_C_O -dnl Check the C++ compiler and preprocessor. AC_PROG_CXX AC_PROG_CXXCPP @@ -42,19 +56,31 @@ AC_OBJEXT AC_EXEEXT AC_LANG_POP -dnl Setup Libtool -dnl Set the test language to C++. -AC_LANG([C++]) +## ----------------------- ## +## Libtool initialisation. ## +## ----------------------- ## -dnl Check for libtool and turn on Automake processing for Libtool +# Set the test language to C++. +AC_LANG([C++]) AM_PROG_LIBTOOL -AC_CHECK_HEADERS(math.h) +## ---------------------------- ## +## C headers required by cdemo. ## +## ---------------------------- ## +AC_CHECK_HEADERS([math.h]) + + +## ---------------------------- ## +## Libraries required by cdemo. ## +## ---------------------------- ## AC_CHECK_LIBM -AC_SUBST(LIBM) +AC_SUBST([LIBM]) + -AC_CONFIG_FILES(Makefile) -AC_CONFIG_COMMANDS([default], [[echo "Done configuring package $PACKAGE"]]) +## -------- ## +## Outputs. ## +## -------- ## +AC_CONFIG_FILES([Makefile]) AC_OUTPUT -- 2.47.2