diff options
| author | Rene Engelhard <rene@debian.org> | 2012-02-21 18:07:34 +0100 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2012-02-21 18:14:11 +0100 |
| commit | 2ec27f4b250781956aedc27a3a1b304d9e72e2ec (patch) | |
| tree | 8031a13d97fcde8181a09371b2c52fdc500bc1de /configure.in | |
| parent | 307240b753adc4d0892098bdab4b96de08a90517 (diff) | |
build also with older npapi
(merge from e6d0daefbdb8367384d8e5c217f65118bd8dc565)
Signed-off-by: Rene Engelhard <rene@debian.org>
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 26a500a34fb9..94b6de9edbdb 100644 --- a/configure.in +++ b/configure.in @@ -6095,6 +6095,7 @@ AC_SUBST(NSS_LIBS) dnl =================================================================== dnl Check for system mozilla headers dnl =================================================================== +HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION= AC_MSG_CHECKING([which mozilla headers to use]) if test "$with_system_mozilla_headers" = "yes"; then AC_MSG_RESULT([external]) @@ -6109,12 +6110,31 @@ if test "$with_system_mozilla_headers" = "yes"; then if test "x$LOCATED" != "xyes"; then AC_MSG_ERROR([npapi.h header file not found]) fi + + AC_LANG_PUSH([C]) + save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZILLA_HEADERS_CFLAGS" + AC_MSG_CHECKING([for NPP_GetMIMEDescription return type]) + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([[ + #define XP_UNIX + #include <npapi.h> + const char* NPP_GetMIMEDescription(void) { return "foo"; } + ]])], + [AC_MSG_RESULT([const char*])], + [ + AC_MSG_RESULT([char*]) + HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=TRUE + ]) + CFLAGS=$save_CFLAGS + AC_LANG_POP([C]) else AC_MSG_RESULT([internal]) SYSTEM_MOZILLA_HEADERS=NO fi AC_SUBST(MOZILLA_HEADERS_CFLAGS) AC_SUBST(SYSTEM_MOZILLA_HEADERS) +AC_SUBST(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION) dnl =================================================================== dnl Check for system sane |