Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for Motif builds on Solaris, and the first pieces of an idea that will allow platforms with old ld's to be able to build/link.

Browse Source
This commit is contained in:
briano%netscape.com 1999-07-13 00:05:07 +00:00
parent 5b4276f4d3
commit 09431e31cb
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/autoconf.mk.in
View File

@ -185,6 +185,7 @@ MKSHLIB_FORCE_ALL = @MKSHLIB_FORCE_ALL@
MKSHLIB_UNFORCE_ALL = @MKSHLIB_UNFORCE_ALL@
DSO_LDOPTS = @DSO_LDOPTS@
DLL_SUFFIX = @DLL_SUFFIX@
NO_LD_ARCHIVE_FLAGS = @NO_LD_ARCHIVE_FLAGS@
endif
GTK_CONFIG = @GTK_CONFIG@

44
configure.in
View File

@ -497,6 +497,21 @@ dnl the qsort routine under solaris is faulty
esac
dnl ========================================================
dnl Any platform that doesn't have MKSHLIB_FORCE_ALL defined
dnl by now will not have any way to link most binaries (tests
dnl as well as viewer, apprunner, etc.), because some symbols
dnl will be left out of the "composite" .so's by ld as unneeded.
dnl So, by defining NO_LD_ARCHIVE_FLAGS for these platforms,
dnl they can link in the static libs that provide the missing
dnl symbols.
dnl ========================================================
NO_LD_ARCHIVE_FLAGS=
if test -z "$MKSHLIB_FORCE_ALL"; then
NO_LD_ARCHIVE_FLAGS=1
fi
AC_SUBST(NO_LD_ARCHIVE_FLAGS)
dnl ========================================================
dnl =
dnl = --diable-pic-dso-cflags
@ -515,8 +530,6 @@ then
DSO_PIC_CFLAGS=""
fi
dnl ========================================================
dnl ========================================================
dnl =
dnl = --diable-dtd-debug
@ -616,22 +629,23 @@ fi
_SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$XLDFLAGS $LDFLAGS"
if test "$MOTIF_REQUIRES_XPM" = "True"; then
AC_CHECK_LIB(Xpm, XpmWriteFileFromImage,
XPM_LIBS="-lXpm",
[MISSING_MOTIF="$MISSING_MOTIF -lXpm"], $XLIBS)
fi
if test "$MOTIF_REQUIRES_XPM" = "True"; then
AC_CHECK_LIB(Xpm, XpmWriteFileFromImage,
XPM_LIBS="-lXpm",
[MISSING_MOTIF="$MISSING_MOTIF -lXpm"], $XLIBS)
fi
if test "$MOTIF_VERSION" = "2.1"; then
AC_CHECK_LIB(Xp, XpGetPrinterList,
MOTIF_XP_LIBS="-lXp",
[MISSING_MOTIF="$MISSING_MOTIF -lXp"], $XLIBS)
fi
if test "$MOTIF_VERSION" = "2.1"; then
AC_CHECK_LIB(Xp, XpGetPrinterList,
MOTIF_XP_LIBS="-lXp",
[MISSING_MOTIF="$MISSING_MOTIF -lXp"], $XLIBS)
fi
TK_LIBS="$XLDFLAGS $TK_LIBS"
LDFLAGS="$_SAVE_LDFLAGS"
LDFLAGS="$_SAVE_LDFLAGS"
fi
TK_LIBS="$XLDFLAGS $TK_LIBS"
if test "$MOTIF_STATIC_LIB" = "unknown" \
-a "$MOTIF_DYNAMIC_LIB" = "unknown"; then
AC_ERROR("Cannot find either dynamic or static Motif libraries.")
@ -654,7 +668,7 @@ fi
MOTIF_INCLUDE_DIR=
fi
TK_LIBS="$MOTIF_XP_LIBS $XT_LIBS $XMU_LIBS $XPM_LIBS $XEXT_LIBS $X11_LIBS $XSM_LIBS $XICE_LIBS"
TK_LIBS="$MOTIF_XP_LIBS $TK_LIBS $X_LIBS $XT_LIBS $XMU_LIBS $XPM_LIBS $XEXT_LIBS $X11_LIBS $XSM_LIBS $XICE_LIBS"
AC_ARG_WITH(static-motif,
[ --with-static-motif link Motif statically if possible],