mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Remove -rpath from LDFLAGS when using --with-default-mozilla-five-home as it causes problems when building mozilla on a machine with mozilla installed. 

Bug #68196 r=blizzard
This commit is contained in:
cls%seawood.org 2001-04-13 08:47:44 +00:00
Родитель dd5801696e
Коммит 94a365bea6
2 изменённых файлов: 43 добавлений и 50 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

86
configure поставляемый
Просмотреть файл

@ -11320,13 +11320,10 @@ fi
if test "${with_default_mozilla_five_home+set}" = set; then if test "${with_default_mozilla_five_home+set}" = set; then
withval="$with_default_mozilla_five_home" withval="$with_default_mozilla_five_home"
val=`echo $withval` val=`echo $withval`
DSO_LDOPTS="$DSO_LDOPTS -Wl,-rpath=$val"
LIBS="$LIBS -Wl,-rpath=$val"
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
#define MOZ_DEFAULT_MOZILLA_FIVE_HOME "$val" #define MOZ_DEFAULT_MOZILLA_FIVE_HOME "$val"
EOF EOF
MOZ_NSPRENV_OVERRIDE_DSO_LDOPTS="-shared -rpath=$val"
fi fi
@ -11467,12 +11464,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS=$CXXFLAGS _SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
echo "configure:11471: checking whether C++ compiler has -pedantic long long bug" >&5 echo "configure:11468: checking whether C++ compiler has -pedantic long long bug" >&5
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
result="maybe" result="maybe"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 11476 "configure" #line 11473 "configure"
#include "confdefs.h" #include "confdefs.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" void exit(int); extern "C" void exit(int);
@ -11481,7 +11478,7 @@ extern "C" void exit(int);
if (sizeof(long long) != 8) { return 1; } if (sizeof(long long) != 8) { return 1; }
return 0; } return 0; }
EOF EOF
if { (eval echo configure:11485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:11482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
result="no" result="no"
else else
@ -11529,12 +11526,12 @@ _SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
echo "configure:11533: checking for correct overload resolution with const and templates" >&5 echo "configure:11530: checking for correct overload resolution with const and templates" >&5
if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 11538 "configure" #line 11535 "configure"
#include "confdefs.h" #include "confdefs.h"
template <class T> template <class T>
@ -11564,7 +11561,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:11568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:11565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_nscap_nonconst_opeq_bug="no" ac_nscap_nonconst_opeq_bug="no"
else else
@ -11610,16 +11607,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then
_SAVE_CFLAGS="$CFLAGS" _SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
echo "configure:11614: checking whether compiler supports -Wno-long-long" >&5 echo "configure:11611: checking whether compiler supports -Wno-long-long" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 11616 "configure" #line 11613 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
return(0); return(0);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:11623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:11620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
@ -11868,7 +11865,7 @@ fi
echo $ac_n "checking webshell leaks option""... $ac_c" 1>&6 echo $ac_n "checking webshell leaks option""... $ac_c" 1>&6
echo "configure:11872: checking webshell leaks option" >&5 echo "configure:11869: checking webshell leaks option" >&5
# Check whether --enable-detect-webshell-leaks or --disable-detect-webshell-leaks was given. # Check whether --enable-detect-webshell-leaks or --disable-detect-webshell-leaks was given.
if test "${enable_detect_webshell_leaks+set}" = set; then if test "${enable_detect_webshell_leaks+set}" = set; then
enableval="$enable_detect_webshell_leaks" enableval="$enable_detect_webshell_leaks"
@ -11942,7 +11939,7 @@ if test "${enable_efence+set}" = set; then
enableval="$enable_efence" enableval="$enable_efence"
if test "$enableval" = "yes"; then if test "$enableval" = "yes"; then
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
echo "configure:11946: checking for malloc in -lefence" >&5 echo "configure:11943: checking for malloc in -lefence" >&5
ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -11950,7 +11947,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lefence $LIBS" LIBS="-lefence $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 11954 "configure" #line 11951 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -11961,7 +11958,7 @@ int main() {
malloc() malloc()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:11965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:11962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -11997,7 +11994,7 @@ fi
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6 echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
echo "configure:12001: checking for cplus_demangle in -liberty" >&5 echo "configure:11998: checking for cplus_demangle in -liberty" >&5
ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'` ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -12005,7 +12002,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-liberty "-liberty" $LIBS" LIBS="-liberty "-liberty" $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12009 "configure" #line 12006 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -12016,7 +12013,7 @@ int main() {
cplus_demangle() cplus_demangle()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:12020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:12017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -12362,7 +12359,7 @@ case "$target" in
# Extract the first word of "makeC++SharedLib_r", so it can be a program name with args. # Extract the first word of "makeC++SharedLib_r", so it can be a program name with args.
set dummy makeC++SharedLib_r; ac_word=$2 set dummy makeC++SharedLib_r; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:12366: checking for $ac_word" >&5 echo "configure:12363: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -12507,7 +12504,7 @@ if test "$JPEG_DIR" = no; then
SYSTEM_JPEG= SYSTEM_JPEG=
else else
echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
echo "configure:12511: checking for jpeg_destroy_compress in -ljpeg" >&5 echo "configure:12508: checking for jpeg_destroy_compress in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -12515,7 +12512,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-ljpeg $JPEG_LIBS $LIBS" LIBS="-ljpeg $JPEG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12519 "configure" #line 12516 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -12526,7 +12523,7 @@ int main() {
jpeg_destroy_compress() jpeg_destroy_compress()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:12530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:12527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -12555,7 +12552,7 @@ if test "$SYSTEM_JPEG" = 1; then
SYSTEM_JPEG= SYSTEM_JPEG=
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12559 "configure" #line 12556 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
@ -12569,7 +12566,7 @@ else
} }
EOF EOF
if { (eval echo configure:12573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:12570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
SYSTEM_JPEG=1 SYSTEM_JPEG=1
else else
@ -12607,16 +12604,16 @@ if test "$ZLIB_DIR" = no; then
SYSTEM_ZLIB= SYSTEM_ZLIB=
else else
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6 echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
echo "configure:12611: checking "for zlib.h"" >&5 echo "configure:12608: checking "for zlib.h"" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12613 "configure" #line 12610 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "zlib.h" #include "zlib.h"
int main() { int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:12620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:12617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
result="yes" SYSTEM_ZLIB=1 result="yes" SYSTEM_ZLIB=1
else else
@ -12630,7 +12627,7 @@ rm -f conftest*
fi fi
if test "$SYSTEM_ZLIB" = 1; then if test "$SYSTEM_ZLIB" = 1; then
echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
echo "configure:12634: checking for gzread in -lz" >&5 echo "configure:12631: checking for gzread in -lz" >&5
ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -12638,7 +12635,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lz $ZLIB_LIBS $LIBS" LIBS="-lz $ZLIB_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12642 "configure" #line 12639 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -12649,7 +12646,7 @@ int main() {
gzread() gzread()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:12653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:12650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -12695,7 +12692,7 @@ if test "$PNG_DIR" = no; then
SYSTEM_PNG= SYSTEM_PNG=
else else
echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
echo "configure:12699: checking for png_get_valid in -lpng" >&5 echo "configure:12696: checking for png_get_valid in -lpng" >&5
ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -12703,7 +12700,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lpng $PNG_LIBS $LIBS" LIBS="-lpng $PNG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12707 "configure" #line 12704 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -12714,7 +12711,7 @@ int main() {
png_get_valid() png_get_valid()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:12718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:12715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -12742,7 +12739,7 @@ if test "$SYSTEM_PNG" = 1; then
SYSTEM_PNG= SYSTEM_PNG=
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12746 "configure" #line 12743 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
@ -12756,7 +12753,7 @@ else
} }
EOF EOF
if { (eval echo configure:12760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:12757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
SYSTEM_PNG=1 SYSTEM_PNG=1
else else
@ -12795,7 +12792,7 @@ if test "$MNG_DIR" = no; then
SYSTEM_MNG= SYSTEM_MNG=
else else
echo $ac_n "checking for mng_initialize in -lmng""... $ac_c" 1>&6 echo $ac_n "checking for mng_initialize in -lmng""... $ac_c" 1>&6
echo "configure:12799: checking for mng_initialize in -lmng" >&5 echo "configure:12796: checking for mng_initialize in -lmng" >&5
ac_lib_var=`echo mng'_'mng_initialize | sed 'y%./+-%__p_%'` ac_lib_var=`echo mng'_'mng_initialize | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -12803,7 +12800,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lmng $MNG_LIBS $LIBS" LIBS="-lmng $MNG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12807 "configure" #line 12804 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -12814,7 +12811,7 @@ int main() {
mng_initialize() mng_initialize()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:12818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:12815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -12842,7 +12839,7 @@ if test "$SYSTEM_MNG" = 1; then
SYSTEM_MNG= SYSTEM_MNG=
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12846 "configure" #line 12843 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
@ -12856,7 +12853,7 @@ else
} }
EOF EOF
if { (eval echo configure:12860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:12857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
SYSTEM_MNG=1 SYSTEM_MNG=1
else else
@ -12922,9 +12919,9 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}"
LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}" LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}"
LIBS="-lfullsoft $LIBS" LIBS="-lfullsoft $LIBS"
echo $ac_n "checking "for FCInitialize in -lfullsoft"""... $ac_c" 1>&6 echo $ac_n "checking "for FCInitialize in -lfullsoft"""... $ac_c" 1>&6
echo "configure:12926: checking "for FCInitialize in -lfullsoft"" >&5; echo "configure:12923: checking "for FCInitialize in -lfullsoft"" >&5;
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12928 "configure" #line 12925 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include "fullsoft.h" #include "fullsoft.h"
@ -12932,7 +12929,7 @@ int main() {
FCInitialize(); exit(0); FCInitialize(); exit(0);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:12936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:12933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
FULLCIRCLE_LIBS="-I${FULLCIRCLE_DIR} -L${FULLCIRCLE_DIR} -lfullsoft" result="yes" FULLCIRCLE_LIBS="-I${FULLCIRCLE_DIR} -L${FULLCIRCLE_DIR} -lfullsoft" result="yes"
else else
@ -13483,7 +13480,6 @@ s%@MOZ_ENDER_LITE@%$MOZ_ENDER_LITE%g
s%@NS_TRACE_MALLOC@%$NS_TRACE_MALLOC%g s%@NS_TRACE_MALLOC@%$NS_TRACE_MALLOC%g
s%@MOZ_REFLOW_PERF@%$MOZ_REFLOW_PERF%g s%@MOZ_REFLOW_PERF@%$MOZ_REFLOW_PERF%g
s%@USE_ELF_DYNSTR_GC@%$USE_ELF_DYNSTR_GC%g s%@USE_ELF_DYNSTR_GC@%$USE_ELF_DYNSTR_GC%g
s%@MOZ_NSPRENV_OVERRIDE_DSO_LDOPTS@%$MOZ_NSPRENV_OVERRIDE_DSO_LDOPTS%g
s%@COMPILER_DEPEND@%$COMPILER_DEPEND%g s%@COMPILER_DEPEND@%$COMPILER_DEPEND%g
s%@MDDEPDIR@%$MDDEPDIR%g s%@MDDEPDIR@%$MDDEPDIR%g
s%@DETECT_WEBSHELL_LEAKS@%$DETECT_WEBSHELL_LEAKS%g s%@DETECT_WEBSHELL_LEAKS@%$DETECT_WEBSHELL_LEAKS%g

5
configure.in
Просмотреть файл

@ -3331,11 +3331,8 @@ dnl ========================================================
MOZ_ARG_WITH_STRING(default-mozilla-five-home, MOZ_ARG_WITH_STRING(default-mozilla-five-home,
[ --with-default-mozilla-five-home Set the default value for MOZILLA_FIVE_HOME], [ --with-default-mozilla-five-home Set the default value for MOZILLA_FIVE_HOME],
[ val=`echo $withval` [ val=`echo $withval`
DSO_LDOPTS="$DSO_LDOPTS -Wl,-rpath=$val"
LIBS="$LIBS -Wl,-rpath=$val"
AC_DEFINE_UNQUOTED(MOZ_DEFAULT_MOZILLA_FIVE_HOME,"$val") AC_DEFINE_UNQUOTED(MOZ_DEFAULT_MOZILLA_FIVE_HOME,"$val")
MOZ_NSPRENV_OVERRIDE_DSO_LDOPTS="-shared -rpath=$val" ])
AC_SUBST(MOZ_NSPRENV_OVERRIDE_DSO_LDOPTS) ] )
dnl ======================================================== dnl ========================================================
dnl ======================================================== dnl ========================================================