From 072d23cfb4b55fbece3714dc2491ad52e7accdef Mon Sep 17 00:00:00 2001 From: David Schleef Date: Tue, 13 Jul 2004 06:36:55 +0000 Subject: configure.ac: Fix test for Objective C Original commit message from CVS: * configure.ac: Fix test for Objective C --- ChangeLog | 4 ++++ common | 2 +- configure.ac | 14 +++----------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63e26f3e..76d1b45e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-07-12 David Schleef + + * configure.ac: Fix test for Objective C + 2004-07-12 Jan Schmidt * ext/gdk_pixbuf/gstgdkpixbuf.c: (gst_gdk_pixbuf_get_capslist), (gst_gdk_pixbuf_chain): diff --git a/common b/common index 59a2885f..8f16cd23 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 59a2885f01e3092ffaefbed270f331c143b16d6b +Subproject commit 8f16cd236828a8bb7be51696029e0e24b7a6c517 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 -- cgit v1.2.1