Move to new modular capi20 implementation
step1 Signed-off-by: Karsten Keil <kkeil@linux-pingi.de>
This commit is contained in:
Karsten Keil
parent
b68ffee4ba
commit
ba6c742ee2
|
|
@ -270,7 +270,7 @@ uninstall-libLIBRARIES:
|
|||
|
||||
clean-libLIBRARIES:
|
||||
-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
|
||||
libcapi20dyn.a: $(libcapi20dyn_a_OBJECTS) $(libcapi20dyn_a_DEPENDENCIES)
|
||||
libcapi20dyn.a: $(libcapi20dyn_a_OBJECTS) $(libcapi20dyn_a_DEPENDENCIES)
|
||||
-rm -f libcapi20dyn.a
|
||||
$(libcapi20dyn_a_AR) libcapi20dyn.a $(libcapi20dyn_a_OBJECTS) $(libcapi20dyn_a_LIBADD)
|
||||
$(RANLIB) libcapi20dyn.a
|
||||
|
|
@ -301,7 +301,7 @@ clean-libLTLIBRARIES:
|
|||
echo "rm -f \"$${dir}/so_locations\""; \
|
||||
rm -f "$${dir}/so_locations"; \
|
||||
done
|
||||
libcapi20.la: $(libcapi20_la_OBJECTS) $(libcapi20_la_DEPENDENCIES)
|
||||
libcapi20.la: $(libcapi20_la_OBJECTS) $(libcapi20_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(libdir) $(libcapi20_la_LDFLAGS) $(libcapi20_la_OBJECTS) $(libcapi20_la_LIBADD) $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
|
|
@ -879,7 +879,7 @@ else
|
|||
if test "x$lt_cv_dlopen_self" = xyes; then
|
||||
LDFLAGS="$LDFLAGS $link_static_flag"
|
||||
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
|
||||
lt_cv_dlopen_self_static, [dnl
|
||||
lt_cv_dlopen_self_static, [dnl
|
||||
_LT_AC_TRY_DLOPEN_SELF(
|
||||
lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
|
||||
lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
|
||||
|
|
@ -2549,7 +2549,7 @@ aix4*)
|
|||
;;
|
||||
*) # Darwin 1.3 on
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[[012]])
|
||||
|
|
@ -2886,7 +2886,7 @@ case $host_os in
|
|||
;;
|
||||
*) # Darwin 1.3 on
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[[012]])
|
||||
|
|
@ -5189,9 +5189,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
||||
# ancient GNU ld didn't support --whole-archive et. al.
|
||||
if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
else
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
|
||||
fi
|
||||
fi
|
||||
else
|
||||
|
|
@ -5233,10 +5233,10 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
# need to do runtime linking.
|
||||
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
|
||||
for ld_flag in $LDFLAGS; do
|
||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
||||
aix_use_runtimelinking=yes
|
||||
break
|
||||
fi
|
||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
||||
aix_use_runtimelinking=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
esac
|
||||
|
||||
|
|
@ -5261,34 +5261,34 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
# below for broken collect2 doesn't work under 4.3+
|
||||
collect2name=`${CC} -print-prog-name=collect2`
|
||||
if test -f "$collect2name" && \
|
||||
strings "$collect2name" | grep resolve_lib_name >/dev/null
|
||||
strings "$collect2name" | grep resolve_lib_name >/dev/null
|
||||
then
|
||||
# We have reworked collect2
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
||||
# We have reworked collect2
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
||||
else
|
||||
# We have old collect2
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
|
||||
# It fails to find uninstalled libraries when the uninstalled
|
||||
# path is not listed in the libpath. Setting hardcode_minus_L
|
||||
# to unsupported forces relinking
|
||||
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
|
||||
# We have old collect2
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
|
||||
# It fails to find uninstalled libraries when the uninstalled
|
||||
# path is not listed in the libpath. Setting hardcode_minus_L
|
||||
# to unsupported forces relinking
|
||||
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
|
||||
fi
|
||||
esac
|
||||
shared_flag='-shared'
|
||||
else
|
||||
# not using gcc
|
||||
if test "$host_cpu" = ia64; then
|
||||
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
|
||||
# chokes on -Wl,-G. The following line is correct:
|
||||
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
|
||||
# chokes on -Wl,-G. The following line is correct:
|
||||
shared_flag='-G'
|
||||
else
|
||||
if test "$aix_use_runtimelinking" = yes; then
|
||||
if test "$aix_use_runtimelinking" = yes; then
|
||||
shared_flag='${wl}-G'
|
||||
else
|
||||
shared_flag='${wl}-bM:SRE'
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -5369,7 +5369,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
;;
|
||||
*) # Darwin 1.3 on
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[[012]])
|
||||
|
|
@ -5382,14 +5382,14 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
fi
|
||||
;;
|
||||
esac
|
||||
lt_int_apple_cc_single_mod=no
|
||||
output_verbose_link_cmd='echo'
|
||||
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
|
||||
lt_int_apple_cc_single_mod=yes
|
||||
fi
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
else
|
||||
lt_int_apple_cc_single_mod=no
|
||||
output_verbose_link_cmd='echo'
|
||||
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
|
||||
lt_int_apple_cc_single_mod=yes
|
||||
fi
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
else
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
fi
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
||||
|
|
@ -5621,7 +5621,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
else
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
fi
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
||||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
||||
|
|
@ -5711,7 +5711,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
# object files and a static libstdc++, better avoid it by now
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
||||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
||||
runpath_var='LD_RUN_PATH'
|
||||
|
|
@ -6808,4 +6808,3 @@ if test "$cross_compiling" != no; then
|
|||
fi
|
||||
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
|
||||
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* $Id: capi20.c,v 1.28 2006/08/08 13:23:29 keil Exp $
|
||||
*
|
||||
*
|
||||
* $Log: capi20.c,v $
|
||||
* Revision 1.28 2006/08/08 13:23:29 keil
|
||||
* some endian fixes for BIGENDIAN systems
|
||||
|
|
@ -331,7 +331,7 @@ static void cleanup_buffers_for_ncci(unsigned char applid, unsigned ncci)
|
|||
{
|
||||
struct applinfo *ap;
|
||||
unsigned i;
|
||||
|
||||
|
||||
assert(validapplid(applid));
|
||||
ap = applinfo[applid];
|
||||
|
||||
|
|
@ -348,7 +348,7 @@ static void cleanup_buffers_for_plci(unsigned char applid, unsigned plci)
|
|||
{
|
||||
struct applinfo *ap;
|
||||
unsigned i;
|
||||
|
||||
|
||||
assert(validapplid(applid));
|
||||
ap = applinfo[applid];
|
||||
|
||||
|
|
@ -362,7 +362,7 @@ static void cleanup_buffers_for_plci(unsigned char applid, unsigned plci)
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
/*
|
||||
* CAPI2.0 functions
|
||||
*/
|
||||
|
||||
|
|
@ -504,11 +504,11 @@ capi20_put_message (unsigned ApplID, unsigned char *Msg)
|
|||
_cdword data;
|
||||
data = CAPIMSG_U32(Msg, 12);
|
||||
if (data != 0)
|
||||
dataptr = (void *)(unsigned long)data;
|
||||
dataptr = (void *)(unsigned long)data;
|
||||
else
|
||||
dataptr = Msg + len; /* Assume data after message */
|
||||
}
|
||||
if (len + datalen > SEND_BUFSIZ)
|
||||
if (len + datalen > SEND_BUFSIZ)
|
||||
return CapiMsgOSResourceErr;
|
||||
memcpy(sndbuf+len, dataptr, datalen);
|
||||
len += datalen;
|
||||
|
|
@ -519,7 +519,7 @@ capi20_put_message (unsigned ApplID, unsigned char *Msg)
|
|||
}
|
||||
|
||||
if (cmd == CAPI_DISCONNECT_B3 && subcmd == CAPI_RESP)
|
||||
cleanup_buffers_for_ncci(ApplID, CAPIMSG_U32(sndbuf, 8));
|
||||
cleanup_buffers_for_ncci(ApplID, CAPIMSG_U32(sndbuf, 8));
|
||||
|
||||
ret = CapiNoError;
|
||||
errno = 0;
|
||||
|
|
@ -610,7 +610,7 @@ capi20_get_message (unsigned ApplID, unsigned char **Buf)
|
|||
return_buffer(ApplID, offset);
|
||||
if ( CAPIMSG_COMMAND(rcvbuf) == CAPI_DISCONNECT
|
||||
&& CAPIMSG_SUBCOMMAND(rcvbuf) == CAPI_IND)
|
||||
cleanup_buffers_for_plci(ApplID, CAPIMSG_U32(rcvbuf, 8));
|
||||
cleanup_buffers_for_plci(ApplID, CAPIMSG_U32(rcvbuf, 8));
|
||||
return CapiNoError;
|
||||
}
|
||||
|
||||
|
|
@ -658,7 +658,7 @@ capi20_get_version(unsigned Ctrl, unsigned char *Buf)
|
|||
return Buf;
|
||||
}
|
||||
|
||||
unsigned char *
|
||||
unsigned char *
|
||||
capi20_get_serial_number(unsigned Ctrl, unsigned char *Buf)
|
||||
{
|
||||
if (capi20_isinstalled() != CapiNoError)
|
||||
|
|
@ -709,14 +709,14 @@ capi20_waitformessage(unsigned ApplID, struct timeval *TimeOut)
|
|||
|
||||
if(!validapplid(ApplID))
|
||||
return CapiIllAppNr;
|
||||
|
||||
|
||||
fd = applid2fd(ApplID);
|
||||
|
||||
FD_SET(fd, &rfds);
|
||||
|
||||
|
||||
if (select(fd + 1, &rfds, NULL, NULL, TimeOut) < 1)
|
||||
return CapiReceiveQueueEmpty;
|
||||
|
||||
|
||||
return CapiNoError;
|
||||
}
|
||||
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* $Id: capicmd.h,v 1.1 2000/05/18 15:02:26 calle Exp $
|
||||
*
|
||||
*
|
||||
* CAPI 2.0 Interface for Linux
|
||||
*
|
||||
*
|
||||
* Copyright 1997 by Carsten Paeth (calle@calle.in-berlin.de)
|
||||
*
|
||||
*
|
||||
* $Log: capicmd.h,v $
|
||||
* Revision 1.1 2000/05/18 15:02:26 calle
|
||||
* Updated _cmsg handling added new functions need by "capiconn".
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
* Revision 1.1 1997/01/31 10:32:20 calle
|
||||
* Initial revision
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
#ifndef __CAPICMD_H__
|
||||
#define __CAPICMD_H__
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* $Id: capidyn.c,v 1.4 2004/01/16 15:27:11 calle Exp $
|
||||
*
|
||||
*
|
||||
* $Log: capidyn.c,v $
|
||||
* Revision 1.4 2004/01/16 15:27:11 calle
|
||||
* remove several warnings.
|
||||
|
|
@ -118,7 +118,7 @@ capi20_get_version(unsigned Ctrl, unsigned char *Buf)
|
|||
static unsigned char *
|
||||
(*fptr_capi20_get_serial_number)(unsigned, unsigned char *);
|
||||
|
||||
unsigned char *
|
||||
unsigned char *
|
||||
capi20_get_serial_number(unsigned Ctrl, unsigned char *Buf)
|
||||
{
|
||||
if (loadlib() < 0)
|
||||
|
|
@ -219,7 +219,7 @@ typedef struct {
|
|||
_cdword Function;
|
||||
#ifndef CAPI_LIBRARY_V2
|
||||
_cstruct Globalconfiguration;
|
||||
#endif
|
||||
#endif
|
||||
_cstruct HLC;
|
||||
_cword Info;
|
||||
_cstruct InfoElement;
|
||||
|
|
@ -236,7 +236,7 @@ typedef struct {
|
|||
_cstruct Useruserdata;
|
||||
#ifndef CAPI_LIBRARY_V2
|
||||
_cstruct SendingComplete;
|
||||
#endif
|
||||
#endif
|
||||
unsigned char *Data;
|
||||
|
||||
/* intern */
|
||||
|
|
@ -380,7 +380,7 @@ char *capi_message2str(_cbyte * msg);
|
|||
#ifndef CAPI_LIBRARY_V2
|
||||
#define CONNECT_REQ_GLOBALCONFIGURATION(x) ((x)->Globalconfiguration)
|
||||
/* all layer parameter */
|
||||
#endif
|
||||
#endif
|
||||
#define CONNECT_REQ_BC(x) ((x)->BC)
|
||||
/* Bearer Capability */
|
||||
#define CONNECT_REQ_LLC(x) ((x)->LLC)
|
||||
|
|
@ -518,7 +518,7 @@ EOF
|
|||
else
|
||||
echo i586-dg-dgux${UNAME_RELEASE}
|
||||
fi
|
||||
exit 0 ;;
|
||||
exit 0 ;;
|
||||
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
|
||||
echo m88k-dolphin-sysv3
|
||||
exit 0 ;;
|
||||
|
|
@ -642,22 +642,22 @@ EOF
|
|||
long cpu = sysconf (_SC_CPU_VERSION);
|
||||
|
||||
switch (cpu)
|
||||
{
|
||||
case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
|
||||
case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
|
||||
case CPU_PA_RISC2_0:
|
||||
{
|
||||
case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
|
||||
case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
|
||||
case CPU_PA_RISC2_0:
|
||||
#if defined(_SC_KERNEL_BITS)
|
||||
switch (bits)
|
||||
{
|
||||
case 64: puts ("hppa2.0w"); break;
|
||||
case 32: puts ("hppa2.0n"); break;
|
||||
default: puts ("hppa2.0"); break;
|
||||
} break;
|
||||
switch (bits)
|
||||
{
|
||||
case 64: puts ("hppa2.0w"); break;
|
||||
case 32: puts ("hppa2.0n"); break;
|
||||
default: puts ("hppa2.0"); break;
|
||||
} break;
|
||||
#else /* !defined(_SC_KERNEL_BITS) */
|
||||
puts ("hppa2.0"); break;
|
||||
puts ("hppa2.0"); break;
|
||||
#endif
|
||||
default: puts ("hppa1.0"); break;
|
||||
}
|
||||
default: puts ("hppa1.0"); break;
|
||||
}
|
||||
exit (0);
|
||||
}
|
||||
EOF
|
||||
|
|
@ -939,7 +939,7 @@ EOF
|
|||
echo ${UNAME_MACHINE}-ibm-linux
|
||||
exit 0 ;;
|
||||
sh64*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-${VENDOR}-linux
|
||||
echo ${UNAME_MACHINE}-${VENDOR}-linux
|
||||
exit 0 ;;
|
||||
sh*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-${VENDOR}-linux
|
||||
|
|
@ -163,10 +163,10 @@ case $os in
|
|||
os=-chorusos
|
||||
basic_machine=$1
|
||||
;;
|
||||
-chorusrdb)
|
||||
os=-chorusrdb
|
||||
-chorusrdb)
|
||||
os=-chorusrdb
|
||||
basic_machine=$1
|
||||
;;
|
||||
;;
|
||||
-hiux*)
|
||||
os=-hiuxwe2
|
||||
;;
|
||||
|
|
@ -363,7 +363,7 @@ case $basic_machine in
|
|||
basic_machine=a29k-amd
|
||||
os=-udi
|
||||
;;
|
||||
abacus)
|
||||
abacus)
|
||||
basic_machine=abacus-unknown
|
||||
;;
|
||||
adobe68k)
|
||||
|
|
@ -70,9 +70,9 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|||
. : '\(.\)' 2>/dev/null ||
|
||||
echo X/"$0" |
|
||||
sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
|
||||
/^X\/\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\/\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
/^X\/\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\/\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
|
||||
|
||||
# PATH needs CR, and LINENO needs CR and PATH.
|
||||
|
|
@ -869,10 +869,10 @@ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|||
. : '\(.\)' 2>/dev/null ||
|
||||
echo X"$0" |
|
||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
srcdir=$ac_confdir
|
||||
if test ! -r $srcdir/$ac_unique_file; then
|
||||
srcdir=..
|
||||
|
|
@ -6887,9 +6887,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
export_dynamic_flag_spec='${wl}--export-dynamic'
|
||||
# ancient GNU ld didn't support --whole-archive et. al.
|
||||
if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
|
||||
whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
else
|
||||
whole_archive_flag_spec=
|
||||
whole_archive_flag_spec=
|
||||
fi
|
||||
fi
|
||||
else
|
||||
|
|
@ -6931,10 +6931,10 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
# need to do runtime linking.
|
||||
case $host_os in aix4.[23]|aix4.[23].*|aix5*)
|
||||
for ld_flag in $LDFLAGS; do
|
||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
||||
aix_use_runtimelinking=yes
|
||||
break
|
||||
fi
|
||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
||||
aix_use_runtimelinking=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
esac
|
||||
|
||||
|
|
@ -6959,34 +6959,34 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
# below for broken collect2 doesn't work under 4.3+
|
||||
collect2name=`${CC} -print-prog-name=collect2`
|
||||
if test -f "$collect2name" && \
|
||||
strings "$collect2name" | grep resolve_lib_name >/dev/null
|
||||
strings "$collect2name" | grep resolve_lib_name >/dev/null
|
||||
then
|
||||
# We have reworked collect2
|
||||
hardcode_direct=yes
|
||||
# We have reworked collect2
|
||||
hardcode_direct=yes
|
||||
else
|
||||
# We have old collect2
|
||||
hardcode_direct=unsupported
|
||||
# It fails to find uninstalled libraries when the uninstalled
|
||||
# path is not listed in the libpath. Setting hardcode_minus_L
|
||||
# to unsupported forces relinking
|
||||
hardcode_minus_L=yes
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
hardcode_libdir_separator=
|
||||
# We have old collect2
|
||||
hardcode_direct=unsupported
|
||||
# It fails to find uninstalled libraries when the uninstalled
|
||||
# path is not listed in the libpath. Setting hardcode_minus_L
|
||||
# to unsupported forces relinking
|
||||
hardcode_minus_L=yes
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
hardcode_libdir_separator=
|
||||
fi
|
||||
esac
|
||||
shared_flag='-shared'
|
||||
else
|
||||
# not using gcc
|
||||
if test "$host_cpu" = ia64; then
|
||||
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
|
||||
# chokes on -Wl,-G. The following line is correct:
|
||||
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
|
||||
# chokes on -Wl,-G. The following line is correct:
|
||||
shared_flag='-G'
|
||||
else
|
||||
if test "$aix_use_runtimelinking" = yes; then
|
||||
if test "$aix_use_runtimelinking" = yes; then
|
||||
shared_flag='${wl}-G'
|
||||
else
|
||||
shared_flag='${wl}-bM:SRE'
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -7169,7 +7169,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
;;
|
||||
*) # Darwin 1.3 on
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
allow_undefined_flag='-flat_namespace -undefined suppress'
|
||||
allow_undefined_flag='-flat_namespace -undefined suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[012])
|
||||
|
|
@ -7182,14 +7182,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
fi
|
||||
;;
|
||||
esac
|
||||
lt_int_apple_cc_single_mod=no
|
||||
output_verbose_link_cmd='echo'
|
||||
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
|
||||
lt_int_apple_cc_single_mod=yes
|
||||
fi
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
else
|
||||
lt_int_apple_cc_single_mod=no
|
||||
output_verbose_link_cmd='echo'
|
||||
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
|
||||
lt_int_apple_cc_single_mod=yes
|
||||
fi
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
else
|
||||
archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
fi
|
||||
module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
||||
|
|
@ -7421,7 +7421,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
else
|
||||
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
fi
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
hardcode_shlibpath_var=no
|
||||
|
|
@ -7511,7 +7511,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
# object files and a static libstdc++, better avoid it by now
|
||||
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
hardcode_libdir_flag_spec=
|
||||
hardcode_shlibpath_var=no
|
||||
runpath_var='LD_RUN_PATH'
|
||||
|
|
@ -8809,7 +8809,7 @@ echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
|
|||
if test "${lt_cv_dlopen_self+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test "$cross_compiling" = yes; then :
|
||||
if test "$cross_compiling" = yes; then :
|
||||
lt_cv_dlopen_self=cross
|
||||
else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
|
|
@ -8907,7 +8907,7 @@ echo $ECHO_N "checking whether a statically linked program can dlopen itself...
|
|||
if test "${lt_cv_dlopen_self_static+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test "$cross_compiling" = yes; then :
|
||||
if test "$cross_compiling" = yes; then :
|
||||
lt_cv_dlopen_self_static=cross
|
||||
else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
|
|
@ -9052,7 +9052,7 @@ aix4*)
|
|||
;;
|
||||
*) # Darwin 1.3 on
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
allow_undefined_flag='-flat_namespace -undefined suppress'
|
||||
allow_undefined_flag='-flat_namespace -undefined suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[012])
|
||||
|
|
@ -10132,7 +10132,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
;;
|
||||
*) # Darwin 1.3 on
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
|
||||
allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[012])
|
||||
|
|
@ -12507,7 +12507,7 @@ echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
|
|||
if test "${lt_cv_dlopen_self+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test "$cross_compiling" = yes; then :
|
||||
if test "$cross_compiling" = yes; then :
|
||||
lt_cv_dlopen_self=cross
|
||||
else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
|
|
@ -12605,7 +12605,7 @@ echo $ECHO_N "checking whether a statically linked program can dlopen itself...
|
|||
if test "${lt_cv_dlopen_self_static+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test "$cross_compiling" = yes; then :
|
||||
if test "$cross_compiling" = yes; then :
|
||||
lt_cv_dlopen_self_static=cross
|
||||
else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
|
|
@ -13754,9 +13754,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
export_dynamic_flag_spec_F77='${wl}--export-dynamic'
|
||||
# ancient GNU ld didn't support --whole-archive et. al.
|
||||
if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
|
||||
whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
else
|
||||
whole_archive_flag_spec_F77=
|
||||
whole_archive_flag_spec_F77=
|
||||
fi
|
||||
fi
|
||||
else
|
||||
|
|
@ -13798,10 +13798,10 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
# need to do runtime linking.
|
||||
case $host_os in aix4.[23]|aix4.[23].*|aix5*)
|
||||
for ld_flag in $LDFLAGS; do
|
||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
||||
aix_use_runtimelinking=yes
|
||||
break
|
||||
fi
|
||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
||||
aix_use_runtimelinking=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
esac
|
||||
|
||||
|
|
@ -13826,34 +13826,34 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
# below for broken collect2 doesn't work under 4.3+
|
||||
collect2name=`${CC} -print-prog-name=collect2`
|
||||
if test -f "$collect2name" && \
|
||||
strings "$collect2name" | grep resolve_lib_name >/dev/null
|
||||
strings "$collect2name" | grep resolve_lib_name >/dev/null
|
||||
then
|
||||
# We have reworked collect2
|
||||
hardcode_direct_F77=yes
|
||||
# We have reworked collect2
|
||||
hardcode_direct_F77=yes
|
||||
else
|
||||
# We have old collect2
|
||||
hardcode_direct_F77=unsupported
|
||||
# It fails to find uninstalled libraries when the uninstalled
|
||||
# path is not listed in the libpath. Setting hardcode_minus_L
|
||||
# to unsupported forces relinking
|
||||
hardcode_minus_L_F77=yes
|
||||
hardcode_libdir_flag_spec_F77='-L$libdir'
|
||||
hardcode_libdir_separator_F77=
|
||||
# We have old collect2
|
||||
hardcode_direct_F77=unsupported
|
||||
# It fails to find uninstalled libraries when the uninstalled
|
||||
# path is not listed in the libpath. Setting hardcode_minus_L
|
||||
# to unsupported forces relinking
|
||||
hardcode_minus_L_F77=yes
|
||||
hardcode_libdir_flag_spec_F77='-L$libdir'
|
||||
hardcode_libdir_separator_F77=
|
||||
fi
|
||||
esac
|
||||
shared_flag='-shared'
|
||||
else
|
||||
# not using gcc
|
||||
if test "$host_cpu" = ia64; then
|
||||
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
|
||||
# chokes on -Wl,-G. The following line is correct:
|
||||
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
|
||||
# chokes on -Wl,-G. The following line is correct:
|
||||
shared_flag='-G'
|
||||
else
|
||||
if test "$aix_use_runtimelinking" = yes; then
|
||||
if test "$aix_use_runtimelinking" = yes; then
|
||||
shared_flag='${wl}-G'
|
||||
else
|
||||
shared_flag='${wl}-bM:SRE'
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -14016,7 +14016,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
;;
|
||||
*) # Darwin 1.3 on
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
allow_undefined_flag_F77='-flat_namespace -undefined suppress'
|
||||
allow_undefined_flag_F77='-flat_namespace -undefined suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[012])
|
||||
|
|
@ -14029,14 +14029,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
fi
|
||||
;;
|
||||
esac
|
||||
lt_int_apple_cc_single_mod=no
|
||||
output_verbose_link_cmd='echo'
|
||||
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
|
||||
lt_int_apple_cc_single_mod=yes
|
||||
fi
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
else
|
||||
lt_int_apple_cc_single_mod=no
|
||||
output_verbose_link_cmd='echo'
|
||||
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
|
||||
lt_int_apple_cc_single_mod=yes
|
||||
fi
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
else
|
||||
archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
fi
|
||||
module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
||||
|
|
@ -14268,7 +14268,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
else
|
||||
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
fi
|
||||
hardcode_libdir_flag_spec_F77='-R$libdir'
|
||||
hardcode_shlibpath_var_F77=no
|
||||
|
|
@ -14358,7 +14358,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
# object files and a static libstdc++, better avoid it by now
|
||||
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
hardcode_libdir_flag_spec_F77=
|
||||
hardcode_shlibpath_var_F77=no
|
||||
runpath_var='LD_RUN_PATH'
|
||||
|
|
@ -16081,9 +16081,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
|
||||
# ancient GNU ld didn't support --whole-archive et. al.
|
||||
if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
|
||||
whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
else
|
||||
whole_archive_flag_spec_GCJ=
|
||||
whole_archive_flag_spec_GCJ=
|
||||
fi
|
||||
fi
|
||||
else
|
||||
|
|
@ -16125,10 +16125,10 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
# need to do runtime linking.
|
||||
case $host_os in aix4.[23]|aix4.[23].*|aix5*)
|
||||
for ld_flag in $LDFLAGS; do
|
||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
||||
aix_use_runtimelinking=yes
|
||||
break
|
||||
fi
|
||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
||||
aix_use_runtimelinking=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
esac
|
||||
|
||||
|
|
@ -16153,34 +16153,34 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
# below for broken collect2 doesn't work under 4.3+
|
||||
collect2name=`${CC} -print-prog-name=collect2`
|
||||
if test -f "$collect2name" && \
|
||||
strings "$collect2name" | grep resolve_lib_name >/dev/null
|
||||
strings "$collect2name" | grep resolve_lib_name >/dev/null
|
||||
then
|
||||
# We have reworked collect2
|
||||
hardcode_direct_GCJ=yes
|
||||
# We have reworked collect2
|
||||
hardcode_direct_GCJ=yes
|
||||
else
|
||||
# We have old collect2
|
||||
hardcode_direct_GCJ=unsupported
|
||||
# It fails to find uninstalled libraries when the uninstalled
|
||||
# path is not listed in the libpath. Setting hardcode_minus_L
|
||||
# to unsupported forces relinking
|
||||
hardcode_minus_L_GCJ=yes
|
||||
hardcode_libdir_flag_spec_GCJ='-L$libdir'
|
||||
hardcode_libdir_separator_GCJ=
|
||||
# We have old collect2
|
||||
hardcode_direct_GCJ=unsupported
|
||||
# It fails to find uninstalled libraries when the uninstalled
|
||||
# path is not listed in the libpath. Setting hardcode_minus_L
|
||||
# to unsupported forces relinking
|
||||
hardcode_minus_L_GCJ=yes
|
||||
hardcode_libdir_flag_spec_GCJ='-L$libdir'
|
||||
hardcode_libdir_separator_GCJ=
|
||||
fi
|
||||
esac
|
||||
shared_flag='-shared'
|
||||
else
|
||||
# not using gcc
|
||||
if test "$host_cpu" = ia64; then
|
||||
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
|
||||
# chokes on -Wl,-G. The following line is correct:
|
||||
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
|
||||
# chokes on -Wl,-G. The following line is correct:
|
||||
shared_flag='-G'
|
||||
else
|
||||
if test "$aix_use_runtimelinking" = yes; then
|
||||
if test "$aix_use_runtimelinking" = yes; then
|
||||
shared_flag='${wl}-G'
|
||||
else
|
||||
shared_flag='${wl}-bM:SRE'
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -16363,7 +16363,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
;;
|
||||
*) # Darwin 1.3 on
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
|
||||
allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[012])
|
||||
|
|
@ -16376,14 +16376,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
fi
|
||||
;;
|
||||
esac
|
||||
lt_int_apple_cc_single_mod=no
|
||||
output_verbose_link_cmd='echo'
|
||||
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
|
||||
lt_int_apple_cc_single_mod=yes
|
||||
fi
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
else
|
||||
lt_int_apple_cc_single_mod=no
|
||||
output_verbose_link_cmd='echo'
|
||||
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
|
||||
lt_int_apple_cc_single_mod=yes
|
||||
fi
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
else
|
||||
archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
fi
|
||||
module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
||||
|
|
@ -16615,7 +16615,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
else
|
||||
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
fi
|
||||
hardcode_libdir_flag_spec_GCJ='-R$libdir'
|
||||
hardcode_shlibpath_var_GCJ=no
|
||||
|
|
@ -16705,7 +16705,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|||
# object files and a static libstdc++, better avoid it by now
|
||||
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
hardcode_libdir_flag_spec_GCJ=
|
||||
hardcode_shlibpath_var_GCJ=no
|
||||
runpath_var='LD_RUN_PATH'
|
||||
|
|
@ -18003,7 +18003,7 @@ echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
|
|||
if test "${lt_cv_dlopen_self+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test "$cross_compiling" = yes; then :
|
||||
if test "$cross_compiling" = yes; then :
|
||||
lt_cv_dlopen_self=cross
|
||||
else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
|
|
@ -18101,7 +18101,7 @@ echo $ECHO_N "checking whether a statically linked program can dlopen itself...
|
|||
if test "${lt_cv_dlopen_self_static+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test "$cross_compiling" = yes; then :
|
||||
if test "$cross_compiling" = yes; then :
|
||||
lt_cv_dlopen_self_static=cross
|
||||
else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
|
|
@ -19973,9 +19973,9 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|||
. : '\(.\)' 2>/dev/null ||
|
||||
echo X/"$0" |
|
||||
sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
|
||||
/^X\/\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\/\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
/^X\/\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\/\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
|
||||
|
||||
# PATH needs CR, and LINENO needs CR and PATH.
|
||||
|
|
@ -20550,10 +20550,10 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|||
. : '\(.\)' 2>/dev/null ||
|
||||
echo X"$ac_file" |
|
||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
{ if $as_mkdir_p; then
|
||||
mkdir -p "$ac_dir"
|
||||
else
|
||||
|
|
@ -20569,10 +20569,10 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|||
. : '\(.\)' 2>/dev/null ||
|
||||
echo X"$as_dir" |
|
||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
done
|
||||
test ! -n "$as_dirs" || mkdir $as_dirs
|
||||
fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
|
||||
|
|
@ -20738,10 +20738,10 @@ $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|||
. : '\(.\)' 2>/dev/null ||
|
||||
echo X"$ac_dest" |
|
||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
{ if $as_mkdir_p; then
|
||||
mkdir -p "$ac_dir"
|
||||
else
|
||||
|
|
@ -20757,10 +20757,10 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|||
. : '\(.\)' 2>/dev/null ||
|
||||
echo X"$as_dir" |
|
||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
done
|
||||
test ! -n "$as_dirs" || mkdir $as_dirs
|
||||
fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
|
||||
|
|
@ -20854,10 +20854,10 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|||
. : '\(.\)' 2>/dev/null ||
|
||||
echo X"$mf" |
|
||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
else
|
||||
continue
|
||||
fi
|
||||
|
|
@ -20893,10 +20893,10 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|||
. : '\(.\)' 2>/dev/null ||
|
||||
echo X"$file" |
|
||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
{ if $as_mkdir_p; then
|
||||
mkdir -p $dirpart/$fdir
|
||||
else
|
||||
|
|
@ -20912,10 +20912,10 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|||
. : '\(.\)' 2>/dev/null ||
|
||||
echo X"$as_dir" |
|
||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
done
|
||||
test ! -n "$as_dirs" || mkdir $as_dirs
|
||||
fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
|
||||
|
|
@ -20959,4 +20959,3 @@ if test "$no_create" != yes; then
|
|||
# would make configure fail if this is the last instruction.
|
||||
$ac_cs_success || { (exit 1); exit 1; }
|
||||
fi
|
||||
|
||||
|
|
@ -170,58 +170,58 @@ char *capi_info2str(_cword reason)
|
|||
/*-- error information concerning requested services -----*/
|
||||
case 0x3001:
|
||||
return "B1 protocol not supported";
|
||||
case 0x3002:
|
||||
case 0x3002:
|
||||
return "B2 protocol not supported";
|
||||
case 0x3003:
|
||||
case 0x3003:
|
||||
return "B3 protocol not supported";
|
||||
case 0x3004:
|
||||
case 0x3004:
|
||||
return "B1 protocol parameter not supported";
|
||||
case 0x3005:
|
||||
case 0x3005:
|
||||
return "B2 protocol parameter not supported";
|
||||
case 0x3006:
|
||||
case 0x3006:
|
||||
return "B3 protocol parameter not supported";
|
||||
case 0x3007:
|
||||
case 0x3007:
|
||||
return "B protocol combination not supported";
|
||||
case 0x3008:
|
||||
case 0x3008:
|
||||
return "NCPI not supported";
|
||||
case 0x3009:
|
||||
case 0x3009:
|
||||
return "CIP Value unknown";
|
||||
case 0x300A:
|
||||
case 0x300A:
|
||||
return "Flags not supported (reserved bits)";
|
||||
case 0x300B:
|
||||
case 0x300B:
|
||||
return "Facility not supported";
|
||||
case 0x300C:
|
||||
case 0x300C:
|
||||
return "Data length not supported by current protocol";
|
||||
case 0x300D:
|
||||
case 0x300D:
|
||||
return "Reset procedure not supported by current protocol";
|
||||
|
||||
/*-- informations about the clearing of a physical connection -----*/
|
||||
case 0x3301:
|
||||
case 0x3301:
|
||||
return "Protocol error layer 1 (broken line or B-channel removed by signalling protocol)";
|
||||
case 0x3302:
|
||||
case 0x3302:
|
||||
return "Protocol error layer 2";
|
||||
case 0x3303:
|
||||
case 0x3303:
|
||||
return "Protocol error layer 3";
|
||||
case 0x3304:
|
||||
case 0x3304:
|
||||
return "Another application got that call";
|
||||
/*-- T.30 specific reasons -----*/
|
||||
case 0x3311:
|
||||
case 0x3311:
|
||||
return "Connecting not successful (remote station is no FAX G3 machine)";
|
||||
case 0x3312:
|
||||
case 0x3312:
|
||||
return "Connecting not successful (training error)";
|
||||
case 0x3313:
|
||||
case 0x3313:
|
||||
return "Disconnected before transfer (remote station does not support transfer mode, e.g. resolution)";
|
||||
case 0x3314:
|
||||
case 0x3314:
|
||||
return "Disconnected during transfer (remote abort)";
|
||||
case 0x3315:
|
||||
case 0x3315:
|
||||
return "Disconnected during transfer (remote procedure error, e.g. unsuccessful repetition of T.30 commands)";
|
||||
case 0x3316:
|
||||
case 0x3316:
|
||||
return "Disconnected during transfer (local tx data underrun)";
|
||||
case 0x3317:
|
||||
case 0x3317:
|
||||
return "Disconnected during transfer (local rx data overflow)";
|
||||
case 0x3318:
|
||||
case 0x3318:
|
||||
return "Disconnected during transfer (local abort)";
|
||||
case 0x3319:
|
||||
case 0x3319:
|
||||
return "Illegal parameter coding (e.g. SFF coding error)";
|
||||
|
||||
/*-- disconnect causes from the network according to ETS 300 102-1/Q.931 -----*/
|
||||
|
|
@ -229,7 +229,7 @@ char *capi_info2str(_cword reason)
|
|||
case 0x3482: return "No route to specified transit network";
|
||||
case 0x3483: return "No route to destination";
|
||||
case 0x3486: return "Channel unacceptable";
|
||||
case 0x3487:
|
||||
case 0x3487:
|
||||
return "Call awarded and being delivered in an established channel";
|
||||
case 0x3490: return "Normal call clearing";
|
||||
case 0x3491: return "User busy";
|
||||
|
|
@ -779,7 +779,7 @@ if test -n "$pic_flag"; then
|
|||
if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
|
||||
# Append any warnings to the config.log.
|
||||
cat conftest.err 1>&5
|
||||
|
||||
|
||||
case "$host_os" in
|
||||
hpux9* | hpux10* | hpux11*)
|
||||
# On HP-UX, both CC and GCC only warn that PIC is supported... then they
|
||||
|
|
@ -939,7 +939,7 @@ if test "$with_gcc" = yes; then
|
|||
else
|
||||
no_builtin_flag=' -fno-builtin'
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
# Check for any special shared library compilation flags.
|
||||
|
|
@ -1191,7 +1191,7 @@ EOF
|
|||
$DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
|
||||
$CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
|
||||
|
||||
old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a'
|
||||
old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a'
|
||||
;;
|
||||
|
||||
netbsd*)
|
||||
|
|
@ -1223,7 +1223,7 @@ EOF
|
|||
else
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
;;
|
||||
|
||||
sunos4*)
|
||||
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts'
|
||||
|
|
@ -1447,7 +1447,7 @@ else
|
|||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
;;
|
||||
|
||||
|
||||
sco3.2v5*)
|
||||
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
|
||||
hardcode_shlibpath_var=no
|
||||
|
|
@ -1481,7 +1481,7 @@ else
|
|||
|
||||
sysv4)
|
||||
if test "x$host_vendor" = xsequent; then
|
||||
# Use $CC to link under sequent, because it throws in some extra .o
|
||||
# Use $CC to link under sequent, because it throws in some extra .o
|
||||
# files that make .init and .fini sections work.
|
||||
archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts'
|
||||
else
|
||||
|
|
@ -1489,8 +1489,8 @@ else
|
|||
fi
|
||||
runpath_var='LD_RUN_PATH'
|
||||
hardcode_shlibpath_var=no
|
||||
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
|
||||
;;
|
||||
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
|
||||
;;
|
||||
|
||||
sysv4.3*)
|
||||
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
|
||||
|
|
@ -1887,7 +1887,7 @@ cygwin* | mingw*)
|
|||
freebsd1*)
|
||||
dynamic_linker=no
|
||||
;;
|
||||
|
||||
|
||||
freebsd*)
|
||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
||||
version_type=freebsd-$objformat
|
||||
|
|
@ -2467,10 +2467,10 @@ fi
|
|||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -2576,7 +2576,7 @@ else
|
|||
fnord() { int i=42;}
|
||||
main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
|
||||
if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
|
||||
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
|
||||
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
|
||||
|
||||
EOF
|
||||
if { (eval echo $progname:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
|
|
@ -2649,7 +2649,7 @@ else
|
|||
fnord() { int i=42;}
|
||||
main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
|
||||
if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
|
||||
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
|
||||
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
|
||||
|
||||
EOF
|
||||
if { (eval echo $progname:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
|
|
@ -94,7 +94,7 @@ if test "${LANG+set}" = set; then
|
|||
fi
|
||||
|
||||
# Make sure IFS has a sensible default
|
||||
: ${IFS="
|
||||
: ${IFS="
|
||||
"}
|
||||
|
||||
if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
|
||||
|
|
@ -141,7 +141,7 @@ win32_libid () {
|
|||
fi
|
||||
fi
|
||||
;;
|
||||
*DLL*)
|
||||
*DLL*)
|
||||
win32_libid_type="x86 DLL"
|
||||
;;
|
||||
*executable*) # but shell scripts are "executable" too...
|
||||
|
|
@ -1582,7 +1582,7 @@ EOF
|
|||
xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
|
||||
if test "X$xdir" = "X$arg"; then
|
||||
xdir=
|
||||
else
|
||||
else
|
||||
xdir="$xdir/"
|
||||
fi
|
||||
|
||||
|
|
@ -2084,7 +2084,7 @@ EOF
|
|||
continue
|
||||
fi # $pass = conv
|
||||
|
||||
|
||||
|
||||
# Get the name of the library we link against.
|
||||
linklib=
|
||||
for l in $old_library $library_names; do
|
||||
|
|
@ -2177,7 +2177,7 @@ EOF
|
|||
continue
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test "$linkmode" = prog && test "$pass" != link; then
|
||||
newlib_search_path="$newlib_search_path $ladir"
|
||||
deplibs="$lib $deplibs"
|
||||
|
|
@ -2264,7 +2264,7 @@ EOF
|
|||
need_relink=yes
|
||||
fi
|
||||
# This is a shared library
|
||||
|
||||
|
||||
# Warn about portability, can't link against -module's on some systems (darwin)
|
||||
if test "$shouldnotlink" = yes && test "$pass" = link ; then
|
||||
$echo
|
||||
|
|
@ -2273,8 +2273,8 @@ EOF
|
|||
else
|
||||
$echo "*** Warning: Linking the shared library $output against the loadable module"
|
||||
fi
|
||||
$echo "*** $linklib is not portable!"
|
||||
fi
|
||||
$echo "*** $linklib is not portable!"
|
||||
fi
|
||||
if test "$linkmode" = lib &&
|
||||
test "$hardcode_into_libs" = yes; then
|
||||
# Hardcode the library path.
|
||||
|
|
@ -2382,7 +2382,7 @@ EOF
|
|||
$echo "** The link will probably fail, sorry"
|
||||
else
|
||||
add="$dir/$old_library"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
esac
|
||||
elif test "$hardcode_minus_L" = no; then
|
||||
|
|
@ -2634,8 +2634,8 @@ EOF
|
|||
*)
|
||||
path="-L$path"
|
||||
;;
|
||||
esac
|
||||
|
||||
esac
|
||||
|
||||
;;
|
||||
-l*)
|
||||
case $host in
|
||||
|
|
@ -2646,19 +2646,19 @@ EOF
|
|||
if test -f "$tmp/lib$tmp_libs.dylib" ; then
|
||||
eval depdepl="$tmp/lib$tmp_libs.dylib"
|
||||
break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
path=""
|
||||
;;
|
||||
*) continue ;;
|
||||
esac
|
||||
esac
|
||||
;;
|
||||
*) continue ;;
|
||||
esac
|
||||
case " $deplibs " in
|
||||
*" $depdepl "*) ;;
|
||||
*) deplibs="$deplibs $depdepl" ;;
|
||||
esac
|
||||
esac
|
||||
case " $deplibs " in
|
||||
*" $path "*) ;;
|
||||
*) deplibs="$deplibs $path" ;;
|
||||
|
|
@ -2885,7 +2885,7 @@ EOF
|
|||
# convert absolute version numbers to libtool ages
|
||||
# this retains compatibility with .la files and attempts
|
||||
# to make the code below a bit more comprehensible
|
||||
|
||||
|
||||
case $vinfo_number in
|
||||
yes)
|
||||
number_major="$2"
|
||||
|
|
@ -3179,7 +3179,7 @@ EOF
|
|||
# Do not include libc due to us having libc/libc_r.
|
||||
test "X$arg" = "X-lc" && continue
|
||||
;;
|
||||
*)
|
||||
*)
|
||||
# Add libc to deplibs on all other systems if necessary.
|
||||
if test "$build_libtool_need_lc" = "yes"; then
|
||||
deplibs="$deplibs -lc"
|
||||
|
|
@ -3644,12 +3644,12 @@ EOF
|
|||
for test_deplib in $deplibs; do
|
||||
case " $convenience " in
|
||||
*" $test_deplib "*) ;;
|
||||
*)
|
||||
*)
|
||||
tmp_deplibs="$tmp_deplibs $test_deplib"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
deplibs="$tmp_deplibs"
|
||||
deplibs="$tmp_deplibs"
|
||||
|
||||
if test -n "$convenience"; then
|
||||
if test -n "$whole_archive_flag_spec"; then
|
||||
|
|
@ -4573,7 +4573,7 @@ static const void *lt_preloaded_setup() {
|
|||
|
||||
The $output program cannot be directly executed until all the libtool
|
||||
libraries that it depends on are installed.
|
||||
|
||||
|
||||
This wrapper executable should never be moved out of the build directory.
|
||||
If it is, it will not operate correctly.
|
||||
|
||||
|
|
@ -4605,7 +4605,7 @@ EOF
|
|||
#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
|
||||
defined (__OS2__)
|
||||
#define HAVE_DOS_BASED_FILE_SYSTEM
|
||||
#ifndef DIR_SEPARATOR_2
|
||||
#ifndef DIR_SEPARATOR_2
|
||||
#define DIR_SEPARATOR_2 '\\'
|
||||
#endif
|
||||
#endif
|
||||
|
|
@ -4636,7 +4636,7 @@ main (int argc, char *argv[])
|
|||
{
|
||||
char **newargz;
|
||||
int i;
|
||||
|
||||
|
||||
program_name = (char *) xstrdup ((char *) basename (argv[0]));
|
||||
newargz = XMALLOC(char *, argc+2);
|
||||
EOF
|
||||
|
|
@ -4649,7 +4649,7 @@ EOF
|
|||
newargz[1] = fnqualify(argv[0]);
|
||||
/* we know the script has the same name, without the .exe */
|
||||
/* so make sure newargz[1] doesn't end in .exe */
|
||||
strendzap(newargz[1],".exe");
|
||||
strendzap(newargz[1],".exe");
|
||||
for (i = 1; i < argc; i++)
|
||||
newargz[i+1] = xstrdup(argv[i]);
|
||||
newargz[argc+1] = NULL;
|
||||
|
|
@ -4672,7 +4672,7 @@ xmalloc (size_t num)
|
|||
return p;
|
||||
}
|
||||
|
||||
char *
|
||||
char *
|
||||
xstrdup (const char *string)
|
||||
{
|
||||
return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
|
||||
|
|
@ -4686,7 +4686,7 @@ basename (const char *name)
|
|||
|
||||
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
|
||||
/* Skip over the disk name in MSDOS pathnames. */
|
||||
if (isalpha (name[0]) && name[1] == ':')
|
||||
if (isalpha (name[0]) && name[1] == ':')
|
||||
name += 2;
|
||||
#endif
|
||||
|
||||
|
|
@ -4696,7 +4696,7 @@ basename (const char *name)
|
|||
return (char *) base;
|
||||
}
|
||||
|
||||
char *
|
||||
char *
|
||||
fnqualify(const char *path)
|
||||
{
|
||||
size_t size;
|
||||
|
|
@ -4724,7 +4724,7 @@ fnqualify(const char *path)
|
|||
}
|
||||
|
||||
char *
|
||||
strendzap(char *str, const char *pat)
|
||||
strendzap(char *str, const char *pat)
|
||||
{
|
||||
size_t len, patlen;
|
||||
|
||||
|
|
@ -4744,7 +4744,7 @@ strendzap(char *str, const char *pat)
|
|||
}
|
||||
|
||||
static void
|
||||
lt_error_core (int exit_status, const char * mode,
|
||||
lt_error_core (int exit_status, const char * mode,
|
||||
const char * message, va_list ap)
|
||||
{
|
||||
fprintf (stderr, "%s: %s: ", program_name, mode);
|
||||
|
|
@ -5067,7 +5067,7 @@ fi\
|
|||
for obj in $save_oldobjs
|
||||
do
|
||||
last_oldobj=$obj
|
||||
done
|
||||
done
|
||||
for obj in $save_oldobjs
|
||||
do
|
||||
oldobjs="$objlist $obj"
|
||||
|
|
@ -5081,7 +5081,7 @@ fi\
|
|||
oldobjs=$objlist
|
||||
if test "$obj" = "$last_oldobj" ; then
|
||||
RANLIB=$save_RANLIB
|
||||
fi
|
||||
fi
|
||||
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
|
||||
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
|
||||
objlist=
|
||||
|
|
@ -5134,7 +5134,7 @@ fi\
|
|||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
if test "$hardcode_automatic" = yes ; then
|
||||
relink_command=
|
||||
fi
|
||||
fi
|
||||
# Only create the output if not a dry run.
|
||||
if test -z "$run"; then
|
||||
for installed in no yes; do
|
||||
|
|
@ -5185,7 +5185,7 @@ fi\
|
|||
else
|
||||
newdlfiles=
|
||||
for lib in $dlfiles; do
|
||||
case $lib in
|
||||
case $lib in
|
||||
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
|
||||
*) abs=`pwd`"/$lib" ;;
|
||||
esac
|
||||
|
|
@ -5194,7 +5194,7 @@ fi\
|
|||
dlfiles="$newdlfiles"
|
||||
newdlprefiles=
|
||||
for lib in $dlprefiles; do
|
||||
case $lib in
|
||||
case $lib in
|
||||
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
|
||||
*) abs=`pwd`"/$lib" ;;
|
||||
esac
|
||||
|
|
@ -6118,7 +6118,7 @@ relink_command=\"$relink_command\""
|
|||
if test "$mode" = clean ; then
|
||||
noexename=$name
|
||||
case $file in
|
||||
*.exe)
|
||||
*.exe)
|
||||
file=`$echo $file|${SED} 's,.exe$,,'`
|
||||
noexename=`$echo $name|${SED} 's,.exe$,,'`
|
||||
# $file with .exe has already been added to rmfiles,
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
scriptversion=2003-09-02.23
|
||||
|
||||
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
|
||||
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
|
||||
# Free Software Foundation, Inc.
|
||||
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ do
|
|||
mkdir "$pathcomp" || lasterr=$?
|
||||
|
||||
if test ! -d "$pathcomp"; then
|
||||
errstatus=$lasterr
|
||||
errstatus=$lasterr
|
||||
fi
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue