diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 38 |
3 files changed, 27 insertions, 17 deletions
@@ -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 -Subproject b5288e8215c6eacf0782880f6c5b6dea8f445a3 +Subproject fcdc6ccbcc674dd487021d87a0313abf02bae39 diff --git a/configure.ac b/configure.ac index 02a8cbc1..8563f09f 100644 --- 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. |