[gst-cvs] thomasvs common gst-plugins: common/m4/ gst-plugins/ gst-plugins/gst-libs/gst/

[Thomas V. S. <tho...@us...>]

CVS Root:       /cvsroot/gstreamer
Modules:        common gst-plugins
Changes by:     thomasvs
Date:           Wed Dec 03 2003  04:23:50 PST

Log message:
fixing up X test and general features test

Modified files:
    common/m4       : gst-feature.m4
    gst-plugins     : ChangeLog configure.ac
    gst-plugins/gst-libs/gst: Makefile.am

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/m4/gst-feature.m4.diff?r1=1.6&r2=1.7
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.15&r2=1.16
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/configure.ac.diff?r1=1.326&r2=1.327
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst-libs/gst/Makefile.am.diff?r1=1.15&r2=1.16

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChangeLog	15 Nov 2003 20:43:55 -0000	1.15
+++ ChangeLog	3 Dec 2003 12:23:37 -0000	1.16
@@ -1,3 +1,9 @@
+2003-12-03  set REAL_NAME environment variable  <thomas at apestaart dot org>
+
+	* common/m4/gst-feature.m4: *** instead of newline when not built
+	* configure.ac: fix X detection when no X stuff present
+	* gst-libs/gst/Makefile.am: put X dependencies inside conditional
+
 2003-07-12  Thomas Vander Stichele <thomas at apestaart dot org>
 
         * gst-plugins.spec.in: fix up spec file
Index: configure.ac
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/configure.ac,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -d -r1.326 -r1.327
--- configure.ac	29 Nov 2003 22:43:23 -0000	1.326
+++ configure.ac	3 Dec 2003 12:23:37 -0000	1.327
@@ -489,23 +489,27 @@
 ])
 
 dnl Check for X11
-AC_PATH_XTRA
-if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then
-  AC_MSG_NOTICE([cannot find X11, the build system needs fixage])
-  HAVE_X="no"
-else
-  dnl this is much more than we want
-  X_LIBS="$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS"
-  dnl AC_PATH_XTRA only defines the path needed to find the X libs, not the libs
-  dnl therefore we add them here
-  X_LIBS="$X_LIBS -lX11"
-  AC_SUBST(X_CFLAGS)
-  AC_SUBST(X_LIBS)
-  HAVE_X="yes";
-fi
-AC_SUBST(HAVE_X)
-AM_CONDITIONAL(USE_X, test "-DX_DISPLAY_MISSING" != "$X_CFLAGS")
-
+translit(dnm, m, l) AM_CONDITIONAL(USE_X, true)
+GST_CHECK_FEATURE(X, [X libraries and plugins],
+                  [ximagesink], [
+  AC_PATH_XTRA
+  if test "x$X_CFLAGS" == "x" -o "$X_CFLAGS" == "-DX_DISPLAY_MISSING"
+  then
+    AC_MSG_NOTICE([cannot find X11 development files])
+    HAVE_X="no"
+  else
+    dnl this is much more than we want
+    X_LIBS="$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS"
+    dnl AC_PATH_XTRA only defines the path needed to find the X libs, not the libs
+    dnl therefore we add them here
+    X_LIBS="$X_LIBS -lX11"
+    AC_SUBST(X_CFLAGS)
+    AC_SUBST(X_LIBS)
+    HAVE_X="yes"
+  fi
+  AC_SUBST(HAVE_X)
+])
+  
 dnl *** XVideo ***
 dnl Look for the PIC library first, Debian requires it.
 dnl Check debian-devel archives for gory details.
Index: gst-feature.m4
===================================================================
RCS file: /cvsroot/gstreamer/common/m4/gst-feature.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gst-feature.m4	25 Sep 2003 21:40:35 -0000	1.6
+++ gst-feature.m4	3 Dec 2003 12:23:37 -0000	1.7
@@ -103,9 +103,7 @@
   fi
   AC_DEFINE(HAVE_[$1], , [support for features: $3])
 else
-  ifelse([$3], , :, [AC_MSG_NOTICE(
-These plugins will not be built: [$3]
-)])
+  ifelse([$3], , :, [AC_MSG_NOTICE(*** These plugins will not be built: [$3])])
   if test "x$3" != "x"; then
     GST_PLUGINS_NO="\t[$3]\n$GST_PLUGINS_NO"
   fi
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst-libs/gst/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am	12 Nov 2003 03:06:07 -0000	1.15
+++ Makefile.am	3 Dec 2003 12:23:37 -0000	1.16
@@ -5,7 +5,7 @@
 endif
 
 if USE_X
-X_DIR=xwindowlistener
+X_DIR=xwindowlistener xoverlay
 else
 X_DIR=
 endif
@@ -14,7 +14,7 @@
 		$(GCONF_DIR) idct media-info \
 		mixer navigation play propertyprobe \
 		resample riff tuner video \
-		xoverlay $(X_DIR)
+		$(X_DIR)
 
 DIST_SUBDIRS = audio colorbalance floatcast \
 		gconf idct media-info \