OSSP CVS Repository

ossp - Check-in [1998]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 1998
Date: 2002-Mar-13 19:19:38 (local)
2002-Mar-13 18:19:38 (UTC)
User:rse
Branch:
Comment: upgrade build environment to Autoconf 2.53
Tickets:
Inspections:
Files:
ossp-pkg/val/acconfig.h      1.1->removed
ossp-pkg/val/aclocal.m4      1.4 -> 1.5     14 inserted, 7 deleted
ossp-pkg/val/configure.ac      1.3 -> 1.4     16 inserted, 14 deleted
ossp-pkg/val/devtool.conf      1.4 -> 1.5     7 inserted, 3 deleted
ossp-pkg/val/devtool.func      1.1 -> 1.2     2 inserted, 1 deleted
ossp-pkg/val/acconfig.h 1.1 -> 1.2

ossp-pkg/val/aclocal.m4 1.4 -> 1.5 

--- aclocal.m4   2002/01/30 18:55:23     1.4
+++ aclocal.m4   2002/03/13 18:19:38     1.5
@@ -1,11 +1,11 @@
 dnl ##
-dnl ##  val - OSSP Value Library
-dnl ##  Copyright (c) 2002 Ralf S. Engelschall <rse@engelschall.com>
-dnl ##  Copyright (c) 2002 The OSSP Project <http://www.ossp.org/>
-dnl ##  Copyright (c) 2002 Cable & Wireless Deutschland <http://www.cw.com/de/>
+dnl ##  OSSP val -- Variable Expansion
+dnl ##  Copyright (c) 2001-2002 Ralf S. Engelschall <rse@engelschall.com>
+dnl ##  Copyright (c) 2001-2002 The OSSP Project <http://www.ossp.org/>
+dnl ##  Copyright (c) 2001-2002 Cable & Wireless Deutschland <http://www.cw.com/de/>
 dnl ##
-dnl ##  This file is part of OSSP val, a Value library which
-dnl ##  can be found at http://www.ossp.org/pkg/val/.
+dnl ##  This file is part of OSSP val, a value access library
+dnl ##  which can be found at http://www.ossp.org/pkg/lib/val/.
 dnl ##
 dnl ##  Permission to use, copy, modify, and distribute this software for
 dnl ##  any purpose with or without fee is hereby granted, provided that
@@ -28,6 +28,14 @@
 dnl ##  aclocal.m4: GNU Autoconf local macro definitions
 dnl ##
 
+AC_DEFUN(EN_PROG_CC,[dnl
+  AC_PROG_CC
+  AC_PROG_CC_STDC
+  if test ".$ac_cv_prog_cc_stdc" = .no; then
+      AC_MSG_ERROR([require an ANSI/ISO C compliant compiler])
+  fi
+])
+
 dnl ##
 dnl ##  Check whether compiler option works
 dnl ##
@@ -77,7 +85,6 @@
               * ) AC_COMPILER_OPTION(pipe, -pipe, -pipe, CFLAGS="$CFLAGS -pipe") ;;
     esac
     AC_COMPILER_OPTION(defdbg, -DDEBUG, -DDEBUG, CFLAGS="$CFLAGS -DDEBUG")
-    AC_COMPILER_OPTION(ggdb3, -ggdb3, -ggdb3, CFLAGS="$CFLAGS -ggdb3")
     CFLAGS="$CFLAGS -pedantic"
     CFLAGS="$CFLAGS -Wall"
     WMORE="-Wshadow -Wpointer-arith -Wcast-align -Winline"

ossp-pkg/val/configure.ac 1.3 -> 1.4 

--- configure.ac 2002/01/31 09:09:43     1.3
+++ configure.ac 2002/03/13 18:19:38     1.4
@@ -28,27 +28,29 @@
 dnl ##  configure.ac: GNU Autoconf source script
 dnl ##
 
-AC_PREREQ(2.52)
-AC_REVISION(1.0)
-AC_INIT(README)
-
-AC_DIVERT_PUSH(NOTICE)
+dnl #   prerequisites, initialization and input control
+AC_PREREQ(2.53)
+AC_INIT
 V=`./shtool version -l txt -d long VERSION`
-./shtool echo -e "Configuring %BOSSP val%b (Value Access), Version %B${V}%b"
-AC_DIVERT_POP()
+./shtool echo -e "Configuring %BOSSP val%b (Value Access), version %B${V}%b"
+AC_CONFIG_SRCDIR(val.h)
 
-AC_SET_MAKE
-AC_PROG_CC
+dnl #   checks for build programs
+AC_PROG_MAKE_SET
+EN_PROG_CC
 AC_CHECK_DEBUGGING
-
 sinclude(libtool.m4)
 AC_PROG_LIBTOOL
 
-AC_CHECK_EXTLIB([OSSP ex], ex, __ex_ctx, ex.h, [AC_DEFINE(WITH_EX)])
+dnl #   checks for external libraries
+AC_CHECK_EXTLIB([OSSP ex], ex, __ex_ctx, ex.h,
+                [AC_DEFINE(WITH_EX, 1, [Define to 1 if building with OSSP ex])])
+AC_CHECK_EXTLIB([Dmalloc], dmalloc, dmalloc_debug, dmalloc.h, 
+                [AC_DEFINE(WITH_DMALLOC, 1, [Define to 1 if building with Dmalloc])])
 
+dnl #   output generation
 AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_FILES(Makefile val-config)
+AC_CONFIG_FILES([Makefile val-config])
+AC_CONFIG_COMMANDS([adjustment], [chmod a+x val-config])
 AC_OUTPUT
 
-chmod a+x val-config
-

ossp-pkg/val/devtool.conf 1.4 -> 1.5 

--- devtool.conf 2002/01/21 13:24:27     1.4
+++ devtool.conf 2002/03/13 18:19:38     1.5
@@ -3,9 +3,9 @@
 ##
 
 %autogen
-    @autogen shtool   1.5.4 "1.5.*" all
+    @autogen shtool   1.6.0 "1.[56].*" all
     @autogen libtool  1.4.2 "1.4*"
-    @autogen autoconf 2.52  "2.5.*"
+    @autogen autoconf 2.53  "2.5[3-9]*"
 
 %autoclean
     @autoclean shtool
@@ -16,11 +16,15 @@
     ./configure \
         --prefix=/tmp/val \
         --disable-shared \
+        --enable-maintainer \
         --enable-debug \
         "$@"
 
 %version
-    ./shtool version -l txt -n "OSSP val" -e VERSION
+    shtool version -l txt -n "OSSP val" -p "val_" -e VERSION
+    V=`shtool version -l txt -d long VERSION`
+    sed -e "s/Version .*(.*)/Version $V/g" <README >README.n 
+    mv README.n README
 
 %dist
     make distclean >/dev/null 2>&1

ossp-pkg/val/devtool.func 1.1 -> 1.2 

--- devtool.func 2002/01/09 10:44:28     1.1
+++ devtool.func 2002/03/13 18:19:38     1.2
@@ -1,6 +1,6 @@
 ##
 ##  devtool.func -- Development Tool Functions
-##  Copyright (c) 2001 Ralf S. Engelschall <rse@engelschall.com> 
+##  Copyright (c) 2001-2002 Ralf S. Engelschall <rse@engelschall.com> 
 ##
 
 devtool_require () {
@@ -33,6 +33,7 @@
             echo "generating (GNU Autoconf $autoconf_version): configure config.h.in"
             autoconf
             autoheader 2>&1 | grep -v "is unchanged"
+            rm -rf autom4te.cache >/dev/null 2>&1
             ;;
         libtool )
             libtoolize_version=`devtool_require libtoolize --version 4 "$1" "$2"`

CVSTrac 2.0.1