Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
AS_IF( [test $found = 1],[
CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}"
MOZILLA_REQUIRED_HEADERS=1
- AC_CHECK_HEADERS([npfunctions.h])
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
[#if HAVE_NPAPI_H
#undef XP_UNIX
#endif
-#ifdef HAVE_NPFUNCTIONS_H
-#include "npfunctions.h"
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+#include "npupp.h"
#else
-#include "npupp.h"
+#include "npfunctions.h"
#endif
#include "../vlcshell.h"
#define OJI 1
#include <npapi.h>
-#ifdef HAVE_NPFUNCTIONS_H
-#include <npfunctions.h>
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+#include "npupp.h"
#else
-#include <npupp.h>
+#include "npfunctions.h"
#endif
#include "../vlcshell.h"
#ifndef _NPAPI_H_
# include "npapi.h"
#endif
-#ifdef HAVE_NPFUNCTIONS_H
-# include "npfunctions.h"
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+#include "npupp.h"
#else
-# ifndef _NPUPP_H_
-# include "npupp.h"
-# endif
+#include "npfunctions.h"
#endif
#include "../vlcshell.h"