Assume C89 for included headers, and throughout the testsuite.

* NEWS: Update.
* libltdl/argz.c: Do not include strings.h nor memory.h, include
string.h unconditionally.
Patch by Simon Josefsson <jas@extundo.com>.
* libltdl/libltdl/lt__private.h: Likewise.
* libltdl/m4/ltdl.m4 (LTDL_INIT): Do not check for string.h,
strings.h, memory.h.
* tests/cdemo/configure.ac: Assume presence of math.h.
* tests/cdemo/foo.c: Likewise.
* tests/demo/configure.ac: Likewise for math.h, string.h.
Assume 'const'.  Drop obsolete AC_EXEEXT.
* tests/demo/dlmain.c: Likewise.
* tests/demo/foo.c: Likewise.
* tests/depdemo/configure.ac: Likewise.
* tests/depdemo/l4/l4.c: Likewise.
* tests/f77demo/configure.ac: Likewise.  Also drop obsolete
AC_OBJEXT.
* tests/fcdemo/configure.ac: Likewise.
* tests/mdemo/configure.ac: Likewise.
* tests/mdemo/foo1.c: Likewise.
* tests/mdemo/foo2.c: Likewise.
* tests/mdemo2/configure.ac: Likewise.
* tests/pdemo/configure.ac: Likewise.
* tests/pdemo/longer_file_name_dlmain.c:
* tests/pdemo/longer_file_name_foo.c: Likewise.
* tests/pdemo/longer_file_name_foo2.c: Likewise.
* tests/tagdemo/configure.ac: Likewise.
* tests/tagdemo/foo.cpp: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 67b97fba3394ca848534856e36ccaca33cd9d873..6ec9021fea81b27c767c98c48543e11fc2854170 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2007-01-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Assume C89 for included headers, and throughout the testsuite.
+
+       * NEWS: Update.
+       * libltdl/argz.c: Do not include strings.h nor memory.h, include
+       string.h unconditionally.
+       Patch by Simon Josefsson <jas@extundo.com>.
+       * libltdl/libltdl/lt__private.h: Likewise.
+       * libltdl/m4/ltdl.m4 (LTDL_INIT): Do not check for string.h,
+       strings.h, memory.h.
+       * tests/cdemo/configure.ac: Assume presence of math.h.
+       * tests/cdemo/foo.c: Likewise.
+       * tests/demo/configure.ac: Likewise for math.h, string.h.
+       Assume 'const'.  Drop obsolete AC_EXEEXT.
+       * tests/demo/dlmain.c: Likewise.
+       * tests/demo/foo.c: Likewise.
+       * tests/depdemo/configure.ac: Likewise.
+       * tests/depdemo/l4/l4.c: Likewise.
+       * tests/f77demo/configure.ac: Likewise.  Also drop obsolete
+       AC_OBJEXT.
+       * tests/fcdemo/configure.ac: Likewise.
+       * tests/mdemo/configure.ac: Likewise.
+       * tests/mdemo/foo1.c: Likewise.
+       * tests/mdemo/foo2.c: Likewise.
+       * tests/mdemo2/configure.ac: Likewise.
+       * tests/pdemo/configure.ac: Likewise.
+       * tests/pdemo/longer_file_name_dlmain.c:
+       * tests/pdemo/longer_file_name_foo.c: Likewise.
+       * tests/pdemo/longer_file_name_foo2.c: Likewise.
+       * tests/tagdemo/configure.ac: Likewise.
+       * tests/tagdemo/foo.cpp: Likewise.
+
 2007-01-24  Reuben Thomas <rrt@sc3d.org>  (tiny change)
 
        * doc/libtool.texi (Inter-library dependencies): Fix typo.

diff --git a/NEWS b/NEWS
index 3dedbb7fb881b7eb6a9ee6f59efc926017689d9e..bf6431cb2be397236e5cd31d2d9199b3d07e8cb9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,9 @@ New in 1.9h: 2005-??-??; CVS version 2.1a, Libtool team:
 * Initial support for the Sun compiler suite on GNU/Linux.
 * Improved support for GNU/kFreeBSD and GNU/NetBSD.
 * Search paths with GCC on multilib systems like x86_64 have been fixed.
+* The Libtool and libltdl macros and the testsuite now assume a C89
+  environment, consequently do not test for headers such as string.h,
+  strings.h, memory.h any more.
 * Bug fixes.
 \f
 New in 1.9f: 2004-10-23; CVS version 1.9e, Libtool team:

diff --git a/libltdl/argz.c b/libltdl/argz.c
index e49d73e095115e55ba45e630847b655c05641ce9..3bab7f3c829426bfae5a6d98572653692660f039 100644 (file)
--- a/libltdl/argz.c
+++ b/libltdl/argz.c
@@ -1,5 +1,5 @@
 /* argz.c -- argz implementation for non-glibc systems
-   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
    Originally by Gary V. Vaughan  <gary@gnu.org>
 
    NOTE: The canonical source of this file is maintained with the
@@ -40,15 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include <stdlib.h>
 #include <sys/types.h>
 #include <errno.h>
-
-#if defined(HAVE_STRING_H)
-#  include <string.h>
-#elif defined(HAVE_STRINGS_H)
-#  include <strings.h>
-#endif
-#if defined(HAVE_MEMORY_H)
-#  include <memory.h>
-#endif
+#include <string.h>
 
 #define EOS_CHAR '\0'
 

diff --git a/libltdl/libltdl/lt__private.h b/libltdl/libltdl/lt__private.h
index 32105002347724c9fe11448861562ed034f8a5b6..d53c455179dc8f7668d6888574091b13b430cd22 100644 (file)
--- a/libltdl/libltdl/lt__private.h
+++ b/libltdl/libltdl/lt__private.h
@@ -1,5 +1,5 @@
 /* lt__private.h -- internal apis for libltdl
-   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
    Originally by Gary V. Vaughan  <gary@gnu.org>
 
    NOTE: The canonical source of this file is maintained with the
@@ -40,22 +40,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include <ctype.h>
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #if defined(HAVE_UNISTD_H)
 #  include <unistd.h>
 #endif
 
-#if defined(HAVE_STRING_H)
-#  include <string.h>
-#else
-#  if defined(HAVE_STRINGS_H)
-#    include <strings.h>
-#  endif
-#endif
-#if defined(HAVE_MEMORY_H)
-#  include <memory.h>
-#endif
-
 /* Import internal interfaces...  */
 #include "lt__alloc.h"
 #include "lt__dirent.h"

diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index 491034460360b1ead08c9c6858519d4cbbc1bb81..82f8b01aa3382cbfb2ea1b95c197f460f93e0d83 100644 (file)
--- a/libltdl/m4/ltdl.m4
+++ b/libltdl/m4/ltdl.m4
@@ -1,11 +1,11 @@
 # ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
-# Copyright (C) 1999-2006 Free Software Foundation, Inc.
+# Copyright (C) 1999-2007 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.
 
-# serial 10 LTDL_INIT
+# serial 11 LTDL_INIT
 
 # LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
 # ------------------------------------------
@@ -285,9 +285,8 @@ m4_ifset([AH_HEADER],
        [])])])
 AC_SUBST([LT_CONFIG_H])
 
-AC_CHECK_HEADERS([memory.h unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h],
+AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h],
        [], [], [AC_INCLUDES_DEFAULT])
-AC_CHECK_HEADERS([string.h strings.h], [break], [], [AC_INCLUDES_DEFAULT])
 
 AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])])
 AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])])

diff --git a/tests/cdemo/configure.ac b/tests/cdemo/configure.ac
index e5d34ba8e2a2c67fc307785ba2d2efd63185aec2..a2bd6c87c5da47e389f247c19f4b4f9c52c25f17 100644 (file)
--- a/tests/cdemo/configure.ac
+++ b/tests/cdemo/configure.ac
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2007 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
@@ -45,12 +45,6 @@ LT_INIT
 AC_SUBST([LIBTOOL_DEPS])
 
 
-## ---------------------------- ##
-## C headers required by cdemo. ##
-## ---------------------------- ##
-AC_CHECK_HEADERS([math.h])
-
-
 ## ---------------------------- ##
 ## Libraries required by cdemo. ##
 ## ---------------------------- ##

diff --git a/tests/cdemo/foo.c b/tests/cdemo/foo.c
index 18ddac67549c3f8ed3e33f7f3f6ccc02da863e96..562e858cd677afd3a819eac7decc3ab0e6a56335 100644 (file)
--- a/tests/cdemo/foo.c
+++ b/tests/cdemo/foo.c
@@ -1,5 +1,5 @@
 /* foo.c -- trivial test library
-   Copyright (C) 1998-1999 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2007 Free Software Foundation, Inc.
    Originally by Thomas Tanner <tanner@ffii.org>
    This file is part of GNU Libtool.
 
@@ -21,9 +21,7 @@ USA. */
 #include "foo.h"
 #include <stdio.h>
 
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 int
 foo()

diff --git a/tests/demo/configure.ac b/tests/demo/configure.ac
index 453aa6d547fc47c0fad05bf08cbced235665b9e8..a41b5fb4f704747d15ce33f7f3b8b6f86091e1ac 100644 (file)
--- a/tests/demo/configure.ac
+++ b/tests/demo/configure.ac
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2007 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
@@ -37,8 +37,6 @@ AM_INIT_AUTOMAKE
 ## compiler checks. ##
 ## ---------------- ##
 AC_PROG_CC
-AC_C_CONST
-AC_EXEEXT
 
 
 ## ----------------------- ##
@@ -57,12 +55,6 @@ esac
 AM_CONDITIONAL([BINARY_HELLDL], [test "X$binary_helldl" = Xyes])
 
 
-## --------------------------- ##
-## C headers required by demo. ##
-## --------------------------- ##
-AC_CHECK_HEADERS([string.h math.h])
-
-
 ## --------------------------- ##
 ## Libraries required by demo. ##
 ## --------------------------- ##

diff --git a/tests/demo/dlmain.c b/tests/demo/dlmain.c
index abc931fc1400a86960d59399805d7025dcc21490..4417b517341c80c07d4fa5e5508c427afdc7e43d 100644 (file)
--- a/tests/demo/dlmain.c
+++ b/tests/demo/dlmain.c
@@ -1,5 +1,5 @@
 /* dlmain.c -- hello test program that uses simulated dynamic linking
-   Copyright (C) 1996-1999, 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2004, 2006, 2007 Free Software Foundation, Inc.
    This file is part of GNU Libtool.
 
 This program is free software; you can redistribute it and/or modify
@@ -19,10 +19,7 @@ USA. */
 
 #include "foo.h"
 #include <stdio.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 
 #define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
 

diff --git a/tests/demo/foo.c b/tests/demo/foo.c
index e25aa80b7d720acd1f055d0aec3645a0bf7a8684..5b8d766e1dfedddc204ccaa0df8e99cff4fe724e 100644 (file)
--- a/tests/demo/foo.c
+++ b/tests/demo/foo.c
@@ -1,5 +1,5 @@
 /* foo.c -- trivial test function for libfoo
-   Copyright (C) 1996-1999 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2007 Free Software Foundation, Inc.
    Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
    This file is part of GNU Libtool.
 
@@ -21,10 +21,7 @@ USA. */
 #include "foo.h"
 
 #include <stdio.h>
-
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 /* Give a global variable definition. */
 int nothing = FOO_RET;

diff --git a/tests/depdemo/configure.ac b/tests/depdemo/configure.ac
index b85273e1727c0cd156ed4155f7b6a427227a9eb2..e3667a17c178dac60807e5b4fb701471ab0c67cf 100644 (file)
--- a/tests/depdemo/configure.ac
+++ b/tests/depdemo/configure.ac
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2007 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
@@ -37,7 +37,6 @@ AM_INIT_AUTOMAKE
 ## compiler checks. ##
 ## ---------------- ##
 AC_PROG_CC
-AC_EXEEXT
 
 ## ----------------------- ##
 ## Libtool initialisation. ##
@@ -51,12 +50,6 @@ AC_SUBST([LIBTOOL_DEPS])
 STATIC="\`${CONFIG_SHELL} ./libtool --features | ${SED} -n -e '/enable static/s/^.*\$\$/-static/p'\`"
 AC_SUBST([STATIC])
 
-## ------------------------------ ##
-## C headers required by depdemo. ##
-## ------------------------------ ##
-AC_CHECK_HEADERS([math.h])
-
-
 ## ------------------------------ ##
 ## Libraries required by depdemo. ##
 ## ------------------------------ ##

diff --git a/tests/depdemo/l4/l4.c b/tests/depdemo/l4/l4.c
index 392c40912b58b92bb49b03b3f90bc1c281c3d708..a8864a3a4a5cbad94a68d02e70e6af8e48fde29a 100644 (file)
--- a/tests/depdemo/l4/l4.c
+++ b/tests/depdemo/l4/l4.c
@@ -1,6 +1,6 @@
 /* l4.c -- trivial test library
    Copyright (C) 1998-1999 Thomas Tanner <tanner@ffii.org>
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
    This file is part of GNU Libtool.
 
 This program is free software; you can redistribute it and/or modify
@@ -22,10 +22,7 @@ USA. */
 
 #include "l3/l3.h"
 #include <stdio.h>
-
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 int    var_l4 = 0;
 

diff --git a/tests/f77demo/configure.ac b/tests/f77demo/configure.ac
index 43ec9da0dfe373c5a0330c0ee17bd611e384cf0a..e9dea09f283e05651db8743d501e4079ef686604 100644 (file)
--- a/tests/f77demo/configure.ac
+++ b/tests/f77demo/configure.ac
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2007 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
@@ -46,18 +46,6 @@ AC_F77_LIBRARY_LDFLAGS
 dnl Check for underscoring of external names
 AC_F77_WRAPPERS
 
-# 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
-# the test language to C.  We do it before any libtool setup macros are
-# called so that the proper values are cached beforehand.  We also do
-# it before any linker flags (LDFLAGS) are set so that fortran specific
-# ones don't break the tests.
-AC_LANG_PUSH([C])
-AC_OBJEXT
-AC_EXEEXT
-AC_LANG_POP
-
 ## ----------------------- ##
 ## Libtool initialisation. ##
 ## ----------------------- ##

diff --git a/tests/fcdemo/configure.ac b/tests/fcdemo/configure.ac
index 5fdd08311ad17ac870e0fedf53343c5a2c6d2e4b..6c715cc946cf28f9774db4ecdd242de669b3e9d6 100644 (file)
--- a/tests/fcdemo/configure.ac
+++ b/tests/fcdemo/configure.ac
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2007 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
@@ -53,19 +53,6 @@ dnl Yes, we want free form Fortran!
 AC_FC_FREEFORM
 AC_LANG_POP
 
-
-# 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
-# the test language to C.  We do it before any libtool setup macros are
-# called so that the proper values are cached beforehand.  We also do
-# it before any linker flags (LDFLAGS) are set so that fortran specific
-# ones don't break the tests.
-AC_LANG_PUSH([C])
-AC_OBJEXT
-AC_EXEEXT
-AC_LANG_POP
-
 ## ----------------------- ##
 ## Libtool initialisation. ##
 ## ----------------------- ##

diff --git a/tests/mdemo/configure.ac b/tests/mdemo/configure.ac
index 210d2b50d081dda026cb36844fe715c27526e0c9..253329a74eaecaf7480be42deb630d8b8fd014df 100644 (file)
--- a/tests/mdemo/configure.ac
+++ b/tests/mdemo/configure.ac
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2007 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
@@ -37,7 +37,6 @@ AM_INIT_AUTOMAKE
 ## C compiler checks. ##
 ## ------------------ ##
 AC_PROG_CC
-AC_C_CONST
 
 
 ## ----------------------- ##
@@ -55,12 +54,6 @@ test "X$enable_static" = Xyes && STATIC="-static"
 AC_SUBST([STATIC])
 
 
-## ---------------------------- ##
-## C headers required by mdemo. ##
-## ---------------------------- ##
-AC_CHECK_HEADERS([math.h])
-
-
 ## ---------------------------- ##
 ## Libraries required by mdemo. ##
 ## ---------------------------- ##

diff --git a/tests/mdemo/foo1.c b/tests/mdemo/foo1.c
index 0f960eb3819600721dfc4c38ba13553b0ba1d7a3..075df2f004f842989a88b401ff2866ce701dd3a3 100644 (file)
--- a/tests/mdemo/foo1.c
+++ b/tests/mdemo/foo1.c
@@ -1,5 +1,5 @@
 /* foo1.c -- trivial test library
-   Copyright (C) 1998-1999 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2007 Free Software Foundation, Inc.
    Originally by Thomas Tanner <tanner@ffii.org>
    This file is part of GNU Libtool.
 
@@ -20,10 +20,7 @@ USA. */
 
 #include "foo.h"
 #include <stdio.h>
-
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 #define nothing foo1_LTX_nothing
 #define foo1   foo1_LTX_foo1

diff --git a/tests/mdemo/foo2.c b/tests/mdemo/foo2.c
index 301e3cb10eb99b02ed338ca34aff6e881cfc3d3c..01105d8e602dab079dc1afd5193a2cf7006212d7 100644 (file)
--- a/tests/mdemo/foo2.c
+++ b/tests/mdemo/foo2.c
@@ -1,5 +1,5 @@
 /* foo2.c -- trivial test library
-   Copyright (C) 1998-1999 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2007 Free Software Foundation, Inc.
    Originally by Thomas Tanner <tanner@ffii.org>
    This file is part of GNU Libtool.
 
@@ -20,10 +20,7 @@ USA. */
 
 #include "foo.h"
 #include <stdio.h>
-
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 #define nothing libfoo2_LTX_nothing
 #define foo2   libfoo2_LTX_foo2

diff --git a/tests/mdemo2/configure.ac b/tests/mdemo2/configure.ac
index b824a88dabf730b76ee95799896fa184b18b2083..7c56d832e6812fe092f0d54c81c879652eda0f81 100644 (file)
--- a/tests/mdemo2/configure.ac
+++ b/tests/mdemo2/configure.ac
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2007 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
@@ -37,7 +37,6 @@ AM_INIT_AUTOMAKE
 ## C compiler checks. ##
 ## ------------------ ##
 AC_PROG_CC
-AC_C_CONST
 
 
 ## ----------------------- ##
@@ -51,16 +50,6 @@ test "X$enable_static" = Xyes && STATIC="-static"
 AC_SUBST([STATIC])
 
 
-## ----------------------------- ##
-## C headers required by mdemo2. ##
-## ----------------------------- ##
-
-
-## ----------------------------- ##
-## Libraries required by mdemo2. ##
-## ----------------------------- ##
-
-
 ## -------- ##
 ## Outputs. ##
 ## -------- ##

diff --git a/tests/pdemo/configure.ac b/tests/pdemo/configure.ac
index 551a01e426a6b8fa9a6b6f87536f7089c1dbfba8..42cb251405670eb6553e056c080271d2a27c7357 100644 (file)
--- a/tests/pdemo/configure.ac
+++ b/tests/pdemo/configure.ac
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2007 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
@@ -37,7 +37,6 @@ AM_INIT_AUTOMAKE
 ## C compiler checks. ##
 ## ------------------ ##
 AC_PROG_CC
-AC_C_CONST
 
 
 ## ----------------------- ##
@@ -56,12 +55,6 @@ esac
 AM_CONDITIONAL([BINARY_HELLDL], [test "X$binary_helldl" = Xyes])
 
 
-## ---------------------------- ##
-## C headers required by pdemo. ##
-## ---------------------------- ##
-AC_CHECK_HEADERS([string.h math.h])
-
-
 ## ---------------------------- ##
 ## Libraries required by pdemo. ##
 ## ---------------------------- ##

diff --git a/tests/pdemo/longer_file_name_dlmain.c b/tests/pdemo/longer_file_name_dlmain.c
index 6c31e6d79dae7972412951c9939f4f23af88fb5b..a2ed72babe38e6d85cf2ea531a420ae06495534e 100644 (file)
--- a/tests/pdemo/longer_file_name_dlmain.c
+++ b/tests/pdemo/longer_file_name_dlmain.c
@@ -1,5 +1,5 @@
 /* dlmain.c -- hello test program that uses simulated dynamic linking
-   Copyright (C) 1996-1999, 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2004, 2006, 2007 Free Software Foundation, Inc.
    This file is part of GNU Libtool.
 
 This program is free software; you can redistribute it and/or modify
@@ -19,10 +19,7 @@ USA. */
 
 #include "foo.h"
 #include <stdio.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 
 #define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
 

diff --git a/tests/pdemo/longer_file_name_foo.c b/tests/pdemo/longer_file_name_foo.c
index 383d14e89598630418a302d7a12922c17602b487..a5ea192e8046f451577fa357e717315d577e5312 100644 (file)
--- a/tests/pdemo/longer_file_name_foo.c
+++ b/tests/pdemo/longer_file_name_foo.c
@@ -1,5 +1,5 @@
 /* foo.c -- trivial test function for libfoo
-   Copyright (C) 1996-1999 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2007 Free Software Foundation, Inc.
    Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
    This file is part of GNU Libtool.
 
@@ -23,10 +23,7 @@ USA. */
 #undef _LIBFOO_COMPILATION_
 
 #include <stdio.h>
-
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 /* Give a global variable definition. */
 int nothing = FOO_RET;

diff --git a/tests/pdemo/longer_file_name_foo2.c b/tests/pdemo/longer_file_name_foo2.c
index 9e4b28b58e041b29d6604b998a8b60d2510381a0..eaecb46ec1685867d244bb6a233ae4c25be1616f 100644 (file)
--- a/tests/pdemo/longer_file_name_foo2.c
+++ b/tests/pdemo/longer_file_name_foo2.c
@@ -1,5 +1,5 @@
 /* foo.c -- trivial test function for libfoo
-   Copyright (C) 1996-1999 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2007 Free Software Foundation, Inc.
    Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
    This file is part of GNU Libtool.
 
@@ -23,10 +23,7 @@ USA. */
 #undef _LIBFOO_COMPILATION_
 
 #include <stdio.h>
-
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 int
 foo2()

diff --git a/tests/tagdemo/configure.ac b/tests/tagdemo/configure.ac
index a3a46c7f78015443eb3ea0ec2e852af28a039a98..acffad17b04ab81d3398519443c106dc17f7e75e 100644 (file)
--- a/tests/tagdemo/configure.ac
+++ b/tests/tagdemo/configure.ac
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2007 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
@@ -69,19 +69,6 @@ using namespace std;
 AC_LANG_POP([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
-# the test language to C.  We do it before any libtool setup macros are
-# 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_LANG_PUSH([C])
-AC_OBJEXT
-AC_EXEEXT
-AC_LANG_POP
-
-
 ## ----------------------- ##
 ## Libtool initialisation. ##
 ## ----------------------- ##
@@ -91,12 +78,6 @@ AC_LANG([C++])
 LT_INIT
 
 
-## ------------------------------ ##
-## C headers required by tagdemo. ##
-## ------------------------------ ##
-AC_CHECK_HEADERS([math.h])
-
-
 ## ------------------------------ ##
 ## Libraries required by tagdemo. ##
 ## ------------------------------ ##

diff --git a/tests/tagdemo/foo.cpp b/tests/tagdemo/foo.cpp
index 8b980145679ffffc15b318b77deb95782293dbf1..dd65ad585fd333380c577e1aac6df94955b290e0 100644 (file)
--- a/tests/tagdemo/foo.cpp
+++ b/tests/tagdemo/foo.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //    foo.cpp -- trivial test library
-//    Copyright (C) 1998-2000 Free Software Foundation, Inc.
+//    Copyright (C) 1998-2000, 2007 Free Software Foundation, Inc.
 //    Originally by Thomas Tanner <tanner@ffii.org>
 //    This file is part of GNU Libtool.
 
@@ -30,9 +30,7 @@ namespace std { }
 using namespace std;
 #endif
 
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 // Our C functions.
 int