blob: 4114f6ee2bed31e2cbfbf6b25fb895f2f2e812e0 (
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
64
65
66
67
68
|
$FreeBSD$
--- configure.orig Mon Nov 12 14:28:00 2001
+++ configure Mon Nov 12 14:34:23 2001
@@ -7005,7 +7005,7 @@
CC="$_save_cc"
-LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
+LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin"
_mozilla_gtk_super_win_libs=
echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6
echo "configure:7012: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
@@ -7048,7 +7048,7 @@
fi
-LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs"
+LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtkembedmoz $_mozilla_xpcom_libs"
_mozilla_gtk_moz_embed_libs=
echo $ac_n "checking for gtk_moz_embed_get_type in -lgtkembedmoz""... $ac_c" 1>&6
echo "configure:7055: checking for gtk_moz_embed_get_type in -lgtkembedmoz" >&5
@@ -7057,7 +7057,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lgtkembedmoz $LIBS"
+LIBS="-lgtkembedmoz -lgtksuperwin $LIBS"
cat > conftest.$ac_ext <<EOF
#line 7063 "configure"
#include "confdefs.h"
@@ -7585,14 +7585,14 @@
#
# Check for libiconv
#
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:7590: checking for libiconv_open in -liconv" >&5
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:7590: checking for libiconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 7598 "configure"
#include "confdefs.h"
@@ -7632,7 +7632,7 @@
fi
if test "x$with_libiconv" = "xyes" ; then
- ICONV_LIBS="-liconv"
+ ICONV_LIBS="-lgiconv"
fi
@@ -9141,7 +9141,7 @@
fi
if test x$SCROLLKEEPER_CONFIG = xno; then
- { echo "configure: error: Couldn't find scrollkeeper-config" 1>&2; exit 1; }
+ echo "configure: warning: Couldn't find scrollkeeper-config" 1>&2
fi
|
