зеркало из https://github.com/mozilla/pjs.git
Fixed building of shared libs when using egcs.
This commit is contained in:
Родитель
020a8c97bf
Коммит
3f84172ab2
10
configure.in
10
configure.in
|
@ -110,6 +110,12 @@ dnl ========================================================
|
||||||
MKSHLIB='$(LD) $(DSO_LDOPTS)'
|
MKSHLIB='$(LD) $(DSO_LDOPTS)'
|
||||||
DSO_LDOPTS='-shared -soname $(@:$(OBJDIR)/%.so=%.so)'
|
DSO_LDOPTS='-shared -soname $(@:$(OBJDIR)/%.so=%.so)'
|
||||||
|
|
||||||
|
dnl gcc can come with its own linker so its better to use the pass-thru calls
|
||||||
|
dnl ========================================================
|
||||||
|
if test "$GNU_CC" = 1; then
|
||||||
|
MKSHLIB='$(CC) -shared -Wl,-h -Wl,$(@:$(OBJDIR)/%.so=%.so)'
|
||||||
|
fi
|
||||||
|
|
||||||
dnl now the exceptions
|
dnl now the exceptions
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
case "$target" in
|
case "$target" in
|
||||||
|
@ -566,6 +572,8 @@ AC_SUBST(FE_GTK_LIBS)
|
||||||
AC_SUBST(FE_GNOME_CFLAGS)
|
AC_SUBST(FE_GNOME_CFLAGS)
|
||||||
AC_SUBST(FE_GNOME_LIBS)
|
AC_SUBST(FE_GNOME_LIBS)
|
||||||
|
|
||||||
|
#if test -z "$USE_NGLAYOUT"; then
|
||||||
|
|
||||||
dnl system JPEG support
|
dnl system JPEG support
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
AC_ARG_WITH(jpeg,
|
AC_ARG_WITH(jpeg,
|
||||||
|
@ -680,6 +688,8 @@ if [ test -n "${PNG_DIR}" && test -d "${PNG_DIR}" && test "$SYSTEM_PNG" = 1 ]; t
|
||||||
PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
|
PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#fi # !USE_NGLAYOUT
|
||||||
|
|
||||||
dnl system NSPR support
|
dnl system NSPR support
|
||||||
dnl we always use the system NSPR from now on...this option
|
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 tells where to find nspr rather than whether to use it
|
||||||
|
|
Загрузка…
Ссылка в новой задаче