sync with upstream

Original commit message from CVS:
sync with upstream

5 files changed, 49 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index f4834a5..67a4a98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-01  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* m4/as-compiler-flag.m4:
+	* m4/as-compiler.m4:
+	* m4/as-libtool.m4:
+	* m4/as-version.m4:
+	  sync with upstream, change sticky options to -ko
+
 2004-05-24  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* m4/as-scrub-include.m4: synced with upstream
diff --git a/m4/as-compiler-flag.m4 b/m4/as-compiler-flag.m4
index 2f0ba19..aba31b1 100644
--- a/m4/as-compiler-flag.m4
+++ b/m4/as-compiler-flag.m4
@@ -1,7 +1,15 @@
-dnl as-compiler-flag.m4 0.0.1
+dnl as-compiler-flag.m4 0.1.0
+
 dnl autostars m4 macro for detection of compiler flags
-dnl
-dnl ds@schleef.org
+
+dnl David Schleef <ds@schleef.org>
+
+dnl $Id: as-compiler-flag.m4,v 1.1 2004/06/01 09:33:45 thomasvs Exp $
+
+dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
+dnl Tries to compile with the given CFLAGS.
+dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags,
+dnl and ACTION-IF-NOT-ACCEPTED otherwise.
 
 AC_DEFUN([AS_COMPILER_FLAG],
 [
diff --git a/m4/as-compiler.m4 b/m4/as-compiler.m4
index 8918811..acbfeb1 100644
--- a/m4/as-compiler.m4
+++ b/m4/as-compiler.m4
@@ -1,10 +1,13 @@
-dnl as-compiler.m4 0.0.2
-dnl autostars m4 macro for detection of compiler flavour
-dnl
-dnl thomas@apestaart.org
+dnl as-compiler.m4 0.1.0
+                                                                                
+dnl autostars m4 macro for detection of compiler flavor
 
+dnl Thomas Vander Stichele <thomas at apestaart dot org>
+
+dnl $Id: as-compiler.m4,v 1.4 2004/06/01 09:44:19 thomasvs Exp $
+                                                                                
 dnl AS_COMPILER(COMPILER)
-dnl will set COMPILER to
+dnl will set variable COMPILER to
 dnl - gcc
 dnl - forte
 dnl - (empty) if no guess could be made
diff --git a/m4/as-libtool.m4 b/m4/as-libtool.m4
index 807cf24..15e2cce 100644
--- a/m4/as-libtool.m4
+++ b/m4/as-libtool.m4
@@ -1,17 +1,22 @@
 dnl as-libtool.m4 0.1.3
+
 dnl autostars m4 macro for libtool versioning
-dnl thomas@apestaart.org
-dnl
+
+dnl Thomas Vander Stichele <thomas at apestaart dot org>
+
+dnl $Id: as-libtool.m4,v 1.7 2004/06/01 09:44:19 thomasvs Exp $
+
 dnl AS_LIBTOOL(PREFIX, CURRENT, REVISION, AGE, RELEASE)
+
 dnl example
 dnl AS_VERSION(GST, 2, 0, 0)
-dnl
+
 dnl this macro
 dnl - defines [$PREFIX]_CURRENT, REVISION AND AGE
 dnl - defines [$PREFIX]_LIBVERSION
 dnl - defines [$PREFIX]_LT_LDFLAGS to set versioning
 dnl - AC_SUBST's them all
-dnl
+
 dnl if USE_RELEASE is used, then add a -release option to the LDFLAGS
 dnl with the given release version
 dnl then use [$PREFIX]_LT_LDFLAGS in the relevant Makefile.am's
@@ -35,21 +40,4 @@ dnl  [$1]_LT_LDFLAGS="$[$1]_LT_LDFLAGS -version-info $[$1]_LIBVERSION"
   AC_SUBST([$1]_LT_LDFLAGS)
 
   AC_LIBTOOL_DLOPEN
-  AM_PROG_LIBTOOL
-
-  case "$host" in
-    *-*-mingw*)
-      as_libtool_win32=yes
-      enable_static=no
-      enable_shared=yes
-      ;;
-    *)
-      as_libtool_win32=no
-      ;;
-  esac
-  AM_CONDITIONAL(AS_LIBTOOL_WIN32, [test "$as_libtool_win32" = "yes"])
-
-  m4_pattern_allow([AS_LIBTOOL_WIN32])
-  m4_pattern_allow([AS_LIBTOOL_WIN32_TRUE])
-  m4_pattern_allow([AS_LIBTOOL_WIN32_FALSE])
 ])
diff --git a/m4/as-version.m4 b/m4/as-version.m4
index 4df69db..e419f03 100644
--- a/m4/as-version.m4
+++ b/m4/as-version.m4
@@ -1,12 +1,18 @@
-dnl version.m4 0.0.5
+dnl as-version.m4 0.1.0
+
 dnl autostars m4 macro for versioning
-dnl thomas@apestaart.org
-dnl
-dnl AS_VERSION(PACKAGE, PREFIX, MAJOR, MINOR, MICRO, NANO, ACTION_IF_NO_NANO, ACTION_IF_NANO)
+
+dnl Thomas Vander Stichele <thomas at apestaart dot org>
+
+dnl $Id: as-version.m4,v 1.13 2004/06/01 09:44:19 thomasvs Exp $
+
+dnl AS_VERSION(PACKAGE, PREFIX, MAJOR, MINOR, MICRO, NANO,
+dnl            ACTION-IF-NO-NANO, [ACTION-IF-NANO])
+
 dnl example
 dnl AS_VERSION(gstreamer, GST_VERSION, 0, 3, 2,)
 dnl for a 0.3.2 release version
-dnl
+
 dnl this macro
 dnl - defines [$PREFIX]_MAJOR, MINOR and MICRO
 dnl - if NANO is empty, then we're in release mode, else in cvs/dev mode
@@ -18,6 +24,7 @@ dnl - doesn't call AM_INIT_AUTOMAKE anymore because it prevents
 dnl   maintainer mode from running ok
 dnl
 dnl don't forget to put #undef [$2] and [$2]_RELEASE in acconfig.h
+dnl if you use acconfig.h
 
 AC_DEFUN([AS_VERSION],
 [
@@ -37,7 +44,7 @@ AC_DEFUN([AS_VERSION],
   else
       AC_MSG_NOTICE(configuring [$1] for development with nano $NANO)
       VERSION=[$3].[$4].[$5].$NANO
-      [$2]_RELEASE=`date +%Y%m%d_%H%M%S`
+      [$2]_RELEASE=0.`date +%Y%m%d.%H%M%S`
       dnl execute action
       ifelse([$8], , :, [$8])
   fi