diff options
| author | Andy Wingo <wingo@pobox.com> | 2001-12-20 20:41:28 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2001-12-20 20:41:28 +0000 |
| commit | 981cf4d212c9ddbf8f5acd233ab805737b59f07b (patch) | |
| tree | dddec1b3f0b6b6336a6f9ea3ddd7c4d2172631dd /m4 | |
| parent | 775656d35fc9abff716ab234ebc50bfdb993c9eb (diff) | |
this patch fixes arts and artsd compilation problems. this is necessary for make dist to work. i know plugins are bei...
Original commit message from CVS:
this patch fixes arts and artsd compilation problems. this is necessary for make
dist to work. i know plugins are being moved, though, this needs to be ported to
the -plugins module.
* experimental and broken selection now use GST_CHECK_FEATURE, for what it's worth
* crucial fixes to arts m4's that need backporting to autostars and -plugins
* make gst-feature less frantic in reporting missing plugins
* cleanups and misc arts fixes
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/as-arts.m4 | 6 | ||||
| -rw-r--r-- | m4/gst-artsc.m4 | 3 | ||||
| -rw-r--r-- | m4/gst-feature.m4 | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/m4/as-arts.m4 b/m4/as-arts.m4 index 29256e9a9..2d628199e 100644 --- a/m4/as-arts.m4 +++ b/m4/as-arts.m4 @@ -158,7 +158,7 @@ int main () : else echo "*** Could not run ARTS test program, checking why..." - CFLAGS="$CFLAGS $ARTS_CFLAGS" + CFLAGS="$CFLAGS $ARTS_CXXFLAGS" LIBS="$LIBS $ARTS_LIBS" AC_TRY_LINK([ #include <stdio.h> @@ -181,11 +181,11 @@ int main () LIBS="$ac_save_LIBS" fi fi - ARTS_CFLAGS="" + ARTS_CXXFLAGS="" ARTS_LIBS="" ifelse([$3], , :, [$3]) fi - AC_SUBST(ARTS_CFLAGS) + AC_SUBST(ARTS_CXXFLAGS) AC_SUBST(ARTS_LIBS) rm -f conf.artstest ]) diff --git a/m4/gst-artsc.m4 b/m4/gst-artsc.m4 index c0f683df0..723041b82 100644 --- a/m4/gst-artsc.m4 +++ b/m4/gst-artsc.m4 @@ -10,8 +10,7 @@ dnl AC_DEFUN(GST_CHECK_ARTSC, [ AC_PATH_PROG(ARTSC_CONFIG, artsc-config, no) - if test x$ARTSC_CONFIG = xno; then - if test x$ARTSC_CONFIG = xno; then + if test "x$ARTSC_CONFIG" = "xno"; then AC_MSG_WARN([Couldn't find artsc-config]) HAVE_ARTSC=no ARTSC_LIBS= diff --git a/m4/gst-feature.m4 b/m4/gst-feature.m4 index cc37f0188..b30836541 100644 --- a/m4/gst-feature.m4 +++ b/m4/gst-feature.m4 @@ -95,8 +95,8 @@ if test x$USE_[$1] = xyes; then ifelse([$6], , :, [$6]) GST_PLUGINS_YES="$GST_PLUGINS_YES \n\t[$3]" else - ifelse([$3], , :, [AC_MSG_WARN( -***** NOTE: These plugins won't be built: [$3] + ifelse([$3], , :, [AC_MSG_NOTICE( +These plugins will not be built: [$3] )]) GST_PLUGINS_NO="$GST_PLUGINS_NO \n\t[$3]" ifelse([$7], , :, [$7]) |