[vlc-commits] Fetch the gecko headers if we are missing them.
Jean-Baptiste Kempf
git at videolan.org
Wed Dec 19 16:34:44 CET 2012
npapi-vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Dec 19 16:34:35 2012 +0100| [a241a03fd5d530896d13f1ff7aa94c829dfc7dff] | committer: Jean-Baptiste Kempf
Fetch the gecko headers if we are missing them.
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=a241a03fd5d530896d13f1ff7aa94c829dfc7dff
---
Makefile.am | 6 ++++++
configure.ac | 6 ++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a661b9c..b02428a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,12 @@ if BUILD_ACTIVEX
SUBDIRS += activex
endif
+if HAVE_SDK
+npapi-headers:
+ svn export http://npapi-sdk.googlecode.com/svn/trunk/headers gecko -r HEAD
+ touch $@
+endif
+
EXTRA_DIST = \
autogen.sh \
extras/macosx/Info.plist.in \
diff --git a/configure.ac b/configure.ac
index 87073f7..1b5809c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,9 +197,11 @@ CPPFLAGS="${CPPFLAGS} ${MOZILLA_CFLAGS} -Igecko/"
AC_CHECK_HEADERS(npapi.h npruntime.h, [
dnl if found
+ have_headers="true"
],[
dnl if not found
- AC_MSG_ERROR([Please install the Mozilla development tools, required headers were not found.])
+ AC_MSG_WARN([Please install the Mozilla development tools, required headers were not found.])
+ have_headers="false"
], [
#include <stdint.h>
#if HAVE_NPAPI_H
@@ -207,7 +209,7 @@ AC_CHECK_HEADERS(npapi.h npruntime.h, [
#endif
]
)
-
+AM_CONDITIONAL(FETCH_NPAPI, [ test "${have_headers}" != "true" ])
dnl
dnl check the const-ness of GetMIMEDesc, since it changed in latest npapi headers
More information about the vlc-commits
mailing list