[Gnash-commit] /srv/bzr/gnash/trunk r12048: fix Android conditional for the NDK

[Rob Savoye]

------------------------------------------------------------
revno: 12048
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sun 2010-03-14 14:54:37 -0600
message:
  fix Android conditional for the NDK
modified:
  configure.ac
  libmedia/Makefile.am

=== modified file 'configure.ac'
--- a/configure.ac      2010-03-14 20:00:44 +0000
+++ b/configure.ac      2010-03-14 20:54:37 +0000
@@ -234,8 +234,7 @@
 dnl Recent versions of G++ (I'm using 4.5 from source
 android_ndk=no
 AC_ARG_WITH([android],
-  AC_HELP_STRING([--with-android],
-         [directory where android NDK is installed]),
+  AC_HELP_STRING([--with-android], [directory where android NDK is installed]),
         android_ndk=${withval}
         if test x"${withval}" != x; then
           android_ndk=${withval}
@@ -252,9 +251,11 @@
     cross_compiling=yes
   fi
   ANDROID_NDK=${android_ndk}
+else
+  ANDROID_NDK=
 fi
 AC_SUBST(ANDROID_NDK)
-AM_CONDITIONAL(ANDROID, [ test x"${android_ndk}" != x ])
+AM_CONDITIONAL(ANDROID, [ test x"${android_ndk}" != xno ])
 
 soldir=/tmp
 AC_ARG_WITH(soldir,

=== modified file 'libmedia/Makefile.am'
--- a/libmedia/Makefile.am      2010-03-14 02:26:46 +0000
+++ b/libmedia/Makefile.am      2010-03-14 20:54:37 +0000
@@ -42,8 +42,13 @@
        $(BOOST_CFLAGS) \
        $(NULL)
 
+if ANDROID
+  libgnashmedia_la_CPPFLAGS += $(ANDROID_NDK)/usr/include
+endif
+
+
 # These headers get installed
-# include_HEADERS = log.h err.h proc.h serial.h xantrex.h outback.h
+# include_HEADERS = log.h err.h
 
 libgnashmedia_la_LIBADD = \
        $(top_builddir)/libbase/libgnashbase.la \