summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
m---------common0
-rw-r--r--configure.ac14
3 files changed, 7 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 63e26f3e..76d1b45e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-12 David Schleef <ds@schleef.org>
+
+ * configure.ac: Fix test for Objective C
+
2004-07-12 Jan Schmidt <thaytan@mad.scientist.com>
* ext/gdk_pixbuf/gstgdkpixbuf.c: (gst_gdk_pixbuf_get_capslist),
(gst_gdk_pixbuf_chain):
diff --git a/common b/common
-Subproject 59a2885f01e3092ffaefbed270f331c143b16d6
+Subproject 8f16cd236828a8bb7be51696029e0e24b7a6c51
diff --git a/configure.ac b/configure.ac
index 3fda630d..75c21060 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,17 +44,8 @@ AC_PROG_CC
AM_PROG_CC_STDC
AM_PROG_AS
AS="${CC}"
-dnl objective-c for OSX (should check if os is darwin)
-AM_CONDITIONAL([am__fastdepOBJC], false)
-case "$host" in
- *-*darwin*)
- OBJC="${CC}"
- AC_SUBST(OBJC)
- OBJCFLAGS="${CFLAGS}"
- AC_SUBST(OBJCFLAGS)
- _AM_DEPENDENCIES(OBJC)
- ;;
-esac
+AS_PROG_OBJC
+
dnl the gettext stuff needed
AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT([external])
@@ -533,6 +524,7 @@ GST_CHECK_FEATURE(VCD, [Video CD], vcdsrc, [
dnl *** CDROM Audio ***
translit(dnm, m, l) AM_CONDITIONAL(USE_CDROM, true)
+
GST_CHECK_FEATURE(CDROM, [CDROM Audio], cdrom, [
AC_CHECK_HEADERS(linux/cdrom.h) dnl linux
AC_CHECK_HEADERS(sys/cdio.h) dnl almost everything else