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

Original commit message from CVS:
* configure.ac:
Fix CFLAGS and LIBS for the apexsink.

diff --git a/ChangeLog b/ChangeLog
index 829fdac32514f4a2fdb56167b5ed8f6be0130390..8c76c3a0c18917912c6d8430bb7a67a4234e6d65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 b24c3ad9db7b3bb1ba55e33cfd59a26f016029bd..a170196041582048ed538a6661abb5357e7e24db 100644 (file)
--- 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"
 ])