summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2001-12-20 21:27:27 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2001-12-20 21:27:27 +0000
commitf04c0de291ea41c895a376ba35f52f2a3c443451 (patch)
tree364cdcf0695bcbec6ae3163069d0d89eb690f4d1
parent55706bedf4c38f594cb09c9ee98e484d963b54ff (diff)
downloadgst-plugins-bad-f04c0de291ea41c895a376ba35f52f2a3c443451.tar.gz
gst-plugins-bad-f04c0de291ea41c895a376ba35f52f2a3c443451.tar.bz2
gst-plugins-bad-f04c0de291ea41c895a376ba35f52f2a3c443451.zip
wingo's changes
Original commit message from CVS: wingo's changes
-rw-r--r--m4/as-arts.m46
-rw-r--r--m4/gst-artsc.m43
2 files changed, 4 insertions, 5 deletions
diff --git a/m4/as-arts.m4 b/m4/as-arts.m4
index 29256e9a..2d628199 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 c0f683df..723041b8 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=