summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-02-13 17:37:06 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-02-13 17:37:06 +0000
commit19cb5127af898da4a72109547e9c31c4e14cc964 (patch)
tree09fe66a42a6bee214435184df430a006262b8715
parenta2d2883febd16e51a267a580cc4413b2a17a91a9 (diff)
downloadgstreamer-common-19cb5127af898da4a72109547e9c31c4e14cc964.tar.gz
am 1.6 requires AM_CONDITIONAL in configure.ac
Original commit message from CVS: am 1.6 requires AM_CONDITIONAL in configure.ac
-rw-r--r--ChangeLog6
-rw-r--r--m4/gst-feature.m41
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0fbf5cf..2dfc989 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-02-13 Thomas Vander Stichele <thomas at apestaart dot org>
+ * m4/gst-feature.m4:
+ remove AM_CONDITIONAL for the subsystem since automake 1.6.x
+ requires that call be in configure.ac
+
+2004-02-13 Thomas Vander Stichele <thomas at apestaart dot org>
+
* m4/gst-libxml2.m4:
take required version as argument, and default to 2.4.9 if not
specified
diff --git a/m4/gst-feature.m4 b/m4/gst-feature.m4
index 7c0a185..0bbf54d 100644
--- a/m4/gst-feature.m4
+++ b/m4/gst-feature.m4
@@ -197,7 +197,6 @@ AC_DEFUN([GST_CHECK_SUBSYSTEM_DISABLE],
else
GST_DISABLE_[$1]_DEFINE="/* #undef GST_DISABLE_$1 */"
fi
- AM_CONDITIONAL(GST_DISABLE_[$1], test x$GST_DISABLE_[$1] = xyes)
AC_SUBST(GST_DISABLE_[$1]_DEFINE)
undefine([subsys_def])
])