blob: cda2ec0e1d3f28c9342739a49c5a31b11683cabf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
--- mozilla-1.9.2.orig/configure 2011-03-19 21:39:59.000000000 +0100
+++ mozilla-1.9.2/configure 2011-04-23 11:35:36.000000000 +0200
@@ -3970,7 +3970,7 @@ else
echo "$ac_t""yes" 1>&6
fi
- for ac_prog in $PYTHON python2.5 python2.4 python
+ for ac_prog in $PYTHON python2.6 python2.5 python2.4 python
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5625,7 +5625,6 @@ DIRENT_INO=d_ino
CYGWIN_WRAPPER=
WIN_TOP_SRC=
MOZ_USER_DIR=".mozilla"
-HOST_AR='$(AR)'
HOST_AR_FLAGS='$(AR_FLAGS)'
MOZ_JPEG_CFLAGS=
@@ -13581,9 +13580,9 @@ if test "$SYSTEM_PNG" = 1; then
LIBS="$PNG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 13584 "configure"
-#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
+#include "confdefs.h"
#include <png.h>
int main() {
#if PNG_LIBPNG_VER < $MOZPNG
@@ -17895,7 +17894,7 @@ echo "configure:17889: checking for SQLI
else
if test "$cross_compiling" = yes; then
- ac_cv_sqlite_secure_delete=no
+ ac_cv_sqlite_secure_delete=yes
else
cat > conftest.$ac_ext <<EOF
@@ -21460,18 +21459,11 @@ fi
fi
fi
-if test -n "$CROSS_COMPILE"; then
- if test -z "$HOST_LIBIDL_CONFIG"; then
- HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
- fi
- if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then
- HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
- HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
- else
- HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
- HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
- fi
-fi
+HOST_LIBIDL_CFLAGS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --cflags`
+HOST_LIBIDL_LIBS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --libs`
+
+echo "host libidl cflags: ${HOST_LIBIDL_CFLAGS}"
+echo "host libidl libs: ${HOST_LIBIDL_LIBS}"
if test -z "$SKIP_PATH_CHECKS"; then
if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
|
