[vlc-commits] Improve gecko headers detection

[Rafaël Carré]

npapi-vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Dec 18 19:30:58 2012 +0100| [ce4f1dde4d514f1ca0b974d103a762058e6d61ab] | committer: Jean-Baptiste Kempf

Improve gecko headers detection

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=ce4f1dde4d514f1ca0b974d103a762058e6d61ab
---

 configure.ac      |    7 +++++--
 npapi/Makefile.am |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index a5f86c9..bdcdd10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl Win32 need s a numerical version_extra.
 case $( echo ${VERSION_EXTRA}|wc -m ) in
        "1") VERSION_EXTRA_RC="0";;
        "2") VERSION_EXTRA_RC=$( echo ${VERSION_EXTRA}|tr "abcdefghi" "123456789") ;;
-       *) if test ${VERSION_EXTRA} = "-git"; then VERSION_EXTRA_RC="666"; else VERSION_EXTRA_RC="99"; fi
+       *) if test "${VERSION_EXTRA}" = "-git"; then VERSION_EXTRA_RC="666"; else VERSION_EXTRA_RC="99"; fi
 esac
 AC_SUBST(VERSION_EXTRA_RC)
 COPYRIGHT_YEARS="2002-2012"
@@ -192,7 +192,8 @@ dnl we can't use the pkg-config macros.
 
 AM_CONDITIONAL(HAVE_SDK, test "$found" = 0)
 
-CPPFLAGS="${CPPFLAGS} ${MOZILLA_CFLAGS} -I${srcdir}/gecko/"
+CPPFLAGS_save="${CPPFLAGS}"
+CPPFLAGS="${CPPFLAGS} ${MOZILLA_CFLAGS} -Igecko/"
 
 AC_CHECK_HEADERS(npapi.h npruntime.h, [
     dnl if found
@@ -231,6 +232,8 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
   AC_DEFINE(NPP_GET_MIME_CONST, [], [Whether NPP_GetMIMEDescription returns const])
 ])
 
+CPPFLAGS="${CPPFLAGS_save}"
+
 AC_LANG_POP(C++)
 
 ])
diff --git a/npapi/Makefile.am b/npapi/Makefile.am
index c7223d3..fb83125 100644
--- a/npapi/Makefile.am
+++ b/npapi/Makefile.am
@@ -7,7 +7,7 @@ MOSTLYCLEANFILES =
 CLEANFILES = $(BUILT_SOURCES)
 npvlcdir = $(libdir)/mozilla/plugins
 
-AM_CPPFLAGS = $(LIBVLC_CFLAGS)
+AM_CPPFLAGS = $(LIBVLC_CFLAGS) -I$(top_srcdir)/gecko
 
 libvlcplugin_la_SOURCES = \
 	common.h \