PatchSet 7018 Date: 2005/12/19 22:41:45 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with GNU Classpath
Members: ChangeLog:1.4538->1.4539 libraries/javalib/external/classpath/ChangeLog:1.8->1.9 libraries/javalib/external/classpath/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/aclocal.m4:1.8->1.9 libraries/javalib/external/classpath/config.guess:1.6->1.7 libraries/javalib/external/classpath/config.sub:1.7->1.8 libraries/javalib/external/classpath/configure:1.11->1.12 libraries/javalib/external/classpath/ltmain.sh:1.6->1.7 libraries/javalib/external/classpath/doc/Makefile.in:1.5->1.6 libraries/javalib/external/classpath/doc/api/Makefile.in:1.5->1.6 libraries/javalib/external/classpath/examples/Makefile.in:1.8->1.9 libraries/javalib/external/classpath/external/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/external/sax/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java:1.8->1.9 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html:1.8->1.9 libraries/javalib/external/classpath/external/w3c_dom/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/include/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/javax/print/attribute/standard/JobStateReasons.java:1.1->1.2 libraries/javalib/external/classpath/javax/print/attribute/standard/Media.java:1.2->1.3 libraries/javalib/external/classpath/javax/print/attribute/standard/MediaPrintableArea.java:1.1->1.2 libraries/javalib/external/classpath/javax/print/attribute/standard/PrinterStateReasons.java:1.1->1.2 libraries/javalib/external/classpath/javax/swing/JComponent.java:1.5->1.6 libraries/javalib/external/classpath/javax/swing/JViewport.java:1.3->1.4 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java:1.2->1.3 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicComboPopup.java:1.2->1.3 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java:1.2->1.3 libraries/javalib/external/classpath/javax/swing/text/DefaultStyledDocument.java:1.3->1.4 libraries/javalib/external/classpath/javax/swing/text/StyledEditorKit.java:1.2->1.3 libraries/javalib/external/classpath/javax/swing/text/html/HTMLDocument.java:1.5->1.6 libraries/javalib/external/classpath/javax/swing/text/html/HTMLEditorKit.java:1.5->1.6 libraries/javalib/external/classpath/javax/swing/text/html/default.css:1.1->1.2 libraries/javalib/external/classpath/lib/Makefile.in:1.11->1.12 libraries/javalib/external/classpath/native/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/native/fdlibm/Makefile.in:1.8->1.9 libraries/javalib/external/classpath/native/fdlibm/mprec.h:1.2->1.3 libraries/javalib/external/classpath/native/jawt/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/native/jni/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/native/jni/classpath/Makefile.in:1.8->1.9 libraries/javalib/external/classpath/native/jni/gtk-peer/Makefile.in:1.8->1.9 libraries/javalib/external/classpath/native/jni/java-io/Makefile.in:1.8->1.9 libraries/javalib/external/classpath/native/jni/java-lang/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/native/jni/java-net/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/native/jni/java-nio/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/native/jni/java-util/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/native/jni/midi-dssi/Makefile.in:1.8->1.9 libraries/javalib/external/classpath/native/jni/qt-peer/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/native/jni/xmlj/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/native/target/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/native/target/Linux/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/native/target/generic/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/resource/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/resource/gnu/regexp/MessagesBundle_it.properties:1.8->1.9 libraries/javalib/external/classpath/scripts/Makefile.in:1.7->1.8 libraries/javalib/external/classpath/scripts/classpath.spec.in:1.8->1.9 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.4538 kaffe/ChangeLog:1.4539 --- kaffe/ChangeLog:1.4538 Mon Dec 19 17:46:32 2005 +++ kaffe/ChangeLog Mon Dec 19 22:41:45 2005 @@ -1,5 +1,9 @@ 2005-12-19 Dalibor Topic <[EMAIL PROTECTED]> + * libraries/javalib/external/classpath: Resynched GNU Classpath. + +2005-12-19 Dalibor Topic <[EMAIL PROTECTED]> + * tools/javatools/javalib/Makefile.am: (clean-local) Added -f to rm for tools.jar. Index: kaffe/libraries/javalib/external/classpath/ChangeLog diff -u kaffe/libraries/javalib/external/classpath/ChangeLog:1.8 kaffe/libraries/javalib/external/classpath/ChangeLog:1.9 --- kaffe/libraries/javalib/external/classpath/ChangeLog:1.8 Mon Dec 19 00:11:51 2005 +++ kaffe/libraries/javalib/external/classpath/ChangeLog Mon Dec 19 22:41:53 2005 @@ -1,3 +1,101 @@ +2005-12-19 Dalibor Topic <[EMAIL PROTECTED]> + + * native/fdlibm/mprec.h (DEBUG): Include stdlib.h for + exit() prototype to fix compiler warning. + +2005-12-19 Lillian Angel <[EMAIL PROTECTED]> + + * javax/swing/text/StyledEditorKit.java + (createInputAttributes): Fixed. I made a mistake by + changing this in my last fix. I have committed a mauve test + to verify the set should be cleared first. + * javax/swing/text/html/HTMLEditorKit + (createInputAttributes): Set is cleared before adding + new attributes. + * javax/swing/text/html/HTMLDocument.java: + Added names to authors. + * javax/swing/text/html/default.css: + Fixed indentation. + +2005-12-19 Roman Kennke <[EMAIL PROTECTED]> + + * javax/swing/plaf/basic/BasicMenuItemUI.java + (paintBackground): Also fill background for unselected items here. + (paintMenuItem): Call paintBackground() with the background + parameter. + +2005-12-19 Roman Kennke <[EMAIL PROTECTED]> + + * javax/swing/JComponent.java + (findOverlapFreeParent): Fixed component lookup for painting. + +2005-12-19 Roman Kennke <[EMAIL PROTECTED]> + + PR classpath/24905 + * javax/swing/JViewport.java + (paintSimple): Call paintComponent() before painting the child, so + the background gets cleared correctly. + +2005-12-19 Wolfgang Baer <[EMAIL PROTECTED]> + + * javax/print/attribute/standard/MediaPrintableArea.java: + Added and updated javadocs to class and methods. + (x): Use int as type. + (y): Likewise. + (width): Likewise. + (height): Likewise. + (MediaPrintableArea): Convert values to micrometers. + (MediaPrintableArea): Likewise. + (getX): Convert return value into choosen units. + (getY): Convert return value into choosen units. + (getWidth): Convert return value into choosen units. + (getHeight): Convert return value into choosen units. + (equals): New overridden method. + (toString): Likewise. + (hashCode): Likewise. + (toString): New method. + (getPrintableArea): Likewise. + +2005-12-19 Wolfgang Baer <[EMAIL PROTECTED]> + + * javax/print/attribute/standard/Media.java (equals): + Reimplemented to allow future subclasses to behave correctly. + +2005-12-19 Roman Kennke <[EMAIL PROTECTED]> + + PR classpath/24195 + * javax/swing/text/DefaultStyledDocument.java + (setParagraphAttributes): Obtain lock for this operation. Exit loop + after last paragraph element. + +2005-12-19 Roman Kennke <[EMAIL PROTECTED]> + + * javax/swing/plaf/basic/BasicComboBoxUI.java + (installListeners): Install focus listener only on editor. + (configureArrowButton): Make arrow button not focusable. + (setPopupVisible): Request focus for the combobox editor or comboBox, + depending on whether the combobox is editable or not. + * javax/swing/plaf/basic/BasicComboPopup.java + (configureList): Make list not focusable. + +2005-12-19 Wolfgang Baer <[EMAIL PROTECTED]> + + * javax/print/attribute/standard/JobStateReasons.java: + Added and updated javadocs to class and methods. + (JobStateReasons): New constructor. + (JobStateReasons): Likewise. + (JobStateReasons): Likewise. + (JobStateReasons): Likewise. + (add): New overridden method. + * javax/print/attribute/standard/PrinterStateReasons.java: + Added and updated javadocs to class and methods. + (PrinterStateReasons): New constructor. + (PrinterStateReasons): Likewise. + (PrinterStateReasons): Likewise. + (PrinterStateReasons): Likewise. + (printerStateReasonSet): New method. + (put): New overridden method. + 2005-12-18 Guilhem Lavaux <[EMAIL PROTECTED]> * libraries/javalib/external/classpath/lib/Makefile.am: Index: kaffe/libraries/javalib/external/classpath/Makefile.in diff -u kaffe/libraries/javalib/external/classpath/Makefile.in:1.7 kaffe/libraries/javalib/external/classpath/Makefile.in:1.8 --- kaffe/libraries/javalib/external/classpath/Makefile.in:1.7 Wed Dec 14 05:09:00 2005 +++ kaffe/libraries/javalib/external/classpath/Makefile.in Mon Dec 19 22:41:54 2005 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, Index: kaffe/libraries/javalib/external/classpath/aclocal.m4 diff -u kaffe/libraries/javalib/external/classpath/aclocal.m4:1.8 kaffe/libraries/javalib/external/classpath/aclocal.m4:1.9 --- kaffe/libraries/javalib/external/classpath/aclocal.m4:1.8 Mon Dec 19 03:54:21 2005 +++ kaffe/libraries/javalib/external/classpath/aclocal.m4 Mon Dec 19 22:41:54 2005 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.9.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. @@ -13,7 +13,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 48 AC_PROG_LIBTOOL +# serial 47 AC_PROG_LIBTOOL +# Debian $Rev: 214 $ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -123,7 +124,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' +Xsed='sed -e s/^X//' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. @@ -143,7 +144,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a `.a' archive for static linking (except M$VC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -163,7 +164,6 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -183,17 +183,15 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -_LT_CC_BASENAME([$compiler]) - # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -234,56 +232,11 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -AC_DEFUN([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_LINKER_BOILERPLATE - - # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -356,15 +309,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && + if (echo_test_string="`eval $cmd`") 2>/dev/null && + echo_test_string="`eval $cmd`" && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -533,7 +486,7 @@ # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in x86_64-*linux*) @@ -584,22 +537,6 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -631,7 +568,7 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -641,10 +578,8 @@ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD 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 other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then $2=yes fi fi @@ -670,16 +605,11 @@ LDFLAGS="$LDFLAGS $3" printf "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized + # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi else $2=yes fi @@ -738,55 +668,11 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) + *) # 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. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + 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 && @@ -812,7 +698,7 @@ # _LT_AC_CHECK_DLFCN -# ------------------ +# -------------------- AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h)dnl ])# _LT_AC_CHECK_DLFCN @@ -820,7 +706,7 @@ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# --------------------------------------------------------------------- +# ------------------------------------------------------------------ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "$cross_compiling" = yes; then : @@ -886,19 +772,17 @@ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } - else - puts (dlerror ()); exit (status); }] EOF if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) $1 ;; x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; + x$lt_unknown|x*) $3 ;; esac else : # compilation failed @@ -910,7 +794,7 @@ # AC_LIBTOOL_DLOPEN_SELF -# ---------------------- +# ------------------- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "x$enable_dlopen" != xyes; then @@ -981,7 +865,7 @@ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -994,7 +878,7 @@ ]) if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + LDFLAGS="$LDFLAGS $link_static_flag" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl _LT_AC_TRY_DLOPEN_SELF( @@ -1042,7 +926,7 @@ # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -1054,13 +938,11 @@ then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.err; then _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD + chmod u+w . $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -1124,8 +1006,8 @@ [AC_MSG_CHECKING([how to hardcode library paths into programs]) _LT_AC_TAGVAR(hardcode_action, $1)= if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ + test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then # We can hardcode non-existant directories. if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && @@ -1292,7 +1174,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi[[45]]*) +bsdi4*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -1320,8 +1202,7 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -1351,7 +1232,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -1374,7 +1255,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`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"` @@ -1409,17 +1290,8 @@ dynamic_linker='GNU ld.so' ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[123]]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -1437,19 +1309,14 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + *) # from 3.2 on shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; esac ;; @@ -1469,7 +1336,7 @@ version_type=sunos need_lib_prefix=no need_version=no - case $host_cpu in + case "$host_cpu" in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -1509,18 +1376,6 @@ postinstall_cmds='chmod 555 $lib' ;; -interix3*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -1580,7 +1435,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + 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 @@ -1593,6 +1448,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + knetbsd*-gnu) version_type=linux need_lib_prefix=no @@ -1642,13 +1509,8 @@ openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -1686,6 +1548,13 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -1711,7 +1580,7 @@ need_version=yes ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -1744,29 +1613,6 @@ fi ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -1780,11 +1626,6 @@ esac AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER @@ -1809,9 +1650,6 @@ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) fi fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi # Extract list of available tagged configurations in $ofile. # Note that this assumes the entire list is on one line. @@ -1838,9 +1676,7 @@ case $tagname in CXX) - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then + if test -n "$CXX" && test "X$CXX" != "Xno"; then AC_LIBTOOL_LANG_CXX_CONFIG else tagname="" @@ -1902,7 +1738,7 @@ # AC_LIBTOOL_WIN32_DLL # -------------------- -# declare package support for building win32 DLLs +# declare package support for building win32 dll's AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) ])# AC_LIBTOOL_WIN32_DLL @@ -1940,7 +1776,7 @@ # AC_DISABLE_SHARED # ----------------- -# set the default shared flag to --disable-shared +#- set the default shared flag to --disable-shared AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_SHARED(no) @@ -2076,7 +1912,7 @@ if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -2186,7 +2022,7 @@ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. + # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -2218,7 +2054,7 @@ AC_DEFUN([AC_PROG_LD_GNU], [AC_REQUIRE([AC_PROG_EGREP])dnl AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU lds only accept -v. +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes @@ -2245,15 +2081,6 @@ *) reload_flag=" $reload_flag" ;; esac reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac ])# AC_PROG_LD_RELOAD_FLAG @@ -2287,7 +2114,7 @@ lt_cv_deplibs_check_method=pass_all ;; -bsdi[[45]]*) +bsdi4*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so @@ -2310,13 +2137,13 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | kfreebsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -2332,7 +2159,7 @@ hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in + case "$host_cpu" in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so @@ -2348,11 +2175,6 @@ esac ;; -interix3*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - irix5* | irix6* | nonstopux*) case $LD in *-32|*"-32 ") libmagic=32-bit;; @@ -2368,7 +2190,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -2387,10 +2209,12 @@ ;; openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' fi ;; @@ -2398,11 +2222,15 @@ lt_cv_deplibs_check_method=pass_all ;; +sco3.2v5*) + lt_cv_deplibs_check_method=pass_all + ;; + solaris*) lt_cv_deplibs_check_method=pass_all ;; -sysv4 | sysv4.3*) +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in motorola) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' @@ -2423,13 +2251,10 @@ siemens) lt_cv_deplibs_check_method=pass_all ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; esac ;; *** Patch too long, truncated *** _______________________________________________ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe