зеркало из https://github.com/mozilla/pjs.git
The system versions of jpeg & png are used by default (if found) unless the local copy is more recent. Zlib is used by default if found.
Added separate variables for jpeg, png & zlib CFLAGS & LIBS.
Added --with-option=dir support for jpeg, png & zlib.
Split X defines into XCFLAGS, XLDFLAGS & XLIBS.
Will attempt to link nspr against the proper thread lib if the initial check fails.
Removed last vestiges of NO_SECURITY.
Modified cmd/{gnome,qt,x}fe/Makefile to only use autoconf defined variable for the final link.
Changed ACCFLAGS to OS_CFLAGS. Changed ACLIBS to OS_LIBS.
OPTIMIZER (config.mk) is no longer set for autoconf.
No longer includes platform specific .mk
This commit is contained in:
cls%seawood.org
Родитель
e7a1adc340
Коммит
231e51bbaf
|
|
@ -377,7 +377,7 @@ BASIC_LIBS += \
|
|||
$(DIST)/lib/libjbn.a \
|
||||
$(NULL)
|
||||
|
||||
ifndef NO_SECURITY
|
||||
ifdef MOZ_SECURITY
|
||||
BASIC_LIBS += $(DIST)/lib/libjsl.a
|
||||
endif
|
||||
|
||||
|
|
@ -434,7 +434,7 @@ endif
|
|||
# Post-Java libs
|
||||
BASIC_LIBS += $(DIST)/lib/libstyle.a
|
||||
|
||||
ifndef NO_SECURITY
|
||||
ifdef MOZ_SECURITY
|
||||
BASIC_LIBS += $(DIST)/lib/libjar.a
|
||||
else
|
||||
EXPORT_LIB = $(DIST)/lib/libhtmldlgs.a $(DIST)/lib/libsecfree.a
|
||||
|
|
@ -581,6 +581,7 @@ endif
|
|||
# Linux
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
|
||||
ifndef USE_AUTOCONF
|
||||
ifeq ($(USE_PTHREADS),1)
|
||||
OS_LIBS = -lpthread -lm -ldl -lc
|
||||
OTHER_LIBS = $(GNOME_LIBS) -ltiff -lgif /usr/lib/libjpeg.so \
|
||||
|
|
@ -590,8 +591,7 @@ OS_LIBS = -lm -ldl
|
|||
OTHER_LIBS = $(GNOME_LIBS) -ltiff -lgif /usr/lib/libjpeg.so \
|
||||
-lpng -lz
|
||||
endif
|
||||
|
||||
|
||||
endif #!USE_AUTOCONF
|
||||
|
||||
US_LDFLAGS += -lc
|
||||
EXPORT_LDFLAGS += -lc
|
||||
|
|
@ -776,6 +776,9 @@ FRANCE_LDFLAGS += -lresolv -lsocket -lc /usr/ucblib/libucb.a
|
|||
|
||||
endif
|
||||
|
||||
# Override with autoconf values
|
||||
OTHER_LIBS = $(GNOME_LIBS) $(OS_LIBS)
|
||||
|
||||
#######################################################################
|
||||
|
||||
# Rules to build the special MOZ_LITE *.o files
|
||||
|
|
|
|||
|
|
@ -435,7 +435,7 @@ BASIC_LIBS += \
|
|||
$(DIST)/lib/libjbn.a \
|
||||
$(NULL)
|
||||
|
||||
ifndef NO_SECURITY
|
||||
ifdef MOZ_SECURITY
|
||||
BASIC_LIBS += $(DIST)/lib/libjsl.a
|
||||
endif
|
||||
|
||||
|
|
@ -499,7 +499,7 @@ endif
|
|||
# Post-Java libs
|
||||
BASIC_LIBS += $(DIST)/lib/libstyle.a
|
||||
|
||||
ifndef NO_SECURITY
|
||||
ifdef MOZ_SECURITY
|
||||
BASIC_LIBS += $(DIST)/lib/libjar.a
|
||||
else
|
||||
EXPORT_LIB = $(DIST)/lib/libhtmldlgs.a $(DIST)/lib/libsecfree.a
|
||||
|
|
@ -856,10 +856,8 @@ EXPORT_LDFLAGS += -lresolv -lsocket -lc /usr/ucblib/libucb.a
|
|||
|
||||
endif
|
||||
|
||||
ifdef USE_AUTOCONF
|
||||
OTHER_LIBS = $(FE_QT_LIBS) $(ACLFLAGS) $(ACLIBS)
|
||||
OTHER_DYN_MOTIF_LIBS = $(FE_QT_LIBS) $(ACLFLAGS) $(ACLIBS)
|
||||
endif
|
||||
OTHER_LIBS = $(FE_QT_LIBS) $(OS_LIBS)
|
||||
OTHER_DYN_MOTIF_LIBS = $(FE_QT_LIBS) $(OS_LIBS)
|
||||
|
||||
#######################################################################
|
||||
|
||||
|
|
@ -1043,7 +1041,7 @@ symbols:
|
|||
|
||||
# the embed program
|
||||
$(OBJDIR)/embed: tools/embed.cpp
|
||||
$(CCC) -I$(QTDIR)/include -o $@ $< $(QTLIB) $(ACLFLAGS) -lX11
|
||||
$(CCC) -I$(QTDIR)/include -o $@ $< $(QTLIB) $(XLDFLAGS) -lX11
|
||||
|
||||
# make sure icon-pixmaps.inc gets built
|
||||
$(OBJDIR)/icons.o: $(OBJDIR)/icon-pixmaps.inc
|
||||
|
|
|
|||
|
|
@ -73,6 +73,11 @@ XFE_JPEG_REQUIRES =
|
|||
XFE_MKICONS_JPEG_LIB =
|
||||
XFE_MKICONS_JPEG_DSO = -ljpeg
|
||||
|
||||
ifdef USE_AUTOCONF
|
||||
XFE_JPEG_DSO = $(JPEG_LIBS)
|
||||
XFE_MKICONS_JPEG_DSO = $(JPEG_LIBS)
|
||||
endif
|
||||
|
||||
else
|
||||
|
||||
XFE_JPEG_LIB = $(DIST)/lib/libjpeg.a
|
||||
|
|
@ -117,6 +122,11 @@ XFE_PNG_REQUIRES =
|
|||
XFE_MKICONS_PNG_LIB =
|
||||
XFE_MKICONS_PNG_DSO = -lpng
|
||||
|
||||
ifdef USE_AUTOCONF
|
||||
XFE_PNG_DSO = $(PNG_LIBS)
|
||||
XFE_MKICONS_PNG_DSO = $(PNG_LIBS)
|
||||
endif
|
||||
|
||||
else
|
||||
|
||||
XFE_PNG_LIB = $(DIST)/lib/libpng.a
|
||||
|
|
@ -169,6 +179,11 @@ XFE_ZLIB_REQUIRES =
|
|||
XFE_MKICONS_ZLIB_LIB =
|
||||
XFE_MKICONS_ZLIB_DSO = -lz
|
||||
|
||||
ifdef USE_AUTOCONF
|
||||
XFE_ZLIB_DSO = $(ZLIB_LIBS)
|
||||
XFE_MKICONS_ZLIB_DSO = $(ZLIB_LIBS)
|
||||
endif
|
||||
|
||||
else
|
||||
|
||||
ifdef FULL_STATIC_BUILD
|
||||
|
|
|
|||
|
|
@ -896,12 +896,14 @@ endif
|
|||
# Linux
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
|
||||
ifndef USE_AUTOCONF
|
||||
# Override the definition of OS_LIBS in config/Linux.mk.
|
||||
ifeq ($(USE_PTHREADS),1)
|
||||
OS_LIBS = -lpthread -lm -ldl -lc
|
||||
else
|
||||
OS_LIBS = -lm -ldl
|
||||
endif
|
||||
endif
|
||||
|
||||
XFE_MOTIF_LDFLAGS = \
|
||||
$(MOZILLA_XFE_GLIBC_BROKEN_LOCALE_FLAGS) \
|
||||
|
|
@ -1097,8 +1099,8 @@ OTHER_LIBS = $(MOTIFLIB) $(OS_LIBS)
|
|||
endif
|
||||
|
||||
# Override all of the above with the autoconf variables
|
||||
OTHER_LIBS = $(FE_X_LIBS) $(ACLFLAGS) $(ACLIBS)
|
||||
OTHER_DYN_MOTIF_LIBS = $(FE_X_LIBS) $(ACLFLAGS) $(ACLIBS)
|
||||
OTHER_LIBS = $(FE_X_LIBS) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
|
||||
OTHER_DYN_MOTIF_LIBS = $(FE_X_LIBS) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
|
||||
|
||||
#######################################################################
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ NO_MDUPDATE = 1
|
|||
|
||||
MOZ_FE = @MOZ_FE@
|
||||
MOZ_SECURITY = @MOZ_SECURITY@
|
||||
NO_SECURITY = @NO_SECURITY@
|
||||
MOZ_JAVA = @MOZ_JAVA@
|
||||
MOZ_OJI = @MOZ_OJI@
|
||||
MOZ_NETCAST = @MOZ_NETCAST@
|
||||
|
|
@ -50,9 +49,13 @@ MOZ_NATIVE_ZLIB = @SYSTEM_ZLIB@
|
|||
MOZ_NATIVE_JPEG = @SYSTEM_JPEG@
|
||||
MOZ_NATIVE_PNG = @SYSTEM_PNG@
|
||||
|
||||
ACCFLAGS = @CFLAGS@ @DEFS@ $(NSPR_CFLAGS)
|
||||
ACLFLAGS = @LDFLAGS@
|
||||
ACLIBS = @LIBS@
|
||||
# Should the extra CFLAGS only be added in Makefile.ins that need them?
|
||||
OS_CFLAGS = @CFLAGS@ @DEFS@ $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
|
||||
OS_LIBS = @LDFLAGS@ @LIBS@
|
||||
|
||||
XCFLAGS = @XCFLAGS@
|
||||
XLDFLAGS = @XLDFLAGS@
|
||||
XLIBS = @XLIBS@
|
||||
|
||||
CC = @CC@
|
||||
CXX = @CXX@
|
||||
|
|
@ -70,6 +73,12 @@ MOC = @MOC@
|
|||
OBJDIR_TAG = _AC
|
||||
OBJDIR_NAME = .
|
||||
|
||||
JPEG_CFLAGS = @JPEG_CFLAGS@
|
||||
JPEG_LIBS = @JPEG_LIBS@
|
||||
ZLIB_CFLAGS = @ZLIB_CFLAGS@
|
||||
ZLIB_LIBS = @ZLIB_LIBS@
|
||||
PNG_CFLAGS = @PNG_CFLAGS@
|
||||
PNG_LIBS = @PNG_LIBS@
|
||||
NSPR_CFLAGS = @NSPR_CFLAGS@
|
||||
NSPR_LIBS = @NSPR_LIBS@
|
||||
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ endif
|
|||
endif
|
||||
|
||||
ifdef USE_AUTOCONF
|
||||
OPTIMIZER = $(ACCFLAGS)
|
||||
OPTIMIZER =
|
||||
DEFINES = -UDEBUG -DNDEBUG -DTRIMMED
|
||||
XBCFLAGS =
|
||||
else
|
||||
|
|
@ -280,7 +280,7 @@ endif # !USE_AUTOCONF
|
|||
|
||||
ifdef MOZ_DEBUG
|
||||
ifdef USE_AUTOCONF
|
||||
OPTIMIZER = $(ACCFLAGS)
|
||||
OPTIMIZER =
|
||||
else
|
||||
OPTIMIZER = -g
|
||||
endif
|
||||
|
|
@ -355,11 +355,12 @@ MOZILLA_DETECT_NAME = detect_$(MOZILLA_DETECT_UNIQ_IDENT)_gen.mk
|
|||
MOZILLA_DETECT_GEN = $(MOZILLA_DETECT_DIR)/$(MOZILLA_DETECT_NAME)
|
||||
endif
|
||||
|
||||
ifndef USE_AUTOCONF
|
||||
#
|
||||
# Now include the platform-specific stuff.
|
||||
#
|
||||
include $(topsrcdir)/config/$(OS_ARCH).mk
|
||||
|
||||
endif # !USE_AUTOCONF
|
||||
#
|
||||
# Some platforms (Solaris) might require builds using either
|
||||
# (or both) compiler(s).
|
||||
|
|
@ -741,8 +742,13 @@ else
|
|||
JAVA_DEFINES += -DAWT_102
|
||||
endif
|
||||
|
||||
# I don't believe this is still true -cls
|
||||
ifndef USE_AUTOCONF
|
||||
|
||||
# From nsprpub/config/config.mk, mozilla/jpeg needs to know
|
||||
# about USE_PTHREADS. This fixes platforms like SparcLinux. -mcafee
|
||||
ifeq ($(USE_PTHREADS), 1)
|
||||
OS_CFLAGS += -D_PR_PTHREADS -UHAVE_CVAR_BUILT_ON_SEM
|
||||
endif
|
||||
endif #!USE_AUTOCONF
|
||||
|
||||
|
|
|
|||
274
configure.in
274
configure.in
|
|
@ -36,9 +36,10 @@ if [ test "${srcdir}" = "${d}" || test "${srcdir}" = "." ]; then
|
|||
fi
|
||||
unset d
|
||||
|
||||
dnl Set the version number of the libjpeg included with mozilla
|
||||
dnl Set the version number of the libs included with mozilla
|
||||
dnl ========================================================
|
||||
dnl MOZJPEG=60
|
||||
MOZJPEG=62
|
||||
MOZPNG=95
|
||||
|
||||
dnl Set various checks
|
||||
dnl ========================================================
|
||||
|
|
@ -69,9 +70,11 @@ AC_PATH_PROG(ZIP, zip, :)
|
|||
AC_PATH_X
|
||||
AC_PATH_XTRA
|
||||
|
||||
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $X_LIBS"
|
||||
dnl CFLAGS="$CFLAGS $X_CFLAGS"
|
||||
dnl LDFLAGS="$LDFLAGS $XLDFLAGS"
|
||||
dnl LIBS="$X_PRE_LIBS $X_EXTRA_LIBS $LIBS"
|
||||
XLDFLAGS="$X_LIBS"
|
||||
XLIBS="$X_EXTRA_LIBS"
|
||||
|
||||
if [ test ! -z "$x_includes" ]; then
|
||||
MOTIF_XINCS="-xif -I$x_includes"
|
||||
|
|
@ -291,12 +294,10 @@ AC_ARG_ENABLE(crypto,
|
|||
[ --enable-crypto enable use of SSL (untested)],
|
||||
[if test "$enableval" = "yes"; then
|
||||
MOZ_SECURITY=1
|
||||
NO_SECURITY=
|
||||
else
|
||||
MOZ_SECURITY=
|
||||
NO_SECURITY=1
|
||||
fi],
|
||||
[MOZ_SECURITY= NO_SECURITY=1])
|
||||
[MOZ_SECURITY= ])
|
||||
|
||||
AC_ARG_ENABLE(netcast,
|
||||
[ --enable-netcast enable use of netcast (untested)],
|
||||
|
|
@ -388,7 +389,8 @@ AC_ARG_ENABLE(dom,
|
|||
AC_ARG_ENABLE(pthreads,
|
||||
[ --enable-pthreads enable native pthreads support],
|
||||
[if test "$enableval" = "yes"; then
|
||||
AC_CHECK_LIB(pthread, pthread_create, NSPR_LIBS=-lpthread USE_PTHREADS=1)
|
||||
AC_CHECK_LIB(pthread, pthread_create,
|
||||
NSPR_LIBS="-lpthread $NSPR_LIBS" USE_PTHREADS=1)
|
||||
fi] )
|
||||
|
||||
AC_ARG_ENABLE(mail-compose,
|
||||
|
|
@ -407,7 +409,6 @@ AC_ARG_ENABLE(ldap,
|
|||
|
||||
AC_SUBST(MOZ_FE)
|
||||
AC_SUBST(MOZ_SECURITY)
|
||||
AC_SUBST(NO_SECURITY)
|
||||
AC_SUBST(MOZ_NETCAST)
|
||||
AC_SUBST(MOZ_JAVA)
|
||||
AC_SUBST(MOZ_OJI)
|
||||
|
|
@ -432,27 +433,37 @@ dnl Checks for X libraries.
|
|||
dnl Ordering is important.
|
||||
dnl Xt is dependent upon SM as of X11R6
|
||||
dnl ========================================================
|
||||
AC_CHECK_LIB(X11, XDrawLines,,
|
||||
[MISSING_X="$MISSING_X -lX11"])
|
||||
AC_CHECK_LIB(Xext, XextAddDisplay,,
|
||||
[MISSING_X="$MISSING_X -lXext"], -lX11)
|
||||
AC_CHECK_LIB(ICE, IceFlush,,, -lX11)
|
||||
AC_CHECK_LIB(SM, SmcCloseConnection,,, -lICE -lX11)
|
||||
AC_CHECK_LIB(Xt, XtFree,,
|
||||
[MISSING_X="$MISSING_X -lXt"], -lX11)
|
||||
AC_CHECK_LIB(Xmu, XmuLookupString,,
|
||||
[MISSING_X="$MISSING_X -lXmu"], -lXt -lX11)
|
||||
_SAVE_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$XLDFLAGS $LDFLAGS"
|
||||
AC_CHECK_LIB(X11, XDrawLines, [XLIBS="-lX11 $XLIBS"],
|
||||
[MISSING_X="$MISSING_X -lX11"], $XLIBS)
|
||||
AC_CHECK_LIB(Xext, XextAddDisplay, [XLIBS="-lXext $XLIBS"],
|
||||
[MISSING_X="$MISSING_X -lXext"], $XLIBS)
|
||||
AC_CHECK_LIB(ICE, IceFlush, [XLIBS="-lICE $XLIBS"],, $XLIBS)
|
||||
AC_CHECK_LIB(SM, SmcCloseConnection, [XLIBS="-lSM $XLIBS"],, $XLIBS)
|
||||
AC_CHECK_LIB(Xt, XtFree, [XLIBS="-lXt $XLIBS"],
|
||||
[MISSING_X="$MISSING_X -lXt"], $XLIBS)
|
||||
AC_CHECK_LIB(Xmu, XmuLookupString, [XLIBS="-lXmu $XLIBS"],
|
||||
[MISSING_X="$MISSING_X -lXmu"], $XLIBS)
|
||||
LDFLAGS="$_SAVE_LDFLAGS"
|
||||
|
||||
res=`echo :$MOZ_FE | grep -c " x"`
|
||||
if [ test $res != 0 ]; then
|
||||
if [ test "$MOTIF_REQUIRES_XPM" = "True" ]; then
|
||||
AC_CHECK_LIB(Xpm, XpmWriteFileFromImage, FE_X_LIBS="-lXpm $FE_X_LIBS",
|
||||
[MISSING_MOTIF="-lXpm $MISSING_MOTIF"], -lX11)
|
||||
fi
|
||||
if [ test "$MOTIF_VERSION" = "2.1" ]; then
|
||||
AC_CHECK_LIB(Xp, XpGetPrinterList,
|
||||
FE_X_LIBS="-lXp $FE_X_LIBS",
|
||||
[MISSING_MOTIF="-lXp $MISSING_MOTIF"], -lX11)
|
||||
if [ test "$MOTIF_REQUIRES_XPM" = "True" && test "$MOTIF_VERSION" = "2.1" ]; then
|
||||
_SAVE_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$XLDFLAGS $LDFLAGS"
|
||||
if [ test "$MOTIF_REQUIRES_XPM" = "True" ]; then
|
||||
AC_CHECK_LIB(Xpm, XpmWriteFileFromImage,
|
||||
FE_X_LIBS="-lXpm $FE_X_LIBS",
|
||||
[MISSING_MOTIF="-lXpm $MISSING_MOTIF"], $XLIBS)
|
||||
fi
|
||||
if [ test "$MOTIF_VERSION" = "2.1" ]; then
|
||||
AC_CHECK_LIB(Xp, XpGetPrinterList,
|
||||
FE_X_LIBS="-lXp $FE_X_LIBS",
|
||||
[MISSING_MOTIF="-lXp $MISSING_MOTIF"], $XLIBS)
|
||||
fi
|
||||
FE_X_LIBS="$XLDFLAGS $FE_X_LIBS"
|
||||
LDFLAGS="$_SAVE_LDFLAGS"
|
||||
fi
|
||||
|
||||
if [ test "$MOTIF_STATIC_LIB" = "unknown" && test "$MOTIF_DYNAMIC_LIB" = "unknown" ]; then
|
||||
|
|
@ -481,15 +492,16 @@ if [ test $res != 0 ]; then
|
|||
sysstaticmotif=$withval)
|
||||
|
||||
if [ test "$sysstaticmotif" != "yes" ]; then
|
||||
_SAVE_LDFLAGS="$LDFLAGS"
|
||||
AC_CHECK_LIB(Xm, XmStringCreate,
|
||||
FE_X_LIBS="$MOTIF_DYNAMIC_PATHS $MOTIF_DYNAMIC_FLAGS $FE_X_LIBS",
|
||||
[MISSING_MOTIF="$MOTIF_DYNAMIC_FLAGS $MISSING_MOTIF"],
|
||||
$MOTIF_DYNAMIC_PATHS $FE_X_LIBS -lX11)
|
||||
$MOTIF_DYNAMIC_PATHS $FE_X_LIBS $XLIBS)
|
||||
else
|
||||
AC_CHECK_LIB(Xm, XmStringCreate,
|
||||
FE_X_LIBS="$MOTIF_STATIC_FLAGS $FE_X_LIBS",
|
||||
[MISSING_MOTIF="$MOTIF_STATIC_FLAGS $MISSING_MOTIF"],
|
||||
$FE_X_LIBS -lX11)
|
||||
$FE_X_LIBS $XLIBS)
|
||||
fi
|
||||
|
||||
FE_X_CFLAGS="$MOTIF_INCLUDES"
|
||||
|
|
@ -522,12 +534,11 @@ if [ test $res != 0 ]; then
|
|||
`gnome-config --libs gnomeui`)
|
||||
fi
|
||||
|
||||
dnl XCFLAGS="$X_CFLAGS"
|
||||
dnl XLFLAGS="$X_LIBS"
|
||||
XCFLAGS="$X_CFLAGS"
|
||||
|
||||
dnl AC_SUBST(XCFLAGS)
|
||||
dnl AC_SUBST(XLFLAGS)
|
||||
dnl AC_SUBST(XLIBS)
|
||||
AC_SUBST(XCFLAGS)
|
||||
AC_SUBST(XLDFLAGS)
|
||||
AC_SUBST(XLIBS)
|
||||
|
||||
AC_SUBST(FE_X_CFLAGS)
|
||||
AC_SUBST(FE_X_LIBS)
|
||||
|
|
@ -540,36 +551,114 @@ AC_SUBST(FE_GNOME_LIBS)
|
|||
|
||||
dnl system JPEG support
|
||||
dnl ========================================================
|
||||
dnl If --with-jpeg=$val is specified, use the logic specified by $val
|
||||
|
||||
sysjpeg=maybe
|
||||
AC_ARG_WITH(jpeg,
|
||||
[ --with-jpeg use system libjpeg if present],
|
||||
sysjpeg=$withval)
|
||||
[ --with-jpeg=\$dir use system libjpeg in \$dir if more recent],
|
||||
JPEG_DIR=$withval)
|
||||
|
||||
if test "$sysjpeg" = yes; then
|
||||
AC_CHECK_LIB(jpeg, jpeg_destroy_compress, [SYSTEM_JPEG=1 LIBS="$LIBS -ljpeg"], SYSTEM_JPEG=)
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
_SAVE_LDFLAGS=$LDFLAGS
|
||||
_SAVE_LIBS=$LIBS
|
||||
CFLAGS="-I${JPEG_DIR}/include $CFLAGS"
|
||||
LDFLAGS="-L${JPEG_DIR}/lib $LDFLAGS"
|
||||
if test "$JPEG_DIR" = no; then
|
||||
SYSTEM_JPEG=
|
||||
else
|
||||
AC_CHECK_LIB(jpeg, jpeg_destroy_compress, [SYSTEM_JPEG=1 JPEG_LIBS="-ljpeg $JPEG_LIBS"], SYSTEM_JPEG=, $JPEG_LIBS)
|
||||
fi
|
||||
|
||||
dnl system PNG Support
|
||||
dnl ========================================================
|
||||
AC_ARG_WITH(png,
|
||||
[ --with-png use system libpng if present],
|
||||
syspng=$withval, syspng=no)
|
||||
if [ test "$SYSTEM_JPEG" = 1 ]; then
|
||||
LIBS="$JPEG_LIBS $LIBS"
|
||||
AC_TRY_RUN(
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <jpeglib.h>
|
||||
int main () {
|
||||
#if JPEG_LIB_VERSION >= $MOZJPEG
|
||||
exit(0);
|
||||
#else
|
||||
exit(1);
|
||||
#endif
|
||||
}
|
||||
, SYSTEM_JPEG=1, [SYSTEM_JPEG= JPEG_CFLAGS= JPEG_LIBS=], SYSTEM_JPEG= )
|
||||
fi
|
||||
CFLAGS=$_SAVE_CFLAGS
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
LIBS=$_SAVE_LIBS
|
||||
|
||||
if test "$syspng" = yes; then
|
||||
AC_CHECK_LIB(png, png_get_valid,
|
||||
[SYSTEM_PNG=1 LIBS="$LIBS -lpng"] , SYSTEM_PNG=, -lz -lm)
|
||||
if [ test -n "${JPEG_DIR}" && test -d "${JPEG_DIR}" && test "$SYSTEM_JPEG" = 1]; then
|
||||
JPEG_CFLAGS="-I${JPEG_DIR}/include"
|
||||
JPEG_LIBS="-L${JPEG_DIR}/lib ${JPEG_LIBS}"
|
||||
fi
|
||||
|
||||
dnl system ZLIB support
|
||||
dnl ========================================================
|
||||
AC_ARG_WITH(zlib,
|
||||
[ --with-zlib use system libz if present],
|
||||
syslibz=$withval, [syslibz=no SYSTEM_ZLIB=])
|
||||
[ --with-zlib=\$dir use system libz in \$dir],
|
||||
ZLIB_DIR=$withval)
|
||||
|
||||
if test "$syslibz" = yes; then
|
||||
AC_CHECK_LIB(z, gzread, [SYSTEM_ZLIB=1 LIBS="$LIBS -lz"], SYSTEM_ZLIB=)
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
_SAVE_LDFLAGS=$LDFLAGS
|
||||
CFLAGS="-I${ZLIB_DIR}/include $CFLAGS"
|
||||
LDFLAGS="-L${ZLIB_DIR}/lib $LDFLAGS"
|
||||
if test "$ZLIB_DIR" = no; then
|
||||
SYSTEM_ZLIB=
|
||||
else
|
||||
AC_MSG_CHECKING("for zlib.h")
|
||||
AC_TRY_COMPILE([#include "zlib.h"], [],
|
||||
[result="yes" SYSTEM_ZLIB=1],
|
||||
[result="no" SYSTEM_ZLIB=])
|
||||
AC_MSG_RESULT("$result")
|
||||
fi
|
||||
if [ test "$SYSTEM_ZLIB" = 1 ]; then
|
||||
AC_CHECK_LIB(z, gzread, [SYSTEM_ZLIB=1 ZLIB_LIBS="-lz $ZLIB_LIBS"],
|
||||
[SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS=], $ZLIB_LIBS)
|
||||
fi
|
||||
CFLAGS=$_SAVE_CFLAGS
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
|
||||
if [ test -n "${ZLIB_DIR}" && test -d "${ZLIB_DIR}" && test "$SYSTEM_ZLIB" = 1 ]; then
|
||||
ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
|
||||
ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
|
||||
fi
|
||||
|
||||
dnl system PNG Support
|
||||
dnl ========================================================
|
||||
AC_ARG_WITH(png,
|
||||
[ --with-png=\$dir use system libpng in \$dir if more recent],
|
||||
PNG_DIR=$withval)
|
||||
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
_SAVE_LDFLAGS=$LDFLAGS
|
||||
_SAVE_LIBS=$LIBS
|
||||
CFLAGS="-I${PNG_DIR}/include $ZLIB_CFLAGS $CFLAGS"
|
||||
LDFLAGS="-L${PNG_DIR}/lib $ZLIB_LIBS -lz $LDFLAGS"
|
||||
if test "$PNG_DIR" = no; then
|
||||
SYSTEM_PNG=
|
||||
else
|
||||
AC_CHECK_LIB(png, png_get_valid, [SYSTEM_PNG=1 PNG_LIBS="-lpng $PNG_LIBS"], SYSTEM_PNG=, $PNG_LIBS)
|
||||
fi
|
||||
if [ test "$SYSTEM_PNG" = 1 ]; then
|
||||
LIBS="$PNG_LIBS $LIBS"
|
||||
AC_TRY_RUN(
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <png.h>
|
||||
int main () {
|
||||
#if PNG_LIBPNG_VER >= $MOZPNG
|
||||
exit(0);
|
||||
#else
|
||||
exit(1);
|
||||
#endif
|
||||
}
|
||||
, SYSTEM_PNG=1, [SYSTEM_PNG= PNG_CFLAGS= PNG_LIBS=], SYSTEM_PNG= )
|
||||
fi
|
||||
CFLAGS=$_SAVE_CFLAGS
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
LIBS=$_SAVE_LIBS
|
||||
|
||||
if [ test -n "${PNG_DIR}" && test -d "${PNG_DIR}" && test "$SYSTEM_PNG" = 1 ]; then
|
||||
PNG_CFLAGS="-I${PNG_DIR}/include"
|
||||
PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
|
||||
fi
|
||||
|
||||
dnl system NSPR support
|
||||
|
|
@ -581,23 +670,74 @@ AC_ARG_WITH(nspr,
|
|||
NSPR_DIR=$withval)
|
||||
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS -I${NSPR_DIR}/include"
|
||||
AC_MSG_CHECKING("for nspr.h")
|
||||
AC_TRY_COMPILE([#include "nspr.h"], [],
|
||||
[result="yes"],
|
||||
[MISSING_NSPR="$MISSING_NSPR nspr.h" result="no"])
|
||||
AC_MSG_RESULT("$result")
|
||||
CFLAGS=$_SAVE_CFLAGS
|
||||
|
||||
_SAVE_LDFLAGS=$LDFLAGS
|
||||
LDFLAGS="$LDFLAGS -L${NSPR_DIR}/lib"
|
||||
AC_CHECK_LIB(nspr21, PR_GetUniqueIdentity, NSPR_LIBS="-lnspr21 $NSPR_LIBS",
|
||||
[MISSING_NSPR="$MISSING_NSPR -lnspr21"], $NSPR_LIBS)
|
||||
_SAVE_LIBS=$LIBS
|
||||
CFLAGS="$CFLAGS -I${NSPR_DIR}/include"
|
||||
LDFLAGS="$LDFLAGS -L${NSPR_DIR}/lib $NSPR_LIBS"
|
||||
|
||||
dnl AC_MSG_CHECKING("for nspr.h")
|
||||
dnl AC_TRY_COMPILE([#include "nspr.h"], [],
|
||||
dnl [result="yes"],
|
||||
dnl [MISSING_NSPR="$MISSING_NSPR nspr.h" result="no"])
|
||||
dnl AC_MSG_RESULT("$result")
|
||||
|
||||
dnl AC_CHECK_LIB(nspr21, PR_GetUniqueIdentity,
|
||||
dnl [_FOUND_NSPR_LIB=1 NSPR_LIBS="-lnspr21 $NSPR_LIBS",
|
||||
dnl [MISSING_NSPR="$MISSING_NSPR -lnspr21"], $NSPR_LIBS)
|
||||
|
||||
AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr21")
|
||||
LIBS="-lnspr21 $NSPR_LIBS $LIBS"
|
||||
AC_TRY_RUN(
|
||||
#include <stdio.h>
|
||||
#include <nspr.h>
|
||||
int main () {
|
||||
PRThread *dummy = PR_GetCurrentThread();
|
||||
exit(0);
|
||||
}
|
||||
, [NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes"],
|
||||
[_NSPR_NEEDS_THREAD_LIB=1 result="no"],
|
||||
[_NSPR_NEEDS_THREAD_LIB=1 result="no"] )
|
||||
AC_MSG_RESULT("$result")
|
||||
|
||||
dnl XXX - Is this really the best way to do this check? - cls
|
||||
if [ test "$_NSPR_NEEDS_THREAD_LIB" = 1 ]; then
|
||||
|
||||
LIBS=$_SAVE_LIBS
|
||||
case "$target" in
|
||||
*-*-linux*)
|
||||
AC_CHECK_LIB(pthread, pthread_create,
|
||||
NSPR_LIBS="-lpthread $NSPR_LIBS" USE_PTHREADS=1) ;;
|
||||
alpha-*-osf*)
|
||||
CFLAGS="$CFLAGS -pthread"
|
||||
_SAVE_CFLAGS="$_SAVE_CFLAGS -pthread" ;;
|
||||
esac
|
||||
|
||||
AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr21 with thread lib")
|
||||
LIBS="-lnspr21 $NSPR_LIBS $LIBS"
|
||||
AC_TRY_RUN(
|
||||
#include <stdio.h>
|
||||
#include <nspr.h>
|
||||
int main () {
|
||||
PRThread *dummy = PR_GetCurrentThread();
|
||||
exit(0);
|
||||
}
|
||||
, [NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes"],
|
||||
[_NSPR_NEEDS_THREAD_LIB=1 result="no"],
|
||||
[_NSPR_NEEDS_THREAD_LIB=1 result="no"] )
|
||||
AC_MSG_RESULT("$result")
|
||||
fi
|
||||
|
||||
dnl AC_CHECK_LIB(nspr21, PR_GetUniqueIdentity, NSPR_LIBS="-lnspr21 $NSPR_LIBS",
|
||||
dnl [MISSING_NSPR="$MISSING_NSPR -lnspr21"], $NSPR_LIBS)
|
||||
|
||||
AC_CHECK_LIB(plc21, PL_CreateOptState, NSPR_LIBS="-lplc21 $NSPR_LIBS",
|
||||
[MISSING_NSPR="$MISSING_NSPR -lplc21"], $NSPR_LIBS)
|
||||
AC_CHECK_LIB(plds21, PL_VectorAdd, NSPR_LIBS="-lplds21 $NSPR_LIBS",
|
||||
[MISSING_NSPR="$MISSING_NSPR -lplds21"], $NSPR_LIBS)
|
||||
|
||||
CFLAGS=$_SAVE_CFLAGS
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
LIBS=$_SAVE_LIBS
|
||||
|
||||
if [ test -n "${NSPR_DIR}" && test -d "${NSPR_DIR}" ]; then
|
||||
NSPR_CFLAGS="-I${NSPR_DIR}/include"
|
||||
|
|
@ -608,6 +748,12 @@ AC_SUBST(SYSTEM_JPEG)
|
|||
AC_SUBST(SYSTEM_PNG)
|
||||
AC_SUBST(SYSTEM_ZLIB)
|
||||
|
||||
AC_SUBST(JPEG_CFLAGS)
|
||||
AC_SUBST(JPEG_LIBS)
|
||||
AC_SUBST(ZLIB_CFLAGS)
|
||||
AC_SUBST(ZLIB_LIBS)
|
||||
AC_SUBST(PNG_CFLAGS)
|
||||
AC_SUBST(PNG_LIBS)
|
||||
AC_SUBST(NSPR_CFLAGS)
|
||||
AC_SUBST(NSPR_LIBS)
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче