* src/base/ftmac.c [__GNUC__]: Define OS_INLINE.
* builds/unix/configure.ac: Don't try to remove `-ansi' compilation switch on the Mac. * builds/unix/ltmain.sh: Regenerated with `libtoolize --force --copy' from libtool 1.5.6. * builds/unix/aclocal.m4: Regenerated with `aclocal -I .' from automake 1.8a. * builds/unix/configure: Regenerated with autoconf 2.59a.
This commit is contained in:
Werner Lemberg
parent
deadbb53d2
commit
3599a028b6
12
ChangeLog
12
ChangeLog
|
|
@ -1,3 +1,15 @@
|
|||
2004-04-14 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
* src/base/ftmac.c [__GNUC__]: Define OS_INLINE.
|
||||
* builds/unix/configure.ac: Don't try to remove `-ansi' compilation
|
||||
switch on the Mac.
|
||||
|
||||
* builds/unix/ltmain.sh: Regenerated with `libtoolize --force
|
||||
--copy' from libtool 1.5.6.
|
||||
* builds/unix/aclocal.m4: Regenerated with `aclocal -I .' from
|
||||
automake 1.8a.
|
||||
* builds/unix/configure: Regenerated with autoconf 2.59a.
|
||||
|
||||
2004-04-13 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
* include/freetype/config/ftconfig.h: Use CHAR_BIT to define
|
||||
|
|
|
|||
|
|
@ -632,7 +632,7 @@ AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
|
|||
AC_MSG_CHECKING([the maximum length of command line arguments])
|
||||
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
||||
i=0
|
||||
testring="ABCD"
|
||||
teststring="ABCD"
|
||||
|
||||
case $build_os in
|
||||
msdosdjgpp*)
|
||||
|
|
@ -671,16 +671,16 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
|||
# If test is not a shell built-in, we'll probably end up computing a
|
||||
# maximum length that is only half of the actual maximum length, but
|
||||
# we can't tell.
|
||||
while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
|
||||
= "XX$testring") >/dev/null 2>&1 &&
|
||||
new_result=`expr "X$testring" : ".*" 2>&1` &&
|
||||
while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
|
||||
= "XX$teststring") >/dev/null 2>&1 &&
|
||||
new_result=`expr "X$teststring" : ".*" 2>&1` &&
|
||||
lt_cv_sys_max_cmd_len=$new_result &&
|
||||
test $i != 17 # 1/2 MB should be enough
|
||||
do
|
||||
i=`expr $i + 1`
|
||||
testring=$testring$testring
|
||||
teststring=$teststring$teststring
|
||||
done
|
||||
testring=
|
||||
teststring=
|
||||
# Add a significant safety factor because C++ compilers can tack on massive
|
||||
# amounts of additional arguments before passing them to the linker.
|
||||
# It appears as though 1/2 is a usable value.
|
||||
|
|
@ -1076,7 +1076,7 @@ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
|
|||
library_names_spec=
|
||||
libname_spec='lib$name'
|
||||
soname_spec=
|
||||
shrext=".so"
|
||||
shrext_cmds=".so"
|
||||
postinstall_cmds=
|
||||
postuninstall_cmds=
|
||||
finish_cmds=
|
||||
|
|
@ -1189,7 +1189,7 @@ bsdi4*)
|
|||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
|
|
@ -1254,7 +1254,7 @@ darwin* | rhapsody*)
|
|||
soname_spec='${libname}${release}${major}$shared_ext'
|
||||
shlibpath_overrides_runpath=yes
|
||||
shlibpath_var=DYLD_LIBRARY_PATH
|
||||
shrext='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
||||
if test "$GCC" = yes; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
|
||||
|
|
@ -1337,7 +1337,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
need_version=no
|
||||
case "$host_cpu" in
|
||||
ia64*)
|
||||
shrext='.so'
|
||||
shrext_cmds='.so'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.so"
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
|
|
@ -1352,7 +1352,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
hppa*64*)
|
||||
shrext='.sl'
|
||||
shrext_cmds='.sl'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
|
||||
|
|
@ -1363,7 +1363,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
*)
|
||||
shrext='.sl'
|
||||
shrext_cmds='.sl'
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=SHLIB_PATH
|
||||
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
|
||||
|
|
@ -1434,8 +1434,8 @@ linux*)
|
|||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
|
||||
lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
|
|
@ -1517,7 +1517,7 @@ openbsd*)
|
|||
|
||||
os2*)
|
||||
libname_spec='$name'
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_lib_prefix=no
|
||||
library_names_spec='$libname${shared_ext} $libname.a'
|
||||
dynamic_linker='OS/2 ld.exe'
|
||||
|
|
@ -2108,14 +2108,14 @@ bsdi4*)
|
|||
;;
|
||||
|
||||
cygwin*)
|
||||
# win32_libid is a shell function defined in ltmain.sh
|
||||
# func_win32_libid is a shell function defined in ltmain.sh
|
||||
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
||||
lt_cv_file_magic_cmd='win32_libid'
|
||||
lt_cv_file_magic_cmd='func_win32_libid'
|
||||
;;
|
||||
|
||||
mingw* | pw32*)
|
||||
# Base MSYS/MinGW do not provide the 'file' command needed by
|
||||
# win32_libid shell function, so use a weaker test based on 'objdump'.
|
||||
# func_win32_libid shell function, so use a weaker test based on 'objdump'.
|
||||
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
|
||||
lt_cv_file_magic_cmd='$OBJDUMP -f'
|
||||
;;
|
||||
|
|
@ -2535,7 +2535,7 @@ aix3*)
|
|||
fi
|
||||
;;
|
||||
|
||||
aix4*)
|
||||
aix4* | aix5*)
|
||||
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
|
||||
test "$enable_shared" = yes && enable_static=no
|
||||
fi
|
||||
|
|
@ -2983,7 +2983,7 @@ case $host_os in
|
|||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
# dependencies.
|
||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
;;
|
||||
*)
|
||||
if test "$GXX" = yes; then
|
||||
|
|
@ -3686,7 +3686,7 @@ aix3*)
|
|||
postinstall_cmds='$RANLIB $lib'
|
||||
fi
|
||||
;;
|
||||
aix4*)
|
||||
aix4* | aix5*)
|
||||
test "$enable_shared" = yes && enable_static=no
|
||||
;;
|
||||
esac
|
||||
|
|
@ -4041,7 +4041,7 @@ objext="$ac_objext"
|
|||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
shrext='$shrext'
|
||||
shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
|
|
@ -5149,7 +5149,7 @@ EOF
|
|||
;;
|
||||
|
||||
linux*)
|
||||
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
|
||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
|
||||
supports_anon_versioning=no
|
||||
|
|
@ -5349,7 +5349,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
# Tell ltmain to make .lib files, not .a files.
|
||||
libext=lib
|
||||
# Tell ltmain to make .dll files, not .so files.
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
# FIXME: Setting linknames here is a bad hack.
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
|
||||
# The linker will automatically build a .lib file if we build a DLL.
|
||||
|
|
|
|||
|
|
@ -5661,7 +5661,6 @@ if test "${with_old_mac_fonts+set}" = set; then
|
|||
|
||||
fi;
|
||||
if test x$with_old_mac_fonts = xyes; then
|
||||
XX_ANSICFLAGS="-pedantic"
|
||||
LDFLAGS="$LDFLAGS -Xlinker -framework -Xlinker CoreServices \
|
||||
-Xlinker -framework -Xlinker ApplicationServices"
|
||||
else
|
||||
|
|
@ -6019,14 +6018,14 @@ bsdi4*)
|
|||
;;
|
||||
|
||||
cygwin*)
|
||||
# win32_libid is a shell function defined in ltmain.sh
|
||||
# func_win32_libid is a shell function defined in ltmain.sh
|
||||
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
||||
lt_cv_file_magic_cmd='win32_libid'
|
||||
lt_cv_file_magic_cmd='func_win32_libid'
|
||||
;;
|
||||
|
||||
mingw* | pw32*)
|
||||
# Base MSYS/MinGW do not provide the 'file' command needed by
|
||||
# win32_libid shell function, so use a weaker test based on 'objdump'.
|
||||
# func_win32_libid shell function, so use a weaker test based on 'objdump'.
|
||||
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
|
||||
lt_cv_file_magic_cmd='$OBJDUMP -f'
|
||||
;;
|
||||
|
|
@ -6213,7 +6212,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 6216 "configure"' > conftest.$ac_ext
|
||||
echo '#line 6215 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -7226,7 +7225,7 @@ fi
|
|||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:7229:" \
|
||||
echo "$as_me:7228:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
|
|
@ -7381,7 +7380,7 @@ if test "${lt_cv_sys_max_cmd_len+set}" = set; then
|
|||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
i=0
|
||||
testring="ABCD"
|
||||
teststring="ABCD"
|
||||
|
||||
case $build_os in
|
||||
msdosdjgpp*)
|
||||
|
|
@ -7420,16 +7419,16 @@ else
|
|||
# If test is not a shell built-in, we'll probably end up computing a
|
||||
# maximum length that is only half of the actual maximum length, but
|
||||
# we can't tell.
|
||||
while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
|
||||
= "XX$testring") >/dev/null 2>&1 &&
|
||||
new_result=`expr "X$testring" : ".*" 2>&1` &&
|
||||
while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
|
||||
= "XX$teststring") >/dev/null 2>&1 &&
|
||||
new_result=`expr "X$teststring" : ".*" 2>&1` &&
|
||||
lt_cv_sys_max_cmd_len=$new_result &&
|
||||
test $i != 17 # 1/2 MB should be enough
|
||||
do
|
||||
i=`expr $i + 1`
|
||||
testring=$testring$testring
|
||||
teststring=$teststring$teststring
|
||||
done
|
||||
testring=
|
||||
teststring=
|
||||
# Add a significant safety factor because C++ compilers can tack on massive
|
||||
# amounts of additional arguments before passing them to the linker.
|
||||
# It appears as though 1/2 is a usable value.
|
||||
|
|
@ -8293,11 +8292,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:8296: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8295: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8300: \$? = $ac_status" >&5
|
||||
echo "$as_me:8299: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -8526,11 +8525,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:8529: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8528: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8533: \$? = $ac_status" >&5
|
||||
echo "$as_me:8532: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -8586,11 +8585,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:8589: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8588: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:8593: \$? = $ac_status" >&5
|
||||
echo "$as_me:8592: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -8802,7 +8801,7 @@ EOF
|
|||
;;
|
||||
|
||||
linux*)
|
||||
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
|
||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
archive_cmds="$tmp_archive_cmds"
|
||||
supports_anon_versioning=no
|
||||
|
|
@ -9104,7 +9103,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
# Tell ltmain to make .lib files, not .a files.
|
||||
libext=lib
|
||||
# Tell ltmain to make .dll files, not .so files.
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
# FIXME: Setting linknames here is a bad hack.
|
||||
archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
|
||||
# The linker will automatically build a .lib file if we build a DLL.
|
||||
|
|
@ -9560,7 +9559,7 @@ echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
|
|||
library_names_spec=
|
||||
libname_spec='lib$name'
|
||||
soname_spec=
|
||||
shrext=".so"
|
||||
shrext_cmds=".so"
|
||||
postinstall_cmds=
|
||||
postuninstall_cmds=
|
||||
finish_cmds=
|
||||
|
|
@ -9673,7 +9672,7 @@ bsdi4*)
|
|||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
|
|
@ -9738,7 +9737,7 @@ darwin* | rhapsody*)
|
|||
soname_spec='${libname}${release}${major}$shared_ext'
|
||||
shlibpath_overrides_runpath=yes
|
||||
shlibpath_var=DYLD_LIBRARY_PATH
|
||||
shrext='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
||||
if test "$GCC" = yes; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
|
||||
|
|
@ -9821,7 +9820,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
need_version=no
|
||||
case "$host_cpu" in
|
||||
ia64*)
|
||||
shrext='.so'
|
||||
shrext_cmds='.so'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.so"
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
|
|
@ -9836,7 +9835,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
hppa*64*)
|
||||
shrext='.sl'
|
||||
shrext_cmds='.sl'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
|
||||
|
|
@ -9847,7 +9846,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
*)
|
||||
shrext='.sl'
|
||||
shrext_cmds='.sl'
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=SHLIB_PATH
|
||||
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
|
||||
|
|
@ -9918,8 +9917,8 @@ linux*)
|
|||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
|
||||
lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
|
|
@ -10001,7 +10000,7 @@ openbsd*)
|
|||
|
||||
os2*)
|
||||
libname_spec='$name'
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_lib_prefix=no
|
||||
library_names_spec='$libname${shared_ext} $libname.a'
|
||||
dynamic_linker='OS/2 ld.exe'
|
||||
|
|
@ -10770,7 +10769,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10773 "configure"
|
||||
#line 10772 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -10868,7 +10867,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10871 "configure"
|
||||
#line 10870 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -10993,7 +10992,7 @@ aix3*)
|
|||
fi
|
||||
;;
|
||||
|
||||
aix4*)
|
||||
aix4* | aix5*)
|
||||
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
|
||||
test "$enable_shared" = yes && enable_static=no
|
||||
fi
|
||||
|
|
@ -11269,7 +11268,7 @@ objext="$ac_objext"
|
|||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
shrext='$shrext'
|
||||
shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
|
|
@ -12184,7 +12183,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
# dependencies.
|
||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
;;
|
||||
*)
|
||||
if test "$GXX" = yes; then
|
||||
|
|
@ -13047,11 +13046,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13050: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13049: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13054: \$? = $ac_status" >&5
|
||||
echo "$as_me:13053: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -13107,11 +13106,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13110: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13109: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13114: \$? = $ac_status" >&5
|
||||
echo "$as_me:13113: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -13258,7 +13257,7 @@ echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
|
|||
library_names_spec=
|
||||
libname_spec='lib$name'
|
||||
soname_spec=
|
||||
shrext=".so"
|
||||
shrext_cmds=".so"
|
||||
postinstall_cmds=
|
||||
postuninstall_cmds=
|
||||
finish_cmds=
|
||||
|
|
@ -13371,7 +13370,7 @@ bsdi4*)
|
|||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
|
|
@ -13436,7 +13435,7 @@ darwin* | rhapsody*)
|
|||
soname_spec='${libname}${release}${major}$shared_ext'
|
||||
shlibpath_overrides_runpath=yes
|
||||
shlibpath_var=DYLD_LIBRARY_PATH
|
||||
shrext='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
||||
if test "$GCC" = yes; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
|
||||
|
|
@ -13519,7 +13518,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
need_version=no
|
||||
case "$host_cpu" in
|
||||
ia64*)
|
||||
shrext='.so'
|
||||
shrext_cmds='.so'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.so"
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
|
|
@ -13534,7 +13533,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
hppa*64*)
|
||||
shrext='.sl'
|
||||
shrext_cmds='.sl'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
|
||||
|
|
@ -13545,7 +13544,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
*)
|
||||
shrext='.sl'
|
||||
shrext_cmds='.sl'
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=SHLIB_PATH
|
||||
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
|
||||
|
|
@ -13616,8 +13615,8 @@ linux*)
|
|||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
|
||||
lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
|
|
@ -13699,7 +13698,7 @@ openbsd*)
|
|||
|
||||
os2*)
|
||||
libname_spec='$name'
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_lib_prefix=no
|
||||
library_names_spec='$libname${shared_ext} $libname.a'
|
||||
dynamic_linker='OS/2 ld.exe'
|
||||
|
|
@ -14468,7 +14467,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14471 "configure"
|
||||
#line 14470 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -14566,7 +14565,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14569 "configure"
|
||||
#line 14568 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -14845,7 +14844,7 @@ objext="$ac_objext"
|
|||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
shrext='$shrext'
|
||||
shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
|
|
@ -15167,7 +15166,7 @@ aix3*)
|
|||
postinstall_cmds='$RANLIB $lib'
|
||||
fi
|
||||
;;
|
||||
aix4*)
|
||||
aix4* | aix5*)
|
||||
test "$enable_shared" = yes && enable_static=no
|
||||
;;
|
||||
esac
|
||||
|
|
@ -15393,11 +15392,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15396: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15395: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15400: \$? = $ac_status" >&5
|
||||
echo "$as_me:15399: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -15453,11 +15452,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15456: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15455: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15460: \$? = $ac_status" >&5
|
||||
echo "$as_me:15459: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -15669,7 +15668,7 @@ EOF
|
|||
;;
|
||||
|
||||
linux*)
|
||||
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
|
||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
archive_cmds_F77="$tmp_archive_cmds"
|
||||
supports_anon_versioning=no
|
||||
|
|
@ -15951,7 +15950,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
# Tell ltmain to make .lib files, not .a files.
|
||||
libext=lib
|
||||
# Tell ltmain to make .dll files, not .so files.
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
# FIXME: Setting linknames here is a bad hack.
|
||||
archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
|
||||
# The linker will automatically build a .lib file if we build a DLL.
|
||||
|
|
@ -16407,7 +16406,7 @@ echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
|
|||
library_names_spec=
|
||||
libname_spec='lib$name'
|
||||
soname_spec=
|
||||
shrext=".so"
|
||||
shrext_cmds=".so"
|
||||
postinstall_cmds=
|
||||
postuninstall_cmds=
|
||||
finish_cmds=
|
||||
|
|
@ -16520,7 +16519,7 @@ bsdi4*)
|
|||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
|
|
@ -16585,7 +16584,7 @@ darwin* | rhapsody*)
|
|||
soname_spec='${libname}${release}${major}$shared_ext'
|
||||
shlibpath_overrides_runpath=yes
|
||||
shlibpath_var=DYLD_LIBRARY_PATH
|
||||
shrext='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
||||
if test "$GCC" = yes; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
|
||||
|
|
@ -16668,7 +16667,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
need_version=no
|
||||
case "$host_cpu" in
|
||||
ia64*)
|
||||
shrext='.so'
|
||||
shrext_cmds='.so'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.so"
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
|
|
@ -16683,7 +16682,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
hppa*64*)
|
||||
shrext='.sl'
|
||||
shrext_cmds='.sl'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
|
||||
|
|
@ -16694,7 +16693,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
*)
|
||||
shrext='.sl'
|
||||
shrext_cmds='.sl'
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=SHLIB_PATH
|
||||
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
|
||||
|
|
@ -16765,8 +16764,8 @@ linux*)
|
|||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
|
||||
lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
|
|
@ -16848,7 +16847,7 @@ openbsd*)
|
|||
|
||||
os2*)
|
||||
libname_spec='$name'
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_lib_prefix=no
|
||||
library_names_spec='$libname${shared_ext} $libname.a'
|
||||
dynamic_linker='OS/2 ld.exe'
|
||||
|
|
@ -17189,7 +17188,7 @@ objext="$ac_objext"
|
|||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
shrext='$shrext'
|
||||
shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
|
|
@ -17486,11 +17485,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17489: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17488: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:17493: \$? = $ac_status" >&5
|
||||
echo "$as_me:17492: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -17719,11 +17718,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17722: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17721: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:17726: \$? = $ac_status" >&5
|
||||
echo "$as_me:17725: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -17779,11 +17778,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17782: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17781: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:17786: \$? = $ac_status" >&5
|
||||
echo "$as_me:17785: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -17995,7 +17994,7 @@ EOF
|
|||
;;
|
||||
|
||||
linux*)
|
||||
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
|
||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
archive_cmds_GCJ="$tmp_archive_cmds"
|
||||
supports_anon_versioning=no
|
||||
|
|
@ -18297,7 +18296,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
# Tell ltmain to make .lib files, not .a files.
|
||||
libext=lib
|
||||
# Tell ltmain to make .dll files, not .so files.
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
# FIXME: Setting linknames here is a bad hack.
|
||||
archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
|
||||
# The linker will automatically build a .lib file if we build a DLL.
|
||||
|
|
@ -18753,7 +18752,7 @@ echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
|
|||
library_names_spec=
|
||||
libname_spec='lib$name'
|
||||
soname_spec=
|
||||
shrext=".so"
|
||||
shrext_cmds=".so"
|
||||
postinstall_cmds=
|
||||
postuninstall_cmds=
|
||||
finish_cmds=
|
||||
|
|
@ -18866,7 +18865,7 @@ bsdi4*)
|
|||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
|
|
@ -18931,7 +18930,7 @@ darwin* | rhapsody*)
|
|||
soname_spec='${libname}${release}${major}$shared_ext'
|
||||
shlibpath_overrides_runpath=yes
|
||||
shlibpath_var=DYLD_LIBRARY_PATH
|
||||
shrext='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
||||
if test "$GCC" = yes; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
|
||||
|
|
@ -19014,7 +19013,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
need_version=no
|
||||
case "$host_cpu" in
|
||||
ia64*)
|
||||
shrext='.so'
|
||||
shrext_cmds='.so'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.so"
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
|
|
@ -19029,7 +19028,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
hppa*64*)
|
||||
shrext='.sl'
|
||||
shrext_cmds='.sl'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
|
||||
|
|
@ -19040,7 +19039,7 @@ hpux9* | hpux10* | hpux11*)
|
|||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
*)
|
||||
shrext='.sl'
|
||||
shrext_cmds='.sl'
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=SHLIB_PATH
|
||||
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
|
||||
|
|
@ -19111,8 +19110,8 @@ linux*)
|
|||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
|
||||
lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
|
|
@ -19194,7 +19193,7 @@ openbsd*)
|
|||
|
||||
os2*)
|
||||
libname_spec='$name'
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_lib_prefix=no
|
||||
library_names_spec='$libname${shared_ext} $libname.a'
|
||||
dynamic_linker='OS/2 ld.exe'
|
||||
|
|
@ -19963,7 +19962,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19966 "configure"
|
||||
#line 19965 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -20061,7 +20060,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 20064 "configure"
|
||||
#line 20063 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -20340,7 +20339,7 @@ objext="$ac_objext"
|
|||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
shrext='$shrext'
|
||||
shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
|
|
@ -20784,7 +20783,7 @@ objext="$ac_objext"
|
|||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
shrext='$shrext'
|
||||
shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
|
|
|
|||
|
|
@ -131,7 +131,6 @@ AC_ARG_WITH([old-mac-fonts],
|
|||
AS_HELP_STRING([--with-old-mac-fonts],
|
||||
[allow Mac resource-based fonts to be used]))
|
||||
if test x$with_old_mac_fonts = xyes; then
|
||||
XX_ANSICFLAGS="-pedantic"
|
||||
LDFLAGS="$LDFLAGS -Xlinker -framework -Xlinker CoreServices \
|
||||
-Xlinker -framework -Xlinker ApplicationServices"
|
||||
else
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -66,6 +66,10 @@
|
|||
#ifdef __GNUC__
|
||||
#include "../truetype/ttobjs.h"
|
||||
#include "../type1/t1objs.h"
|
||||
/* This is for Mac OS X. Without redefinition, OS_INLINE */
|
||||
/* expands to `static inline' which doesn't survive the */
|
||||
/* -ansi compilation flag of GCC. */
|
||||
#define OS_INLINE static __inline__
|
||||
#include <Carbon/Carbon.h>
|
||||
#else
|
||||
#include "truetype/ttobjs.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue