configure.ac: Fix CFLAGS and LIBS for the apexsink.

Original commit message from CVS:
* configure.ac:
Fix CFLAGS and LIBS for the apexsink.
This commit is contained in:
Sebastian Dröge 2008-08-29 08:57:14 +00:00
parent e3fcb1d801
commit ba10061a5a
2 changed files with 13 additions and 4 deletions

View file

@ -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):

View file

@ -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"
])