*** empty log message ***
This commit is contained in:
parent
010cb0b768
commit
9b47725fa1
54
aclocal.m4
vendored
54
aclocal.m4
vendored
@ -14,7 +14,7 @@
|
||||
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
||||
|
||||
# serial 47 AC_PROG_LIBTOOL
|
||||
# Debian $Rev: 192 $
|
||||
# Debian $Rev: 203 $
|
||||
|
||||
|
||||
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
|
||||
@ -633,7 +633,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*)
|
||||
@ -672,16 +672,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.
|
||||
@ -1077,7 +1077,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=
|
||||
@ -1190,7 +1190,7 @@ bsdi4*)
|
||||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
@ -1255,7 +1255,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"`
|
||||
@ -1338,7 +1338,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
|
||||
@ -1353,7 +1353,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
|
||||
@ -1364,7 +1364,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
|
||||
@ -1435,8 +1435,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
|
||||
@ -1518,7 +1518,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'
|
||||
@ -2109,14 +2109,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'
|
||||
;;
|
||||
@ -2527,7 +2527,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
|
||||
@ -2975,7 +2975,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
|
||||
@ -3678,7 +3678,7 @@ aix3*)
|
||||
postinstall_cmds='$RANLIB $lib'
|
||||
fi
|
||||
;;
|
||||
aix4*)
|
||||
aix4* | aix5*)
|
||||
test "$enable_shared" = yes && enable_static=no
|
||||
;;
|
||||
esac
|
||||
@ -4033,7 +4033,7 @@ objext="$ac_objext"
|
||||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
shrext='$shrext'
|
||||
shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
@ -4973,6 +4973,9 @@ ifelse([$1],[CXX],[
|
||||
cygwin* | mingw*)
|
||||
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
|
||||
;;
|
||||
linux*)
|
||||
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
|
||||
;;
|
||||
*)
|
||||
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
||||
;;
|
||||
@ -5141,7 +5144,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
|
||||
@ -5160,6 +5163,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
||||
else
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
|
||||
fi
|
||||
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
|
||||
else
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
fi
|
||||
@ -5341,7 +5345,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.
|
||||
|
172
configure
vendored
172
configure
vendored
@ -3537,14 +3537,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'
|
||||
;;
|
||||
@ -5440,7 +5440,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*)
|
||||
@ -5479,16 +5479,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.
|
||||
@ -6828,7 +6828,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
|
||||
@ -6847,6 +6847,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
||||
else
|
||||
archive_expsym_cmds="$tmp_archive_cmds"
|
||||
fi
|
||||
link_all_deplibs=no
|
||||
else
|
||||
ld_shlibs=no
|
||||
fi
|
||||
@ -7128,7 +7129,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.
|
||||
@ -7584,7 +7585,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=
|
||||
@ -7697,7 +7698,7 @@ bsdi4*)
|
||||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
@ -7762,7 +7763,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"`
|
||||
@ -7845,7 +7846,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
|
||||
@ -7860,7 +7861,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
|
||||
@ -7871,7 +7872,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
|
||||
@ -7942,8 +7943,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
|
||||
@ -8025,7 +8026,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'
|
||||
@ -8787,7 +8788,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8790 "configure"
|
||||
#line 8791 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -8885,7 +8886,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8888 "configure"
|
||||
#line 8889 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -9010,7 +9011,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
|
||||
@ -9286,7 +9287,7 @@ objext="$ac_objext"
|
||||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
shrext='$shrext'
|
||||
shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
@ -10199,7 +10200,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
|
||||
@ -11062,11 +11063,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:11065: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11066: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:11069: \$? = $ac_status" >&5
|
||||
echo "$as_me:11070: \$? = $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
|
||||
@ -11122,11 +11123,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:11125: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11126: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:11129: \$? = $ac_status" >&5
|
||||
echo "$as_me:11130: \$? = $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
|
||||
@ -11192,6 +11193,9 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
|
||||
cygwin* | mingw*)
|
||||
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
|
||||
;;
|
||||
linux*)
|
||||
link_all_deplibs_CXX=no
|
||||
;;
|
||||
*)
|
||||
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
||||
;;
|
||||
@ -11273,7 +11277,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=
|
||||
@ -11386,7 +11390,7 @@ bsdi4*)
|
||||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
@ -11451,7 +11455,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"`
|
||||
@ -11534,7 +11538,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
|
||||
@ -11549,7 +11553,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
|
||||
@ -11560,7 +11564,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
|
||||
@ -11631,8 +11635,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
|
||||
@ -11714,7 +11718,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'
|
||||
@ -12476,7 +12480,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12479 "configure"
|
||||
#line 12483 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12574,7 +12578,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12577 "configure"
|
||||
#line 12581 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12853,7 +12857,7 @@ objext="$ac_objext"
|
||||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
shrext='$shrext'
|
||||
shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
@ -13175,7 +13179,7 @@ aix3*)
|
||||
postinstall_cmds='$RANLIB $lib'
|
||||
fi
|
||||
;;
|
||||
aix4*)
|
||||
aix4* | aix5*)
|
||||
test "$enable_shared" = yes && enable_static=no
|
||||
;;
|
||||
esac
|
||||
@ -13401,11 +13405,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:13404: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13408: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13408: \$? = $ac_status" >&5
|
||||
echo "$as_me:13412: \$? = $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
|
||||
@ -13461,11 +13465,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:13464: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13468: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13468: \$? = $ac_status" >&5
|
||||
echo "$as_me:13472: \$? = $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
|
||||
@ -13677,7 +13681,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
|
||||
@ -13696,6 +13700,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
||||
else
|
||||
archive_expsym_cmds_F77="$tmp_archive_cmds"
|
||||
fi
|
||||
link_all_deplibs_F77=no
|
||||
else
|
||||
ld_shlibs_F77=no
|
||||
fi
|
||||
@ -13957,7 +13962,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.
|
||||
@ -14413,7 +14418,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=
|
||||
@ -14526,7 +14531,7 @@ bsdi4*)
|
||||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
@ -14591,7 +14596,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"`
|
||||
@ -14674,7 +14679,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
|
||||
@ -14689,7 +14694,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
|
||||
@ -14700,7 +14705,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
|
||||
@ -14771,8 +14776,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
|
||||
@ -14854,7 +14859,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'
|
||||
@ -15195,7 +15200,7 @@ objext="$ac_objext"
|
||||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
shrext='$shrext'
|
||||
shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
@ -15493,11 +15498,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:15496: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15501: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15500: \$? = $ac_status" >&5
|
||||
echo "$as_me:15505: \$? = $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
|
||||
@ -15726,11 +15731,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:15729: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15734: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15733: \$? = $ac_status" >&5
|
||||
echo "$as_me:15738: \$? = $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
|
||||
@ -15786,11 +15791,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:15789: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15794: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15793: \$? = $ac_status" >&5
|
||||
echo "$as_me:15798: \$? = $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
|
||||
@ -16002,7 +16007,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
|
||||
@ -16021,6 +16026,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
||||
else
|
||||
archive_expsym_cmds_GCJ="$tmp_archive_cmds"
|
||||
fi
|
||||
link_all_deplibs_GCJ=no
|
||||
else
|
||||
ld_shlibs_GCJ=no
|
||||
fi
|
||||
@ -16302,7 +16308,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.
|
||||
@ -16758,7 +16764,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=
|
||||
@ -16871,7 +16877,7 @@ bsdi4*)
|
||||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
@ -16936,7 +16942,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"`
|
||||
@ -17019,7 +17025,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
|
||||
@ -17034,7 +17040,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
|
||||
@ -17045,7 +17051,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
|
||||
@ -17116,8 +17122,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
|
||||
@ -17199,7 +17205,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'
|
||||
@ -17961,7 +17967,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17964 "configure"
|
||||
#line 17970 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -18059,7 +18065,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18062 "configure"
|
||||
#line 18068 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -18338,7 +18344,7 @@ objext="$ac_objext"
|
||||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
shrext='$shrext'
|
||||
shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
@ -18783,7 +18789,7 @@ objext="$ac_objext"
|
||||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
shrext='$shrext'
|
||||
shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
@ -22730,8 +22736,6 @@ if test "$HAVE_ZLIB" = "yes" ; then
|
||||
fi
|
||||
|
||||
|
||||
HAVE_PIXARLOG=no
|
||||
|
||||
# Check whether --enable-pixarlog or --disable-pixarlog was given.
|
||||
if test "${enable_pixarlog+set}" = set; then
|
||||
enableval="$enable_pixarlog"
|
||||
@ -22742,6 +22746,8 @@ fi;
|
||||
|
||||
if test "$HAVE_ZLIB" = "yes" -a "$HAVE_PIXARLOG" = "yes" ; then
|
||||
CPPFLAGS="-DPIXARLOG_SUPPORT $CPPFLAGS"
|
||||
else
|
||||
HAVE_PIXARLOG=no
|
||||
fi
|
||||
|
||||
|
||||
@ -23009,8 +23015,6 @@ if test "$HAVE_JPEG" = "yes" ; then
|
||||
fi
|
||||
|
||||
|
||||
HAVE_OJPEG=no
|
||||
|
||||
# Check whether --enable-old-jpeg or --disable-old-jpeg was given.
|
||||
if test "${enable_old_jpeg+set}" = set; then
|
||||
enableval="$enable_old_jpeg"
|
||||
@ -23021,6 +23025,8 @@ fi;
|
||||
|
||||
if test "$HAVE_JPEG" = "yes" -a "$HAVE_OJPEG" = "yes" ; then
|
||||
CPPFLAGS="-DOJPEG_SUPPORT $CPPFLAGS"
|
||||
else
|
||||
HAVE_OJPEG=no
|
||||
fi
|
||||
|
||||
|
||||
|
10
configure.ac
10
configure.ac
@ -35,7 +35,7 @@ AC_CONFIG_SRCDIR(libtiff/config.h.in)
|
||||
AM_CONFIG_HEADER(libtiff/config.h)
|
||||
|
||||
dnl Versioning.
|
||||
dnl Don't fill the ALPHA_VERSION field if not applicable.
|
||||
dnl Don't fill the ALPHA_VERSION field, if not applicable.
|
||||
LIBTIFF_MAJOR_VERSION=3
|
||||
LIBTIFF_MINOR_VERSION=7
|
||||
LIBTIFF_MICRO_VERSION=0
|
||||
@ -214,12 +214,12 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl Check for Pixar log-format algorithm.
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
HAVE_PIXARLOG=no
|
||||
|
||||
AC_ARG_ENABLE(pixarlog, AS_HELP_STRING([--disable-pixarlog], [disable support for Pixar log-format algorithm (requires Zlib)]), [HAVE_PIXARLOG=no], [HAVE_PIXARLOG=yes])
|
||||
|
||||
if test "$HAVE_ZLIB" = "yes" -a "$HAVE_PIXARLOG" = "yes" ; then
|
||||
CPPFLAGS="-DPIXARLOG_SUPPORT $CPPFLAGS"
|
||||
else
|
||||
HAVE_PIXARLOG=no
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@ -265,12 +265,12 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl Check for Old JPEG.
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
HAVE_OJPEG=no
|
||||
|
||||
AC_ARG_ENABLE(old-jpeg, AS_HELP_STRING([--enable-old-jpeg], [enable support for Old JPEG compresson (read contrib/ojpeg/README first! Compilation fails with unpatched IJG JPEG library)]), [HAVE_OJPEG=yes], [HAVE_OJPEG=no])
|
||||
|
||||
if test "$HAVE_JPEG" = "yes" -a "$HAVE_OJPEG" = "yes" ; then
|
||||
CPPFLAGS="-DOJPEG_SUPPORT $CPPFLAGS"
|
||||
else
|
||||
HAVE_OJPEG=no
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
@ -1,5 +1,3 @@
|
||||
# $Id: Makefile.am,v 1.2 2004-04-08 14:30:18 dron Exp $
|
||||
#
|
||||
# Tag Image File Format (TIFF) Software
|
||||
#
|
||||
# Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org>
|
||||
@ -25,7 +23,7 @@
|
||||
|
||||
# Process this file with automake to produce Makefile.in.
|
||||
|
||||
noinst_LIBRARIES = libport.a
|
||||
libport_a_SOURCES =
|
||||
libport_a_LIBADD = @LIBOBJS@
|
||||
noinst_LTLIBRARIES = libport.la
|
||||
libport_la_SOURCES =
|
||||
libport_la_LIBADD = @LTLIBOBJS@
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Makefile.in generated by automake 1.8.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.8.5 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
@ -14,8 +14,6 @@
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
# $Id: Makefile.in,v 1.7 2004-04-26 08:36:41 dron Exp $
|
||||
#
|
||||
# Tag Image File Format (TIFF) Software
|
||||
#
|
||||
# Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org>
|
||||
@ -41,7 +39,7 @@
|
||||
|
||||
# Process this file with automake to produce Makefile.in.
|
||||
|
||||
SOURCES = $(libport_a_SOURCES)
|
||||
SOURCES = $(libport_la_SOURCES)
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
@ -68,23 +66,22 @@ subdir = port
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in getopt.c \
|
||||
strcasecmp.c strtoul.c
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
|
||||
$(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = $(top_builddir)/libtiff/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
ARFLAGS = cru
|
||||
LIBRARIES = $(noinst_LIBRARIES)
|
||||
libport_a_AR = $(AR) $(ARFLAGS)
|
||||
libport_a_DEPENDENCIES = @LIBOBJS@
|
||||
am_libport_a_OBJECTS =
|
||||
libport_a_OBJECTS = $(am_libport_a_OBJECTS)
|
||||
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
||||
libport_la_DEPENDENCIES = @LTLIBOBJS@
|
||||
am_libport_la_OBJECTS =
|
||||
libport_la_OBJECTS = $(am_libport_la_OBJECTS)
|
||||
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/libtiff
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/getopt.Po $(DEPDIR)/strcasecmp.Po \
|
||||
@AMDEP_TRUE@ $(DEPDIR)/strtoul.Po
|
||||
@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/getopt.Plo $(DEPDIR)/strcasecmp.Plo \
|
||||
@AMDEP_TRUE@ $(DEPDIR)/strtoul.Plo
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
|
||||
@ -93,8 +90,8 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
|
||||
CCLD = $(CC)
|
||||
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
SOURCES = $(libport_a_SOURCES)
|
||||
DIST_SOURCES = $(libport_a_SOURCES)
|
||||
SOURCES = $(libport_la_SOURCES)
|
||||
DIST_SOURCES = $(libport_la_SOURCES)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@ -140,6 +137,7 @@ LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
|
||||
LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
|
||||
LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
|
||||
LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
|
||||
LIBTIFF_RELEASE_DATE = @LIBTIFF_RELEASE_DATE@
|
||||
LIBTIFF_VERSION = @LIBTIFF_VERSION@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LN_S = @LN_S@
|
||||
@ -204,9 +202,9 @@ target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
noinst_LIBRARIES = libport.a
|
||||
libport_a_SOURCES =
|
||||
libport_a_LIBADD = @LIBOBJS@
|
||||
noinst_LTLIBRARIES = libport.la
|
||||
libport_la_SOURCES =
|
||||
libport_la_LIBADD = @LTLIBOBJS@
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@ -241,12 +239,16 @@ $(top_srcdir)/configure: $(am__configure_deps)
|
||||
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
|
||||
clean-noinstLIBRARIES:
|
||||
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
|
||||
libport.a: $(libport_a_OBJECTS) $(libport_a_DEPENDENCIES)
|
||||
-rm -f libport.a
|
||||
$(libport_a_AR) libport.a $(libport_a_OBJECTS) $(libport_a_LIBADD)
|
||||
$(RANLIB) libport.a
|
||||
clean-noinstLTLIBRARIES:
|
||||
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
||||
@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
|
||||
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
|
||||
test "$$dir" != "$$p" || dir=.; \
|
||||
echo "rm -f \"$${dir}/so_locations\""; \
|
||||
rm -f "$${dir}/so_locations"; \
|
||||
done
|
||||
libport.la: $(libport_la_OBJECTS) $(libport_la_DEPENDENCIES)
|
||||
$(LINK) $(libport_la_LDFLAGS) $(libport_la_OBJECTS) $(libport_la_LIBADD) $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@ -254,9 +256,9 @@ mostlyclean-compile:
|
||||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasecmp.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoul.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasecmp.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoul.Plo@am__quote@
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
||||
@ -312,9 +314,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
done | \
|
||||
$(AWK) ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
test -z "$(ETAGS_ARGS)$$tags$$unique" \
|
||||
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||
$$tags $$unique
|
||||
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
||||
test -n "$$unique" || unique=$$empty_fix; \
|
||||
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||
$$tags $$unique; \
|
||||
fi
|
||||
ctags: CTAGS
|
||||
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
$(TAGS_FILES) $(LISP)
|
||||
@ -367,7 +371,7 @@ distdir: $(DISTFILES)
|
||||
done
|
||||
check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile $(LIBRARIES)
|
||||
all-am: Makefile $(LTLIBRARIES)
|
||||
installdirs:
|
||||
install: install-am
|
||||
install-exec: install-exec-am
|
||||
@ -395,7 +399,7 @@ maintainer-clean-generic:
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
|
||||
clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
|
||||
mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
@ -445,7 +449,7 @@ ps-am:
|
||||
uninstall-am: uninstall-info-am
|
||||
|
||||
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
|
||||
clean-libtool clean-noinstLIBRARIES ctags distclean \
|
||||
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
|
||||
distclean-compile distclean-generic distclean-libtool \
|
||||
distclean-tags distdir dvi dvi-am html html-am info info-am \
|
||||
install install-am install-data install-data-am install-exec \
|
||||
|
Loading…
Reference in New Issue
Block a user