blob: 4b4c5bec6e5263de0fc1ad8eedbf0624ab970493 (
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
|
$FreeBSD$
--- configure.orig Thu Apr 25 22:34:32 2002
+++ configure Thu Apr 25 22:35:04 2002
@@ -5335,6 +5335,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -7005,7 +7006,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 +7049,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 +7058,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"
@@ -9141,7 +9142,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
@@ -12061,6 +12062,7 @@
s%@MOZILLA_COMPONENT_RPATH_FLAGS@%$MOZILLA_COMPONENT_RPATH_FLAGS%g
s%@MOZILLA_COMPONENT_LDFLAGS@%$MOZILLA_COMPONENT_LDFLAGS%g
s%@MOZILLA_COMPONENT_LIBS@%$MOZILLA_COMPONENT_LIBS%g
+s%@MOZILLA_LIB_PLACE@%$_mozilla_lib_place%g
s%@BUILD_MOZILLA_COMPONENT_TRUE@%$BUILD_MOZILLA_COMPONENT_TRUE%g
s%@BUILD_MOZILLA_COMPONENT_FALSE@%$BUILD_MOZILLA_COMPONENT_FALSE%g
s%@MOZILLA_PROFILES_CFLAGS@%$MOZILLA_PROFILES_CFLAGS%g
|
