Commit a93c2533 authored by cls%seawood.org's avatar cls%seawood.org
Browse files

Added check so libXpm is only looked for if Motif requires it. Undefine... 

Added check so libXpm is only looked for if Motif requires it.  Undefine certain motif variables if detect_motif.sh returns unknown.  Added --with-static-motif.  Added --with-nspr.
parent cd22237d

configure.in

+48 −21
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ MOTIF_INCLUDES=`${srcdir}/config/mkdetect/detect_motif.sh -cc $CC $MOTIF_XINCS - 
MOTIF_STATIC_FLAGS=`${srcdir}/config/mkdetect/detect_motif.sh -cc $CC $MOTIF_XINCS -sf`

MOTIF_DYNAMIC_FLAGS=`${srcdir}/config/mkdetect/detect_motif.sh -cc $CC $MOTIF_XINCS -df`

MOTIF_DYNAMIC_PATHS=`${srcdir}/config/mkdetect/detect_motif.sh -cc $CC $MOTIF_XINCS -dp`

MOTIF_REQUIRES_XPM=`${srcdir}/config/mkdetect/detect_motif.sh -cc $CC $MOTIF_XINCS -xpm`



${srcdir}/config/mkdetect/detect_motif.sh --cleanup
@@ -436,11 +437,13 @@ AC_CHECK_LIB(Xt, XtFree,, 
	[MISSING_X="$MISSING_X -lXt"], -lX11)

AC_CHECK_LIB(Xmu, XmuLookupString,,

	[MISSING_X="$MISSING_X -lXmu"], -lXt -lX11)

AC_CHECK_LIB(Xpm, XpmWriteFileFromImage,,

	[MISSING_X="$MISSING_X -lXpm"], -lX11)



res=`echo :$MOZ_FE | grep -c " x"`

if [ test $res != 0 ]; then

    if [ test "$MOTIF_REQUIRES_XPM" = "True" ]; then

	AC_CHECK_LIB(Xpm, XpmWriteFileFromImage,,

	    [MISSING_X="$MISSING_X -lXpm"], -lX11)

    fi

    if [ test "$MOTIF_VERSION" = "2.1" ]; then

	AC_CHECK_LIB(Xp, XpGetPrinterList, 

	    FE_X_LIBS="-lXp $FE_X_LIBS",
@@ -451,8 +454,24 @@ if [ test $res != 0 ]; then 
	AC_ERROR("Cannot find neither dynamic nor static motif libraries")

    fi



    # Build dynamic motif preferably....to be replaced by config option

    if [ test "$MOTIF_DYNAMIC_CFLAGS" != "unknown" ]; then

    # Get rid of offending error values

    if test "$MOTIF_DYNAMIC_PATHS" = "unknown"; then 

	MOTIF_DYNAMIC_PATHS=

    fi



    if test "$MOTIF_DYNAMIC_FLAGS" = "unknown"; then 

	MOTIF_DYNAMIC_FLAGS=

    fi



    if test "$MOTIF_STATIC_FLAGS" = "unknown"; then 

	MOTIF_STATIC_FLAGS=

    fi



    AC_ARG_WITH(static-motif,

    [  --with-static-motif     link motif statically if possible],

	sysstaticmotif=$withval)



    if [ test "$sysstaticmotif" != "yes" ]; then

    	AC_CHECK_LIB(Xm, XmStringCreate, FE_X_LIBS="$MOTIF_DYNAMIC_PATHS $MOTIF_DYNAMIC_FLAGS $FE_X_LIBS",

	    [MISSING_MOTIF=1], $MOTIF_DYNAMIC_PATHS $FE_X_LIBS -lX11)

    else
@@ -514,23 +533,6 @@ if test "$sysjpeg" = yes; then 
    AC_CHECK_LIB(jpeg, jpeg_destroy_compress, [SYSTEM_JPEG=1 LIBS="$LIBS -ljpeg"], SYSTEM_JPEG=)

fi



dnl    if test "$sysjpeg" = maybe; then

dnl	AC_TRY_RUN(

dnl		#include <stdio.h>

dnl		#include <sys/types.h>

dnl		#include <jpeglib.h>

dnl		int main () {

dnl		#if JPEG_LIB_VERSION >= $MOZJPEG

dnl		   exit(0);

dnl		#else

dnl		   exit(1);

dnl		#endif

dnl		}

dnl	, SYSTEM_JPEG=1, SYSTEM_JPEG=, SYSTEM_JPEG=)

dnl     else

dnl    	SYSTEM_JPEG=

dnl     fi



dnl system PNG Support

dnl ========================================================

AC_ARG_WITH(png,
@@ -552,10 +554,35 @@ if test "$syslibz" = yes; then 
    AC_CHECK_LIB(z, gzread, [SYSTEM_ZLIB=1 LIBS="$LIBS -lz"], SYSTEM_ZLIB=)

fi



dnl system NSPR support

dnl we always use the system NSPR from now on...this option

dnl tells where to find nspr rather than whether to use it

dnl ========================================================

AC_ARG_WITH(nspr,

[  --with-nspr=\$dir        location of nspr headers and libraries],

	NSPR_DIR=$withval)



if test -d "$NSPR_DIR" ; then

    _SAVE_LDFLAGS=$LDFLAGS

    LDFLAGS="$LDFLAGS -L${NSPR_DIR}/lib"

    AC_CHECK_LIB(nspr21, PR_GetUniqueIdentity, NSPR_LIBS="-lnspr21 $NSPR_LIBS",

		, $NSPR_LIBS)

    AC_CHECK_LIB(plc21, PL_CreateOptState, NSPR_LIBS="-lplc21 $NSPR_LIBS",

		, $NSPR_LIBS)

    AC_CHECK_LIB(plds21, PL_VectorAdd, NSPR_LIBS="-lplds21 $NSPR_LIBS",

		, $NSPR_LIBS)

    LDFLAGS=$_SAVE_LDFLAGS

else

    NSPR_DIR=`pwd`/dist

fi



AC_SUBST(SYSTEM_JPEG)

AC_SUBST(SYSTEM_PNG)

AC_SUBST(SYSTEM_ZLIB)



AC_SUBST(NSPR_DIR)

AC_SUBST(NSPR_LIBS)



AC_SUBST(CFLAGS)

AC_SUBST(LDFLAGS)

AC_SUBST(LIBS)