]>
Commit | Line | Data |
---|---|---|
d98cc61d AM |
1 | --- configure.ac~ 2008-08-23 13:28:39.345133267 +0200 |
2 | +++ configure.ac 2008-08-23 13:32:37.887192145 +0200 | |
3 | @@ -5135,7 +5135,7 @@ | |
4 | if test "${with_mozilla_sdk_path}" = "" -o "${with_mozilla_sdk_path}" = "no" | |
5 | then | |
6 | dnl New firefox-1.5 SDK api | |
7 | - PKG_CHECK_MODULES([FIREFOX], [firefox-plugin], | |
8 | + PKG_CHECK_MODULES([FIREFOX], [mozilla-plugin], | |
9 | [ | |
10 | PKG_CHECK_MODULES([FIREFOX_XPCOM], [firefox-xpcom], | |
11 | [], | |
12 | @@ -5152,7 +5152,7 @@ | |
13 | ] | |
14 | ) | |
15 | ]) | |
16 | - CPPFLAGS="${CPPFLAGS_save} ${FIREFOX_CFLAGS} ${FIREFOX_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}" | |
17 | + CPPFLAGS="${CPPFLAGS_save} -I/usr/include/xulrunner ${FIREFOX_CFLAGS} ${FIREFOX_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}" | |
18 | MOZILLA_REQUIRED_HEADERS=1 | |
19 | AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0) | |
20 | AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0) | |
21 | @@ -5166,7 +5166,7 @@ | |
22 | fi | |
23 | MOZILLA_REQUIRED_HEADERS= | |
24 | mozilla=: | |
25 | - firefox_include=`pkg-config --variable=includedir firefox-plugin` | |
26 | + firefox_include=`pkg-config --variable=includedir mozilla-plugin` | |
27 | if test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config32.h"; then | |
28 | MOZILLA_CONFIG_H="${firefox_include}/mozilla-config32.h" | |
29 | elif test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config64.h"; then |