diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-08-29 08:57:14 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-08-29 08:57:14 +0000 |
| commit | ba10061a5a679a17765a6546160311642d696b71 (patch) | |
| tree | d855c3a45791b652ec08c601c99a2dac94491250 | |
| parent | e3fcb1d801a37d4e7ff2ab061278230d43f16147 (diff) | |
| download | gst-plugins-bad-ba10061a5a679a17765a6546160311642d696b71.tar.gz gst-plugins-bad-ba10061a5a679a17765a6546160311642d696b71.tar.bz2 gst-plugins-bad-ba10061a5a679a17765a6546160311642d696b71.zip | |
configure.ac: Fix CFLAGS and LIBS for the apexsink.
Original commit message from CVS:
* configure.ac:
Fix CFLAGS and LIBS for the apexsink.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2008-08-29 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * configure.ac: + Fix CFLAGS and LIBS for the apexsink. + 2008-08-28 Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com> * sys/winks/ksvideohelpers.c (ks_video_media_type_free): diff --git a/configure.ac b/configure.ac index b24c3ad9..a1701960 100644 --- a/configure.ac +++ b/configure.ac @@ -446,12 +446,12 @@ int main(void) # Try to use $ssldir/lib if it exists, otherwise # $ssldir if test -d "$ssldir/lib" ; then - APEXSINK_LIBS="-L$ssldir/lib $saved_LDFLAGS" + APEXSINK_LIBS="-L$ssldir/lib $LDFLAGS" if test ! -z "$need_dash_r" ; then APEXSINK_LIBS="-R$ssldir/lib $LDFLAGS" fi else - APEXSINK_LDFLAGS="-L$ssldir $saved_LDFLAGS" + APEXSINK_LDFLAGS="-L$ssldir $LDFLAGS" if test ! -z "$need_dash_r" ; then APEXSINK_LIBS="-R$ssldir $LDFLAGS" fi @@ -459,13 +459,17 @@ int main(void) # Try to use $ssldir/include if it exists, otherwise # $ssldir if test -d "$ssldir/include" ; then - APEXSINK_CFLAGS="-I$ssldir/include $saved_CPPFLAGS" + APEXSINK_CFLAGS="-I$ssldir/include $CPPFLAGS" else - APEXSINK_CFLAGS="-I$ssldir $saved_CPPFLAGS" + APEXSINK_CFLAGS="-I$ssldir $CPPFLAGS" fi fi fi APEXSINK_LIBS="$APEXSINK_LIBS $LIBS" + AC_SUBST(APEXSINK_LIBS) + AC_SUBST(APEXSINK_CFLAGS) + CPPFLAGS="$saved_CPPFLAGS" + LDFLAGS="$saved_LDFLAGS" LIBS="$saved_LIBS" ]) |