diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2006-02-22 14:37:20 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2006-02-22 14:37:20 +0000 |
| commit | f27209c6d75ee279078ad7f7bbca4b0fc56dcb27 (patch) | |
| tree | 6aae5f80075edf2ec81988af4e2ae486f3f0a20d /configure.ac | |
| parent | 091e9393442ac1fa9e4d200321b6740ea6dd6331 (diff) | |
| download | gst-plugins-bad-f27209c6d75ee279078ad7f7bbca4b0fc56dcb27.tar.gz gst-plugins-bad-f27209c6d75ee279078ad7f7bbca4b0fc56dcb27.tar.bz2 gst-plugins-bad-f27209c6d75ee279078ad7f7bbca4b0fc56dcb27.zip | |
Cygwin Ports maintainer.
Original commit message from CVS:
* configure.ac:
* sys/glsink/Makefile.am:
Merge patch from #317048 for building on Cygwin. Patch by
Cygwin Ports maintainer.
* sys/glsink/glimagesink.c: (gst_glimage_sink_init_display):
Move normal debug output to LOG level not ERROR.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 3bcb92d2..e67f046f 100644 --- a/configure.ac +++ b/configure.ac @@ -389,12 +389,12 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_X, true) GST_CHECK_FEATURE(X, [X libraries and plugins], [ximagesrc], [ AC_PATH_XTRA + + dnl now try to find the HEADER ac_cflags_save="$CFLAGS" ac_cppflags_save="$CPPFLAGS" CFLAGS="$CFLAGS $X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS" - - dnl now try to find the HEADER AC_CHECK_HEADER(X11/Xlib.h, HAVE_X="yes", HAVE_X="no") if test "x$HAVE_X" = "xno" @@ -457,7 +457,7 @@ GST_CHECK_FEATURE(XSHM, [X Shared Memory extension], [ximagesrc w/ xshm], [ ] ) dnl *** BZ2 *** -translit(bz2, m, l) AM_CONDITIONAL(USE_BZ2, true) +translit(dnm, m, l) AM_CONDITIONAL(USE_BZ2, true) GST_CHECK_FEATURE(BZ2, [bz2 library], bz2, [ GST_CHECK_LIBHEADER(BZ2, bz2, BZ2_bzCompress, ,bzlib.h, BZ2_LIBS="-lbz2") AC_SUBST(BZ2_LIBS) @@ -609,10 +609,16 @@ GST_CHECK_FEATURE(GSM, [GSM library], gsmenc gsmdec, [ dnl *** OpenGL *** translit(dnm, m, l) AM_CONDITIONAL(USE_OPENGL, true) +save_CPPFLAGS="$CPPFLAGS" +save_LIBS="$LIBS" +CPPFLAGS="$CPPFLAGS $X_CFLAGS" +LIBS="$LIBS $X_LIBS" GST_CHECK_FEATURE(OPENGL, [Open GL], glsink, [ - GST_CHECK_LIBHEADER(GL, GLU, glTexImage2D,, + GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no") ]) +CPPFLAGS="$save_CPPFLAGS" +LIBS="$save_LIBS" dnl *** XVID *** translit(dnm, m, l) AM_CONDITIONAL(USE_XVID, true) |