OSSP CVS Repository

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

Check-in Number: 2207
Date: 2002-Jul-01 14:54:54 (local)
2002-Jul-01 12:54:54 (UTC)
User:rse
Branch:
Comment: Finally make Pth working again under new Autoconf 2.53 environment.
Tickets:
Inspections:
Files:
ossp-pkg/pth/ChangeLog      1.561 -> 1.562     4 inserted, 0 deleted
ossp-pkg/pth/PORTING      1.186 -> 1.187     1 inserted, 0 deleted
ossp-pkg/pth/acconfig.h      1.29->removed
ossp-pkg/pth/acheader.m4      1.7->removed
ossp-pkg/pth/aclocal.m4      1.94 -> 1.95     14 inserted, 15 deleted
ossp-pkg/pth/configure.ac      1.2 -> 1.3     10 inserted, 8 deleted
ossp-pkg/pth/devtool.conf      1.2 -> 1.3     16 inserted, 14 deleted
ossp-pkg/pth/devtool.func      1.1 -> 1.2     2 inserted, 1 deleted

ossp-pkg/pth/ChangeLog 1.561 -> 1.562

--- ChangeLog    2002/04/27 11:18:57     1.561
+++ ChangeLog    2002/07/01 12:54:54     1.562
@@ -19,6 +19,10 @@
     | |_ ___) |
   __|_(_)____/____________________________________________________________
 
+   *) Upgraded to Autoconf 2.53 environment and cleaned up internal
+      Autoconf macro usage.
+      [Ralf S. Engelschall]
+
    *) Fixed lots of English errors in the manual page.
       [Felix Berger <bflat1@gmx.net>]
 


ossp-pkg/pth/PORTING 1.186 -> 1.187

--- PORTING      2002/01/27 16:39:22     1.186
+++ PORTING      2002/07/01 12:54:54     1.187
@@ -38,6 +38,7 @@
   i686-pc-freebsd4.3                  | sjlj/ssjlj/sas    | down    | 1.4a4
   i686-pc-freebsd4.2                  | sjlj/ssjlj/sas    | down    | 1.3.7
   i586-pc-freebsd5.0                  | sjlj/ssjlj/sas    | down    | 1.3.4
+  i386-unknown-freebsd4.6             | sjlj/ssjlj/sas    | down    | 1.5b1
   alpha-unknown-freebsd4.0            | sjlj/ssjlj/sas    | down    | 1.3.0
   alpha-unknown-freebsd5.0            | sjlj/ssjlj/sas    | down    | 1.3.5
   powerpc-unknown-netbsd              | sjlj/ssjlj/sas    | down    | 1.3.2


ossp-pkg/pth/acconfig.h 1.29 -> 1.30



ossp-pkg/pth/acheader.m4 1.7 -> 1.8



ossp-pkg/pth/aclocal.m4 1.94 -> 1.95

--- aclocal.m4   2002/01/30 13:06:09     1.94
+++ aclocal.m4   2002/07/01 12:54:54     1.95
@@ -140,7 +140,6 @@
 dnl ##
 
 AC_DEFUN(AC_HEADLINE,[dnl
-AC_DIVERT_PUSH(NOTICE)dnl
 #   configuration header
 if test ".`echo dummy [$]@ | grep enable-subdir`" != .; then
     enable_subdir=yes
@@ -177,7 +176,6 @@
     $3_HEX="`$ac_shtool version -lc -dhex $ac_srcdir/$4`"
     AC_SUBST($3_HEX)
 fi
-AC_DIVERT_POP()
 ])dnl
 
 dnl ##
@@ -341,7 +339,7 @@
  ])dnl
 AC_MSG_RESULT([$ac_cv_type_longlong])
 if test ".$ac_cv_type_longlong" = .yes; then
-    AC_DEFINE(HAVE_LONGLONG)
+    AC_DEFINE(HAVE_LONGLONG, 1, [define if "long long" type exists])
 fi
 ])dnl
 
@@ -360,7 +358,7 @@
  ])dnl
 AC_MSG_RESULT([$ac_cv_type_longdouble])
 if test ".$ac_cv_type_longdouble" = .yes; then
-    AC_DEFINE(HAVE_LONGDOUBLE)
+    AC_DEFINE(HAVE_LONGDOUBLE, 1, [define if "long double" type exists])
 fi
 ])dnl
 
@@ -388,7 +386,6 @@
         *-pipe* ) ;;
               * ) AC_COMPILER_OPTION(pipe, -pipe, -pipe, CFLAGS="$CFLAGS -pipe") ;;
     esac
-    AC_COMPILER_OPTION(ggdb3, -ggdb3, -ggdb3, CFLAGS="$CFLAGS -ggdb3")
     case $PLATFORM in
         *-*-freebsd*|*-*-solaris* ) CFLAGS="$CFLAGS -pedantic" ;;
     esac
@@ -404,7 +401,7 @@
     esac
 fi
 msg="enabled"
-AC_DEFINE(PTH_DEBUG)
+AC_DEFINE(PTH_DEBUG, 1, [define to enable Pth debugging])
 ],[
 if test ".$ac_cv_prog_gcc" = ".yes"; then
 case "$CFLAGS" in
@@ -572,7 +569,8 @@
 ], ac_cv_define_$1=yes, ac_cv_define_$1=no)])dnl
 AC_MSG_RESULT($ac_cv_define_$1)
 if test $ac_cv_define_$1 = yes; then
-    AC_DEFINE(HAVE_[]translit($1, [a-z], [A-Z]))
+    AC_DEFINE(HAVE_[]translit($1, [a-z], [A-Z]), 1,
+              [define if pre-processor define $1 exists in header $2])
 fi
 ])
 
@@ -597,7 +595,8 @@
 ], ac_cv_typedef_$1=yes, ac_cv_typedef_$1=no)])dnl
 AC_MSG_RESULT($ac_cv_typedef_$1)
 if test $ac_cv_typedef_$1 = yes; then
-    AC_DEFINE(HAVE_[]translit($1, [a-z], [A-Z]))
+    AC_DEFINE(HAVE_[]translit($1, [a-z], [A-Z]), 1,
+              [define if typedef $1 exists in header $2])
 fi
 ])
 
@@ -614,7 +613,6 @@
 AC_REQUIRE([AC_HEADER_STDC])dnl
 AC_MSG_CHECKING(for attribute $1 in struct $2 from $3)
 AC_CACHE_VAL(ac_cv_structattr_$1,[dnl
-
 AC_TRY_LINK([
 #include <sys/types.h>
 #include <$3>
@@ -625,7 +623,8 @@
 ], ac_cv_structattr_$1=yes, ac_cv_structattr_$1=no)])dnl
 AC_MSG_RESULT($ac_cv_structattr_$1)
 if test $ac_cv_structattr_$1 = yes; then
-    AC_DEFINE(HAVE_[]translit($1, [a-z], [A-Z]))
+    AC_DEFINE(HAVE_[]translit($1, [a-z], [A-Z]), 1,
+              [define if attribute $1 exists in struct $2 from header $3])
 fi
 ])
 
@@ -942,7 +941,7 @@
 else
     val="+1"
 fi
-AC_DEFINE_UNQUOTED($1, $val)
+AC_DEFINE_UNQUOTED($1, $val, [define for stack growth])
 ])
 
 dnl ##
@@ -1160,7 +1159,7 @@
 nsig=32
 )
 AC_MSG_RESULT([$nsig])
-AC_DEFINE_UNQUOTED($1, $nsig)
+AC_DEFINE_UNQUOTED($1, $nsig, [define for number of signals])
 ])
 
 dnl ##
@@ -1182,7 +1181,7 @@
 
 AC_DEFUN(AC_CHECK_EXTLIB,[dnl
 AC_ARG_WITH($2,[dnl
-[  --with-]m4_substr([$2[[=DIR]]                 ], 0, 19)[build against $1 library (default=no)]],
+[  --with-]m4_substr([$2[[=DIR]]                 ], 0, 19)[build against $1 library (default=no)]],[dnl
     if test ".$with_$2" = .yes; then
         #   via config script
         $2_version=`($2-config --version) 2>/dev/null`
@@ -1247,7 +1246,7 @@
             fi
         fi
     fi
-    AC_HAVE_HEADERS($4)
+    AC_CHECK_HEADER($4)
     AC_CHECK_LIB($2, $3)
     AC_IFALLYES(header:$4 lib:$2_$3, with_$2=yes, with_$2=no)
     if test ".$with_$2" = .no; then
@@ -1257,7 +1256,7 @@
 if test ".$with_$2" = .; then
     with_$2=no
 fi
-)dnl
+])dnl
 AC_MSG_CHECKING(whether to build against $1 library)
 if test ".$with_$2" = .yes; then
     ifelse([$5], , :, [$5])


ossp-pkg/pth/configure.ac 1.2 -> 1.3

--- configure.ac 2002/01/30 13:15:50     1.2
+++ configure.ac 2002/07/01 12:54:54     1.3
@@ -268,7 +268,7 @@
     *-*-isc* )  msg="no" ;; # on ISC the compiler test doesn't work
 esac
 if test ".$msg" = .yes; then
-    AC_DEFINE(HAVE_GETTIMEOFDAY_ARGS1)
+    AC_DEFINE(HAVE_GETTIMEOFDAY_ARGS1, 1, [define if gettimeofday(2) wants a single-argument only])
 fi
 AC_MSG_RESULT([$msg])
 
@@ -286,7 +286,7 @@
 msg="no"
 )
 if test ".$msg" = .yes; then
-    AC_DEFINE(HAVE_STRUCT_TIMESPEC)
+    AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1, [define if exists "struct timespec"])
 fi
 AC_MSG_RESULT([$msg])
 
@@ -323,7 +323,7 @@
 dnl #
 
 dnl #  check for MCSC method
-AC_CHECK_HEADERS(ucontext.h)
+AC_CHECK_HEADER(ucontext.h,,, [#include <sys/types.h>])
 AC_CHECK_FUNCS(makecontext swapcontext getcontext setcontext)
 AC_CHECK_MCSC(mcsc=yes, mcsc=no)
 
@@ -440,9 +440,9 @@
 dnl #  5. export the results
 dnl #
 
-AC_DEFINE_UNQUOTED(PTH_MCTX_MTH_use, [PTH_MCTX_MTH_$mctx_mth])
-AC_DEFINE_UNQUOTED(PTH_MCTX_DSP_use, [PTH_MCTX_DSP_$mctx_dsp])
-AC_DEFINE_UNQUOTED(PTH_MCTX_STK_use, [PTH_MCTX_STK_$mctx_stk])
+AC_DEFINE_UNQUOTED(PTH_MCTX_MTH_use, [PTH_MCTX_MTH_$mctx_mth], [define for machine context method])
+AC_DEFINE_UNQUOTED(PTH_MCTX_DSP_use, [PTH_MCTX_DSP_$mctx_dsp], [define for machine context dispatching])
+AC_DEFINE_UNQUOTED(PTH_MCTX_STK_use, [PTH_MCTX_STK_$mctx_stk], [define for machine context stack])
 
 PTH_MCTX_ID="$mctx_mth/$mctx_dsp/$mctx_stk"
 AC_MSG_RESULT([decision on mctx implementation... ${TB}${PTH_MCTX_ID}${TN}])
@@ -575,7 +575,8 @@
 AC_SUBST(TEST_PTHREAD)
 
 dnl #   whether to build against OSSP ex library
-AC_CHECK_EXTLIB(OSSP ex, ex, __ex_ctx, ex.h, AC_DEFINE(PTH_EX))
+AC_CHECK_EXTLIB(OSSP ex, ex, __ex_ctx, ex.h, 
+                AC_DEFINE(PTH_EX, 1, [define if using OSSP ex in GNU pth]))
 
 dnl #   whether to build against Sfio library
 PTH_EXT_SFIO=0
@@ -583,7 +584,8 @@
 AC_SUBST(PTH_EXT_SFIO)
 
 dnl #   whether to build against Dmalloc library
-AC_CHECK_EXTLIB(Dmalloc, dmalloc, dmalloc_debug, dmalloc.h, AC_DEFINE(PTH_DMALLOC))
+AC_CHECK_EXTLIB(Dmalloc, dmalloc, dmalloc_debug, dmalloc.h, 
+                AC_DEFINE(PTH_DMALLOC, 1, [define if using Dmalloc in GNU pth]))
 
 dnl ##
 dnl ##  OUTPUT SUBSTITUTION


ossp-pkg/pth/devtool.conf 1.2 -> 1.3

--- devtool.conf 2002/01/30 13:15:33     1.2
+++ devtool.conf 2002/07/01 12:54:54     1.3
@@ -3,10 +3,9 @@
 ##
 
 %autogen
-    @autogen shtool   1.5.4 "1.5.*" echo version scpp mkdir install fixperm tarball
+    @autogen shtool   1.6.0 "1.6.*" echo version scpp mkdir install fixperm tarball
     @autogen libtool  1.4.2 "1.4*"
-    @autogen autoconf 2.52  "2.5.*"
-        cat acheader.m4 configure.ac | autoheader - >pth_acdef.h.in
+    @autogen autoconf 2.53  "2.5.*"
 
 %autoclean
     @autoclean shtool
@@ -20,7 +19,10 @@
     else
         param=devel
     fi
-    ./configure --with-param=$param "$@"
+    ./configure \
+        --cache-file=config.cache \
+        --with-param=$param \
+        "$@"
 
 %version
     ./shtool version -lc -n 'GNU Pth' -p pth_internal_ -e pth_vers.c
@@ -40,16 +42,16 @@
                      -e 'CVS,\.cvsignore,\.[ao],^\.,devtool*' -c 'gzip --best' .
 
 %striptease
-        perl striptease.pl
+    perl striptease.pl
 
 %depend
-        cp Makefile.in Makefile.in.bak
-        sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in >Makefile.new
-        gcc -MM -I. *.c |\
-        perl -e 'my $d = ""; $d .= $_ while (<STDIN>); $_ = $d; \
-                 s/^(pth_.*)\.o:/$1.lo:/mg; \
-                 s|\\\n\s*| |sg; s|\b?\S*/\S*\b?||g; s|\s{2,}| |g; \
-                 print $_;' >> Makefile.new
-        cp Makefile.new Makefile.in
-        rm -f Makefile.new
+    cp Makefile.in Makefile.in.bak
+    sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in >Makefile.new
+    gcc -MM -I. *.c |\
+    perl -e 'my $d = ""; $d .= $_ while (<STDIN>); $_ = $d; \
+             s/^(pth_.*)\.o:/$1.lo:/mg; \
+             s|\\\n\s*| |sg; s|\b?\S*/\S*\b?||g; s|\s{2,}| |g; \
+             print $_;' >> Makefile.new
+    cp Makefile.new Makefile.in
+    rm -f Makefile.new
 


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

--- devtool.func 2002/01/30 12:54:22     1.1
+++ devtool.func 2002/07/01 12:54:54     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