[gst-cvs] tpm gst-plugins: gst-plugins/

[<tp...@fr...>]

CVS Root:       /cvs/gstreamer
Module:         gst-plugins
Changes by:     tpm
Date:           Wed Oct 19 2005  05:34:40 PDT
Branch:         BRANCH-GSTREAMER-0_8

Log message:
* configure.ac:
Rewrite qcam check so that it shows a message why it's
not being built on all systems it doesn't work on.

Modified files:
    .               : ChangeLog configure.ac

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1641.2.397&r2=1.1641.2.398
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/configure.ac.diff?r1=1.524.2.44&r2=1.524.2.45

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins/ChangeLog,v
retrieving revision 1.1641.2.397
retrieving revision 1.1641.2.398
diff -u -d -r1.1641.2.397 -r1.1641.2.398
--- ChangeLog	19 Oct 2005 10:39:20 -0000	1.1641.2.397
+++ ChangeLog	19 Oct 2005 12:34:27 -0000	1.1641.2.398
@@ -1,3 +1,9 @@
+2005-10-19  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* configure.ac:
+	  Rewrite qcam check so that it shows a message why it's
+	  not being built on all systems it doesn't work on.
 2005-10-19  Brian Cameron  <brian dot cameron at sun dot com>
 
 	Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
Index: configure.ac
RCS file: /cvs/gstreamer/gst-plugins/configure.ac,v
retrieving revision 1.524.2.44
retrieving revision 1.524.2.45
diff -u -d -r1.524.2.44 -r1.524.2.45
--- configure.ac	6 Oct 2005 15:36:37 -0000	1.524.2.44
+++ configure.ac	19 Oct 2005 12:34:27 -0000	1.524.2.45
@@ -538,15 +538,20 @@
 dnl *** QuickCam ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_QCAM, true)
 GST_CHECK_FEATURE(QCAM, [QuickCam], qcamsrc, [
-  if test "x$HAVE_CPU_I386" != "xyes";
+  if test "x$HAVE_CPU_I386" == "xyes";
   then
-    HAVE_QCAM="no"
+    case "$host" in 
+      *-*-linux*)
+      AC_CHECK_HEADER(sys/io.h, HAVE_QCAM="yes", HAVE_QCAM="no")
+      ;;
+      *)
+      AC_MSG_WARN([QuickCam only works on i386-linux])
+      HAVE_QCAM="no"
+    esac
   else
-    AC_CHECK_HEADER(sys/io.h, HAVE_QCAM="yes", HAVE_QCAM="no")
-  fi
-  if test "x$HAVE_QCAM" != "xyes";
-  then
     AC_MSG_WARN([QuickCam only works on i386-linux])
+    HAVE_QCAM="no"
   fi
 ])