fixing up X test and general features test

Original commit message from CVS:
fixing up X test and general features test

diff --git a/ChangeLog b/ChangeLog
index ae140e5..020fd48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/common b/common
index b5288e8..fcdc6cc 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit b5288e8215c6eacf0782880f6c5b6dea8f445a34
+Subproject commit fcdc6ccbcc674dd487021d87a0313abf02bae396

diff --git a/configure.ac b/configure.ac
index 02a8cbc..8563f09 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -489,23 +489,27 @@ dnl               ;;
 ])
 
 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.

diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index 68d20eb..c39924c 100644 (file)
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -5,7 +5,7 @@ GCONF_DIR=
 endif
 
 if USE_X
-X_DIR=xwindowlistener
+X_DIR=xwindowlistener xoverlay
 else
 X_DIR=
 endif
@@ -14,7 +14,7 @@ SUBDIRS = audio colorbalance floatcast \
                $(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 \