summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-06-01 10:05:04 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-06-01 10:05:04 +0000
commitcf0828313f7cea4d5840c0959e9113f13309a56f (patch)
treec8a38ff6a5f4c9311fa7175e98d688150402166c
parenta32d34423357b3666973977aafdfcd4fcbfe998a (diff)
downloadgstreamer-common-cf0828313f7cea4d5840c0959e9113f13309a56f.tar.gz
upstream fixes
Original commit message from CVS: upstream fixes
-rw-r--r--m4/as-libtool.m430
1 files changed, 24 insertions, 6 deletions
diff --git a/m4/as-libtool.m4 b/m4/as-libtool.m4
index 15e2cce..e25cdc6 100644
--- a/m4/as-libtool.m4
+++ b/m4/as-libtool.m4
@@ -1,26 +1,28 @@
-dnl as-libtool.m4 0.1.3
+dnl as-libtool.m4 0.1.4
dnl autostars m4 macro for libtool versioning
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 $Id: as-libtool.m4,v 1.8 2004/06/01 10:05:04 thomasvs Exp $
-dnl AS_LIBTOOL(PREFIX, CURRENT, REVISION, AGE, RELEASE)
+dnl AS_LIBTOOL(PREFIX, CURRENT, REVISION, AGE, [RELEASE])
dnl example
-dnl AS_VERSION(GST, 2, 0, 0)
+dnl AS_LIBTOOL(GST, 2, 0, 0)
dnl this macro
-dnl - defines [$PREFIX]_CURRENT, REVISION AND AGE
+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 if USE_RELEASE is used, then add a -release option to the LDFLAGS
+dnl if RELEASE is given, 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
+dnl call AM_PROG_LIBTOOL after this call
+
AC_DEFUN([AS_LIBTOOL],
[
[$1]_CURRENT=[$2]
@@ -40,4 +42,20 @@ dnl [$1]_LT_LDFLAGS="$[$1]_LT_LDFLAGS -version-info $[$1]_LIBVERSION"
AC_SUBST([$1]_LT_LDFLAGS)
AC_LIBTOOL_DLOPEN
+
+ 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])
])