зеркало из https://github.com/mozilla/pjs.git
Removing unused UNIX_LDAP define from the build. r=cls.
This commit is contained in:
bryner%uiuc.edu
Родитель
4a9e703f28
Коммит
e58c61d6f5
|
|
@ -63,7 +63,6 @@ NO_STATIC_LIB = @NO_STATIC_LIB@
|
|||
NO_NETSCAPE_STATIC = @NO_STATIC_LIB@
|
||||
ENABLE_TESTS = @ENABLE_TESTS@
|
||||
ENABLE_PICS = @ENABLE_PICS@
|
||||
NO_UNIX_LDAP = @NO_UNIX_LDAP@
|
||||
BUILD_IDLC = @BUILD_IDLC@
|
||||
USE_IMPLICIT_ARCHIVE = @USE_IMPLICIT_ARCHIVE@
|
||||
|
||||
|
|
|
|||
|
|
@ -9729,7 +9729,6 @@ esac
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-jpeg or --without-jpeg was given.
|
||||
|
|
@ -9748,7 +9747,7 @@ if test "$JPEG_DIR" = no; then
|
|||
SYSTEM_JPEG=
|
||||
else
|
||||
echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
|
||||
echo "configure:9752: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
echo "configure:9751: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -9756,7 +9755,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9760 "configure"
|
||||
#line 9759 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -9767,7 +9766,7 @@ int main() {
|
|||
jpeg_destroy_compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -9796,7 +9795,7 @@ if test "$SYSTEM_JPEG" = 1; then
|
|||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9800 "configure"
|
||||
#line 9799 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -9810,7 +9809,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:9814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:9813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
|
|
@ -9848,16 +9847,16 @@ if test "$ZLIB_DIR" = no; then
|
|||
SYSTEM_ZLIB=
|
||||
else
|
||||
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
|
||||
echo "configure:9852: checking "for zlib.h"" >&5
|
||||
echo "configure:9851: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9854 "configure"
|
||||
#line 9853 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "zlib.h"
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:9860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
|
|
@ -9871,7 +9870,7 @@ rm -f conftest*
|
|||
fi
|
||||
if test "$SYSTEM_ZLIB" = 1; then
|
||||
echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
|
||||
echo "configure:9875: checking for gzread in -lz" >&5
|
||||
echo "configure:9874: checking for gzread in -lz" >&5
|
||||
ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -9879,7 +9878,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9883 "configure"
|
||||
#line 9882 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -9890,7 +9889,7 @@ int main() {
|
|||
gzread()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -9936,7 +9935,7 @@ if test "$PNG_DIR" = no; then
|
|||
SYSTEM_PNG=
|
||||
else
|
||||
echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
|
||||
echo "configure:9940: checking for png_get_valid in -lpng" >&5
|
||||
echo "configure:9939: checking for png_get_valid in -lpng" >&5
|
||||
ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -9944,7 +9943,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9948 "configure"
|
||||
#line 9947 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -9955,7 +9954,7 @@ int main() {
|
|||
png_get_valid()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -9983,7 +9982,7 @@ if test "$SYSTEM_PNG" = 1; then
|
|||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9987 "configure"
|
||||
#line 9986 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -9997,7 +9996,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:10001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:10000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
|
|
@ -10056,9 +10055,9 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}"
|
|||
LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}"
|
||||
LIBS="-lfullsoft $LIBS"
|
||||
echo $ac_n "checking "for FCInitialize in -lfullsoft"""... $ac_c" 1>&6
|
||||
echo "configure:10060: checking "for FCInitialize in -lfullsoft"" >&5;
|
||||
echo "configure:10059: checking "for FCInitialize in -lfullsoft"" >&5;
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10062 "configure"
|
||||
#line 10061 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include "fullsoft.h"
|
||||
|
|
@ -10066,7 +10065,7 @@ int main() {
|
|||
FCInitialize(); exit(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
FULLCIRCLE_LIBS="-I${FULLCIRCLE_DIR} -L${FULLCIRCLE_DIR} -lfullsoft" result="yes"
|
||||
else
|
||||
|
|
@ -10231,10 +10230,6 @@ EOF
|
|||
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define X_PLUGINS 1
|
||||
EOF
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define UNIX_LDAP 1
|
||||
EOF
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
|
|
@ -10622,7 +10617,6 @@ s%@NO_STATIC_LIB@%$NO_STATIC_LIB%g
|
|||
s%@ENABLE_TESTS@%$ENABLE_TESTS%g
|
||||
s%@MOZ_USER_DIR@%$MOZ_USER_DIR%g
|
||||
s%@FULL_STATIC_BUILD@%$FULL_STATIC_BUILD%g
|
||||
s%@NO_UNIX_LDAP@%$NO_UNIX_LDAP%g
|
||||
s%@BUILD_IDLC@%$BUILD_IDLC%g
|
||||
s%@MOZ_ENABLE_GTK_MOZILLA@%$MOZ_ENABLE_GTK_MOZILLA%g
|
||||
s%@USE_IMPLICIT_ARCHIVE@%$USE_IMPLICIT_ARCHIVE%g
|
||||
|
|
|
|||
|
|
@ -2789,7 +2789,6 @@ AC_SUBST(ENABLE_TESTS)
|
|||
AC_SUBST(MOZ_USER_DIR)
|
||||
dnl AC_SUBST(MOZ_SMART_MAIL)
|
||||
AC_SUBST(FULL_STATIC_BUILD)
|
||||
AC_SUBST(NO_UNIX_LDAP)
|
||||
AC_SUBST(BUILD_IDLC)
|
||||
AC_SUBST(MOZ_ENABLE_GTK_MOZILLA)
|
||||
AC_SUBST(USE_IMPLICIT_ARCHIVE)
|
||||
|
|
@ -3102,7 +3101,6 @@ else
|
|||
AC_DEFINE(XP_UNIX)
|
||||
AC_DEFINE(UNIX_EMBED)
|
||||
AC_DEFINE(X_PLUGINS)
|
||||
AC_DEFINE(UNIX_LDAP)
|
||||
AC_DEFINE(UNIX_ASYNC_DNS)
|
||||
fi
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче