blob: d1cb9f9f7ecea5e8a05740cbd762b0d1d74b9c5b (
plain) (
blame)
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
64
65
|
--- configure.orig Tue Oct 12 00:13:29 2004
+++ configure Wed Nov 23 01:48:55 2005
@@ -9368,7 +9368,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-liconv $LIBS"
+LIBS="-L$LOCALBASE/lib -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 9374 "configure"
#include "confdefs.h"
@@ -9399,7 +9399,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- _ICONV_LIBS="$_ICONV_LIBS -liconv"
+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
@@ -9409,7 +9409,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-liconv $LIBS"
+LIBS="-L$LOCALBASE/lib -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 9415 "configure"
#include "confdefs.h"
@@ -9440,7 +9440,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- _ICONV_LIBS="$_ICONV_LIBS -liconv"
+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
else
echo "$ac_t""no" 1>&6
fi
@@ -11401,12 +11401,12 @@
echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
echo "configure:11404: checking MOZ_GTK2_CFLAGS" >&5
- MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"`
+ MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"`
echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
echo "configure:11409: checking MOZ_GTK2_LIBS" >&5
- MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7"`
+ MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"`
echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
else
MOZ_GTK2_CFLAGS=""
@@ -12344,9 +12344,9 @@
-MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth"
+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth"
-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug tasks"
+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug tasks"
# Check whether --enable-extensions or --disable-extensions was given.
if test "${enable_extensions+set}" = set; then
|
