Based on David Hull's fix in bug report 804599, we now check for solaris
and gcc, to set the -mimpure-text link flag for linking the lib better.
This commit is contained in:
parent
da0b380655
commit
fcfc6de918
17
configure.ac
17
configure.ac
@ -66,6 +66,7 @@ AC_LIBTOOL_WIN32_DLL
|
|||||||
dnl libtool setup
|
dnl libtool setup
|
||||||
AM_PROG_LIBTOOL
|
AM_PROG_LIBTOOL
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([if we need -no-undefined])
|
||||||
case $host in
|
case $host in
|
||||||
*-*-cygwin | *-*-mingw* | *-*-pw32*)
|
*-*-cygwin | *-*-mingw* | *-*-pw32*)
|
||||||
need_no_undefined=yes
|
need_no_undefined=yes
|
||||||
@ -74,9 +75,23 @@ case $host in
|
|||||||
need_no_undefined=no
|
need_no_undefined=no
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
AC_MSG_RESULT($need_no_undefined)
|
||||||
AM_CONDITIONAL(NO_UNDEFINED, test x$need_no_undefined = xyes)
|
AM_CONDITIONAL(NO_UNDEFINED, test x$need_no_undefined = xyes)
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([if we need -mimpure-text])
|
||||||
|
case $host in
|
||||||
|
*-*-solaris2*)
|
||||||
|
if test "$GCC" = "yes"; then
|
||||||
|
mimpure="yes"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
mimpure=no
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
AC_MSG_RESULT($mimpure)
|
||||||
|
AM_CONDITIONAL(MIMPURE, test x$mimpure = xyes)
|
||||||
|
|
||||||
dnl The install stuff has already been taken care of by the automake stuff
|
dnl The install stuff has already been taken care of by the automake stuff
|
||||||
dnl AC_PROG_INSTALL
|
dnl AC_PROG_INSTALL
|
||||||
AC_PROG_MAKE_SET
|
AC_PROG_MAKE_SET
|
||||||
|
@ -54,15 +54,19 @@ VERSION=-version-info 2:2:0
|
|||||||
if NO_UNDEFINED
|
if NO_UNDEFINED
|
||||||
# The -no-undefined flag is CRUCIAL for this to build fine on Cygwin.
|
# The -no-undefined flag is CRUCIAL for this to build fine on Cygwin.
|
||||||
UNDEF = -no-undefined
|
UNDEF = -no-undefined
|
||||||
else
|
endif
|
||||||
UNDEF =
|
|
||||||
|
if MIMPURE
|
||||||
|
# This is for gcc on Solaris (8+ ?) to avoid "relocations remain against
|
||||||
|
# allocatable but non-writable sections" problems.
|
||||||
|
MIMPURE = -mimpure-text
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if ARES
|
if ARES
|
||||||
ARESLIB = -lares -L$(top_builddir)/ares
|
ARESLIB = -lares -L$(top_builddir)/ares
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libcurl_la_LDFLAGS = $(UNDEF) $(VERSION) $(ARESLIB)
|
libcurl_la_LDFLAGS = $(UNDEF) $(VERSION) $(ARESLIB) $(MIMPURE)
|
||||||
|
|
||||||
libcurl_la_SOURCES = arpa_telnet.h file.c netrc.h timeval.c \
|
libcurl_la_SOURCES = arpa_telnet.h file.c netrc.h timeval.c \
|
||||||
base64.c file.h hostip.c progress.c timeval.h base64.h formdata.c \
|
base64.c file.h hostip.c progress.c timeval.h base64.h formdata.c \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user