mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-02 21:48:55 +00:00
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:
parent
e3fcb1d801
commit
ba10061a5a
2 changed files with 13 additions and 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>
|
2008-08-28 Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>
|
||||||
|
|
||||||
* sys/winks/ksvideohelpers.c (ks_video_media_type_free):
|
* sys/winks/ksvideohelpers.c (ks_video_media_type_free):
|
||||||
|
|
12
configure.ac
12
configure.ac
|
@ -446,12 +446,12 @@ int main(void)
|
||||||
# Try to use $ssldir/lib if it exists, otherwise
|
# Try to use $ssldir/lib if it exists, otherwise
|
||||||
# $ssldir
|
# $ssldir
|
||||||
if test -d "$ssldir/lib" ; then
|
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
|
if test ! -z "$need_dash_r" ; then
|
||||||
APEXSINK_LIBS="-R$ssldir/lib $LDFLAGS"
|
APEXSINK_LIBS="-R$ssldir/lib $LDFLAGS"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
APEXSINK_LDFLAGS="-L$ssldir $saved_LDFLAGS"
|
APEXSINK_LDFLAGS="-L$ssldir $LDFLAGS"
|
||||||
if test ! -z "$need_dash_r" ; then
|
if test ! -z "$need_dash_r" ; then
|
||||||
APEXSINK_LIBS="-R$ssldir $LDFLAGS"
|
APEXSINK_LIBS="-R$ssldir $LDFLAGS"
|
||||||
fi
|
fi
|
||||||
|
@ -459,13 +459,17 @@ int main(void)
|
||||||
# Try to use $ssldir/include if it exists, otherwise
|
# Try to use $ssldir/include if it exists, otherwise
|
||||||
# $ssldir
|
# $ssldir
|
||||||
if test -d "$ssldir/include" ; then
|
if test -d "$ssldir/include" ; then
|
||||||
APEXSINK_CFLAGS="-I$ssldir/include $saved_CPPFLAGS"
|
APEXSINK_CFLAGS="-I$ssldir/include $CPPFLAGS"
|
||||||
else
|
else
|
||||||
APEXSINK_CFLAGS="-I$ssldir $saved_CPPFLAGS"
|
APEXSINK_CFLAGS="-I$ssldir $CPPFLAGS"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
APEXSINK_LIBS="$APEXSINK_LIBS $LIBS"
|
APEXSINK_LIBS="$APEXSINK_LIBS $LIBS"
|
||||||
|
AC_SUBST(APEXSINK_LIBS)
|
||||||
|
AC_SUBST(APEXSINK_CFLAGS)
|
||||||
|
CPPFLAGS="$saved_CPPFLAGS"
|
||||||
|
LDFLAGS="$saved_LDFLAGS"
|
||||||
LIBS="$saved_LIBS"
|
LIBS="$saved_LIBS"
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue