diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2007-05-15 17:22:58 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2007-05-15 17:22:58 +0000 |
| commit | b979d59b3dc6c2a249b6c53ccd2cf95f3daf1ba8 (patch) | |
| tree | 09dc4a5ccb6a4f8ec33b07de2212e73900a9142e /configure.ac | |
| parent | b629fd955a7cc30c6a58dc734dda7e424cda72b2 (diff) | |
| download | gst-plugins-bad-b979d59b3dc6c2a249b6c53ccd2cf95f3daf1ba8.tar.gz gst-plugins-bad-b979d59b3dc6c2a249b6c53ccd2cf95f3daf1ba8.tar.bz2 gst-plugins-bad-b979d59b3dc6c2a249b6c53ccd2cf95f3daf1ba8.zip | |
Add DIRECTDRAW_CFLAGS and DIRECTSOUND_CFLAGS to Makefile.am; save and restore the various flags in the directdraw/dir...
Original commit message from CVS:
* configure.ac:
* sys/directdraw/Makefile.am:
* sys/directsound/Makefile.am:
Add DIRECTDRAW_CFLAGS and DIRECTSOUND_CFLAGS to Makefile.am; save
and restore the various flags in the directdraw/directsound
detection section. Apparently improves cross-compiling for win32
with mingw32 under some circumstances (#437539).
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e93569fc..86eca92d 100644 --- a/configure.ac +++ b/configure.ac @@ -335,7 +335,11 @@ dnl DirectDraw translit(dnm, m, l) AM_CONDITIONAL(USE_DIRECTDRAW, true) AG_GST_CHECK_FEATURE(DIRECTDRAW, [DirectDraw plug-in], directdrawsink, [ HAVE_DIRECTDRAW="no" + save_CFLAGS="$CFLAGS" + save_LDFLAGS="$LDFLAGS" save_LIBS="$LIBS" + CFLAGS="$CFLAGS $DIRECTDRAW_CFLAGS" + LDFLAGS="$LDFLAGS $DIRECTDRAW_LDFLAGS" LIBS="$LIBS -lddraw -lgdi32" AC_MSG_CHECKING(for DirectDraw LDFLAGS) AC_LINK_IFELSE([ @@ -353,12 +357,15 @@ int main () [HAVE_DIRECTDRAW="yes"], [HAVE_DIRECTDRAW="no"]) AC_MSG_RESULT($HAVE_DIRECTDRAW) + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS LIBS=$save_LIBS if test "x$HAVE_DIRECTDRAW" = "xyes"; then dnl this is much more than we want - DIRECTDRAW_LIBS="-lddraw -lgdi32" + DIRECTDRAW_LIBS="-lddraw -ldxguid -lgdi32" AC_SUBST(DIRECTDRAW_CFLAGS) + AC_SUBST(DIRECTDRAW_LDFLAGS) AC_SUBST(DIRECTDRAW_LIBS) fi AC_SUBST(HAVE_DIRECTDRAW) @@ -368,7 +375,11 @@ dnl DirectSound translit(dnm, m, l) AM_CONDITIONAL(USE_DIRECTSOUND, true) AG_GST_CHECK_FEATURE(DIRECTSOUND, [DirectSound plug-in], directsoundsink, [ HAVE_DIRECTSOUND="no" + save_CFLAGS="$CFLAGS" + save_LDFLAGS="$LDFLAGS" save_LIBS="$LIBS" + CFLAGS="$CFLAGS $DIRECTSOUND_CFLAGS" + LDFLAGS="$LDFLAGS $DIRECTSOUND_LDFLAGS" LIBS="$LIBS -ldsound -ldxerr9" AC_MSG_CHECKING(for DirectSound LDFLAGS) AC_LINK_IFELSE([ @@ -387,12 +398,15 @@ int main () [HAVE_DIRECTSOUND="yes"], [HAVE_DIRECTSOUND="no"]) AC_MSG_RESULT($HAVE_DIRECTSOUND) + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS LIBS=$save_LIBS if test "x$HAVE_DIRECTSOUND" = "xyes"; then dnl this is much more than we want DIRECTSOUND_LIBS="-ldsound -ldxerr9" AC_SUBST(DIRECTSOUND_CFLAGS) + AC_SUBST(DIRECTSOUND_LDFLAGS) AC_SUBST(DIRECTSOUND_LIBS) fi AC_SUBST(HAVE_DIRECTSOUND) |