From: Thomas V. S. <tho...@us...> - 2003-02-04 22:01:25
|
CVS Root: /cvsroot/gstreamer Module: gst-editor Changes by: thomasvs Date: Tue Feb 04 2003 14:01:24 PST Log message: build with new gst Modified files: . : configure.ac Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-editor/configure.ac.diff?r1=1.26&r2=1.27 ====Begin Diffs==== Index: configure.ac =================================================================== RCS file: /cvsroot/gstreamer/gst-editor/configure.ac,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- configure.ac 29 Dec 2002 09:58:38 -0000 1.26 +++ configure.ac 4 Feb 2003 22:01:10 -0000 1.27 @@ -53,11 +53,31 @@ AC_HELP_STRING([--with-pkg-config-path],[colon-separated list of pkg-config(1) dirs]), [export PKG_CONFIG_PATH=${withval}]) -GSTREAMER_REQ="0.5.0" -GSTREAMER_MAJORMINOR="0.5" -AC_SUBST(GSTREAMER_REQ) -PKG_CHECK_MODULES(GST, gstreamer-$GSTREAMER_MAJORMINOR >= $GSTREAMER_REQ,, - AC_MSG_ERROR([No GStreamer found])) +GSTREAMER_REQ=0.6.0 +dnl start with 0.6 +GST_MAJORMINOR=0.6 +PKG_CHECK_MODULES(GST, \ + gstreamer-$GST_MAJORMINOR >= $GSTREAMER_REQ \ + gstreamer-libs-$GST_MAJORMINOR >= $GSTREAMER_REQ \ + gstreamer-control-$GST_MAJORMINOR >= $GSTREAMER_REQ, + HAVE_GST=yes,HAVE_GST=no) + +dnl fail back to 0.7 +if test "x$HAVE_GST" = "xno"; then + GST_MAJORMINOR=0.7 + PKG_CHECK_MODULES(GST, \ + gstreamer-$GST_MAJORMINOR >= $GSTREAMER_REQ \ + gstreamer-libs-$GST_MAJORMINOR >= $GSTREAMER_REQ \ + gstreamer-control-$GST_MAJORMINOR >= $GSTREAMER_REQ, + HAVE_GST=yes,HAVE_GST=no) +fi + +dnl Give error and exit if we don't have gstreamer +if test "x$HAVE_GST" = "xno"; then + AC_MSG_ERROR(you need gstreamer development packages installed !) +fi +AC_SUBST(GST_CFLAGS) +AC_SUBST(GST_LIBS) PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 libglade-2.0,, [AC_MSG_ERROR([GNOME 2.0 required but not found])]) @@ -65,8 +85,6 @@ PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0,, [AC_MSG_ERROR([gdk-pixbuf 2.0 required but not found])]) -AC_SUBST(GST_CFLAGS) -AC_SUBST(GST_LIBS) AC_SUBST(GNOME_CFLAGS) AC_SUBST(GNOME_LIBS) AC_SUBST(GDK_PIXBUF_CFLAGS) |