+2007-08-04 Matthias Klose <doko@ubuntu.com>
+
+ Import GNU Classpath (libgcj-import-20070727).
+
+ * Regenerate class and header files.
+ * Regenerate auto* files.
+
+ * include/jvm.h:
+ * jni-libjvm.cc (Jv_JNI_InvokeFunctions): Rename type.
+ * jni.cc (_Jv_JNIFunctions, _Jv_JNI_InvokeFunctions): Likewise.
+ * jni.cc (_Jv_JNI_CallAnyMethodA, _Jv_JNI_CallAnyVoidMethodA,
+ _Jv_JNI_CallMethodA, _Jv_JNI_CallVoidMethodA,
+ _Jv_JNI_CallStaticMethodA, _Jv_JNI_CallStaticVoidMethodA,
+ _Jv_JNI_NewObjectA, _Jv_JNI_SetPrimitiveArrayRegion): Constify
+ jvalue parameter.
+ * java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Likewise.
+
+ * java/lang/VMFloat.java (toString, parseFloat): New.
+
+ * gnu/awt/xlib/XToolkit.java (setAlwaysOnTop, isModalityTypeSupported,
+ isModalExclusionTypeSupported): New (stub only).
+ * gnu/awt/xlib/XCanvasPeer.java (requestFocus): Likewise.
+ * gnu/awt/xlib/XFramePeer.java (updateMinimumSize, updateIconImages,
+ updateFocusableWindowState, setModalBlocked, getBoundsPrivate,
+ setAlwaysOnTop): Likewise.
+ * gnu/awt/xlib/XFontPeer.java (canDisplay): Update signature.
+
+ * scripts/makemake.tcl: Ignore gnu/javax/sound/sampled/gstreamer,
+ ignore javax.sound.sampled.spi.MixerProvider, ignore .in files.
+
+ * HACKING: Mention --enable-gstreamer-peer, removal of generated files.
+
2007-07-31 David Daney <ddaney@avtrex.com>
* HACKING: Document regenerating configure and aclocal.m4.
cd ..
scripts/makemake.tcl > sources.am
automake
+- Remove the generated class and header files:
+ find classpath -name '*.class' xargs -r rm -f
+ find gnu java javax org sun -name '*.h' \
+ | xargs -r grep -Fl 'DO NOT EDIT THIS FILE - it is machine generated' \
+ | xargs -r rm -f
- Build, fix, till everything works.
Be sure to build all peers (--enable-java-awt=gtk,xlib,qt
- --enable-gconf-peer)
+ --enable-gconf-peer --enable-gstreamer-peer)
Be sure to update gnu/classpath/Configuration.java to reflect
the new version
Possibly update the gcj/javaprims.h file with scripts/classes.pl
(See below, it can only be done after the first source->bytecode
pass has finished.)
- You will need to configure with --enable-maintainer-mode and you
+ You will need to configure with --enable-java-maintainer-mode and you
will need to update the .class files and generated CNI header files in
your working tree
+- Add/Remove newly generated files:
+ - svn status classpath | grep '^\!.*\.class$' | cut -c8- | xargs svn remove
+ - svn status classpath | grep '^\?' | cut -c8- | xargs svn add
+ - svn status gnu java javax org sun | grep '^\!.*\.h$' | cut -c8- | xargs svn remove
+ - svn status gnu java javax org sun | grep '^\?' | cut -c8- | xargs svn add
Over time we plan to remove as many of the remaining divergences as
possible.
gnu/javax/print/ipp/attribute/printer.lo \
gnu/javax/print/ipp/attribute/supported.lo \
gnu/javax/security/auth.lo gnu/javax/security/auth/callback.lo \
- gnu/javax/security/auth/login.lo gnu/javax/sound/sampled/AU.lo \
- gnu/javax/sound/sampled/WAV.lo gnu/javax/swing/plaf/gnu.lo \
- gnu/javax/swing/plaf/metal.lo gnu/javax/swing/text/html.lo \
- gnu/javax/swing/text/html/css.lo \
+ gnu/javax/security/auth/login.lo gnu/javax/sound.lo \
+ gnu/javax/sound/sampled/AU.lo gnu/javax/sound/sampled/WAV.lo \
+ gnu/javax/swing/plaf/gnu.lo gnu/javax/swing/plaf/metal.lo \
+ gnu/javax/swing/text/html.lo gnu/javax/swing/text/html/css.lo \
gnu/javax/swing/text/html/parser/GnuParserDelegator.lo \
gnu/javax/swing/text/html/parser/HTML_401F.lo \
gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.lo \
javax/swing/text/html.lo javax/swing/text/html/parser.lo \
javax/swing/text/rtf.lo javax/swing/tree.lo \
javax/swing/undo.lo javax/transaction.lo \
- javax/transaction/xa.lo org/ietf/jgss.lo sun/misc.lo \
- sun/reflect.lo sun/reflect/annotation.lo sun/reflect/misc.lo \
- $(am__DEPENDENCIES_1)
+ javax/transaction/xa.lo org/ietf/jgss.lo sun/awt.lo \
+ sun/misc.lo sun/reflect.lo sun/reflect/annotation.lo \
+ sun/reflect/misc.lo $(am__DEPENDENCIES_1)
am__DEPENDENCIES_3 = gnu-CORBA.lo gnu-java-awt-dnd-peer-gtk.lo \
gnu-java-awt-peer-gtk.lo gnu-java-awt-peer-swing.lo \
gnu-java-beans.lo gnu-java-lang-management.lo \
classpath/gnu/java/awt/java2d/CubicSegment.java \
classpath/gnu/java/awt/java2d/ImagePaint.java \
classpath/gnu/java/awt/java2d/LineSegment.java \
+classpath/gnu/java/awt/java2d/Pixelizer.java \
classpath/gnu/java/awt/java2d/PolyEdge.java \
classpath/gnu/java/awt/java2d/PolyEdgeComparator.java \
classpath/gnu/java/awt/java2d/QuadSegment.java \
classpath/gnu/java/awt/java2d/RasterGraphics.java \
classpath/gnu/java/awt/java2d/Scanline.java \
classpath/gnu/java/awt/java2d/ScanlineConverter.java \
+classpath/gnu/java/awt/java2d/ScanlineCoverage.java \
classpath/gnu/java/awt/java2d/Segment.java \
classpath/gnu/java/awt/java2d/ShapeCache.java \
classpath/gnu/java/awt/java2d/TexturePaintContext.java
gnu_java_awt_peer_swing_source_files = \
classpath/gnu/java/awt/peer/swing/SwingButtonPeer.java \
classpath/gnu/java/awt/peer/swing/SwingCanvasPeer.java \
+classpath/gnu/java/awt/peer/swing/SwingCheckboxPeer.java \
classpath/gnu/java/awt/peer/swing/SwingComponent.java \
classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java \
classpath/gnu/java/awt/peer/swing/SwingContainerPeer.java \
classpath/gnu/java/awt/peer/x/GLGraphics.java \
classpath/gnu/java/awt/peer/x/ImageConverter.java \
classpath/gnu/java/awt/peer/x/KeyboardMapping.java \
+classpath/gnu/java/awt/peer/x/PixmapVolatileImage.java \
classpath/gnu/java/awt/peer/x/XDialogPeer.java \
classpath/gnu/java/awt/peer/x/XEventPump.java \
-classpath/gnu/java/awt/peer/x/XFontPeer.java \
classpath/gnu/java/awt/peer/x/XFontPeer2.java \
classpath/gnu/java/awt/peer/x/XFramePeer.java \
-classpath/gnu/java/awt/peer/x/XGraphics.java \
classpath/gnu/java/awt/peer/x/XGraphics2D.java \
classpath/gnu/java/awt/peer/x/XGraphicsConfiguration.java \
classpath/gnu/java/awt/peer/x/XGraphicsDevice.java \
classpath/gnu/java/awt/peer/x/XGraphicsEnvironment.java \
classpath/gnu/java/awt/peer/x/XImage.java \
-classpath/gnu/java/awt/peer/x/XLightweightPeer.java \
classpath/gnu/java/awt/peer/x/XToolkit.java \
-classpath/gnu/java/awt/peer/x/XWindowPeer.java
+classpath/gnu/java/awt/peer/x/XWindowPeer.java \
+classpath/gnu/java/awt/peer/x/ZPixmapDataBuffer.java
gnu_java_awt_print_source_files = \
classpath/gnu/java/awt/print/JavaPrinterGraphics.java \
classpath/gnu/javax/security/auth/login/GnuConfiguration.java
gnu_javax_security_auth_login_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_security_auth_login_source_files)))
+gnu_javax_sound_source_files = \
+classpath/gnu/javax/sound/AudioSecurityManager.java
+
+gnu_javax_sound_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_sound_source_files)))
gnu_javax_sound_midi_source_files = \
classpath/gnu/javax/sound/midi/alsa/AlsaInputPortDevice.java \
classpath/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.java \
classpath/java/nio/ByteOrder.java \
classpath/java/nio/CharBuffer.java \
classpath/java/nio/CharBufferImpl.java \
+classpath/java/nio/CharSequenceBuffer.java \
classpath/java/nio/CharViewBufferImpl.java \
java/nio/DirectByteBufferImpl.java \
classpath/java/nio/DoubleBuffer.java \
classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java \
classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java
+sun_awt_source_files = \
+classpath/sun/awt/CausedFocusEvent.java
+
+sun_awt_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(sun_awt_source_files)))
sun_misc_source_files = \
classpath/sun/misc/Service.java \
classpath/sun/misc/ServiceConfigurationError.java \
gnu/javax/security/auth.list \
gnu/javax/security/auth/callback.list \
gnu/javax/security/auth/login.list \
+ gnu/javax/sound.list \
gnu/javax/sound/sampled/AU.list \
gnu/javax/sound/sampled/WAV.list \
gnu/javax/swing/plaf/gnu.list \
javax/transaction.list \
javax/transaction/xa.list \
org/ietf/jgss.list \
+ sun/awt.list \
sun/misc.list \
sun/reflect.list \
sun/reflect/annotation.list \
$(gnu_javax_security_auth_header_files) \
$(gnu_javax_security_auth_callback_header_files) \
$(gnu_javax_security_auth_login_header_files) \
+ $(gnu_javax_sound_header_files) \
$(gnu_javax_sound_sampled_AU_header_files) \
$(gnu_javax_sound_sampled_WAV_header_files) \
$(gnu_javax_swing_plaf_gnu_header_files) \
$(javax_transaction_header_files) \
$(javax_transaction_xa_header_files) \
$(org_ietf_jgss_header_files) \
+ $(sun_awt_header_files) \
$(sun_misc_header_files) \
$(sun_reflect_header_files) \
$(sun_reflect_annotation_header_files) \
-include gnu/javax/security/auth/login.deps
+gnu/javax/sound.list: $(gnu_javax_sound_source_files)
+ @$(mkinstalldirs) $(dir $@)
+ echo $(srcdir)/classpath/lib/gnu/javax/sound/*.class > gnu/javax/sound.list
+
+-include gnu/javax/sound.deps
+
gnu-javax-sound-midi.lo: $(gnu_javax_sound_midi_source_files)
@find $(srcdir)/classpath/lib/gnu/javax/sound/midi -name '*.class' > gnu-javax-sound-midi.list
$(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-sound-midi.lo @gnu-javax-sound-midi.list
$(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o org-xml.lo @org-xml.list
@rm -f org-xml.list
+sun/awt.list: $(sun_awt_source_files)
+ @$(mkinstalldirs) $(dir $@)
+ echo $(srcdir)/classpath/lib/sun/awt/*.class > sun/awt.list
+
+-include sun/awt.deps
+
sun/misc.list: $(sun_misc_source_files)
@$(mkinstalldirs) $(dir $@)
echo $(srcdir)/classpath/lib/sun/misc/*.class > sun/misc.list
-2007-07-20 Keith Seitz <keiths@redhat.com>
+2007-07-28 Matthias Klose <doko@ubuntu.com>
- * gnu/classpath/jdwp/value/StringValue.java
+ * include/jvmti.h(jniNativeInterface): Rename type.
+
+2007-07-24 Tom Tromey <tromey@redhat.com>
+
+ PR java/32862:
+ * java/util/EnumMap.java (get): Special case emptySlot.
+ (clone): Rewrote.
+
+2007-07-23 Christian Thalinger <twisti@complang.tuwien.ac.at>
+
+ * gnu/java/nio/charset/ISO_8859_1.java: Added ISO8859-1 to
+ aliases.
+
+2007-07-23 Christian Thalinger <twisti@complang.tuwien.ac.at>
+
+ * vm/reference/sun/misc/Unsafe.java (unpark): Changed signature to
+ be compatible with OpenJDK.
+
+2007-07-13 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/awt/java2d/AbstractGraphics2D.java
+ (clip(Shape)): Call setClip when the clip changes.
+ (drawImage): Add translation.
+ (drawLine): Add translation.
+ * gnu/java/awt/peer/x/PixmapVolatileImage.java
+ (getPixmap): New method.
+ * gnu/java/awt/peer/x/XEventPump.java
+ (XEventPump): Name thread. Start as daemon thread.
+ * gnu/java/awt/peer/x/XGraphics2D.java
+ (rawDrawImage): Special handling for PixmapVolatileImage.
+ (rawDrawLine): Don't add translation here. This is done in
+ the superclass.
+ (rawFillRect): Don't add translation here. This is done in
+ the superclass.
+ (renderScanline): Added null check.
+
+2007-07-13 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/awt/peer/x/PixmapVolatileImage.java: New class.
+ * gnu/java/awt/peer/x/XGraphicsConfiguration.java
+ (createCompatibleImage(int,int)): Delegate to the 3-int overload.
+ (createCompatibleImage(int,int,int)): Implemented. Using
+ the ZPixmapDataBuffer for OPAQUE images.
+ (createCompatibleVolatileImage(int,int)): Delegate to the 3-int
+ overload.
+ (createCompatibleVolatileImage(int,int,int)): Implemented. Using
+ PixmapVolatileImage.
+ * gnu/java/awt/peer/x/XWindowPeer.java
+ (createImage): Return a PixmapVolatileImage (for now).
+ (createVolatileImage): Implemented, using PixmapVolatileImage.
+ * gnu/java/awt/peer/x/ZPixmapDataBuffer.java
+ New class.
+
+2007-07-10 Roman Kennke <roman@kennke.org>
+
+ PR 32645
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c
+ (copyPixbuf): Swap asserts.
+
+2007-07-09 Chris Burdess <dog@gnu.org>
+
+ Fixes #32672
+ * gnu/xml/dom/DomElement.java,
+ * gnu/xml/dom/DomNamedNodeMap.java: don't check owner in
+ setNamedNode when cloning.
+
+2007-07-08 Mario Torre <neugens@limasoftware.net>
+
+ * gnu/javax/sound/sampled/gstreamer: new package hierarchy.
+ * gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java: new file.
+ * gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.java:
+ likewise.
+ * gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.java: likewise.
+ * gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java: likewise.
+ * gnu/javax/sound/sampled/gstreamer/GStreamerMixerProvider.java: likewise.
+ * gnu/javax/sound/AudioSecurityManager.java: likewise.
+ * gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.java: likewise.
+ * gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.java: likewise.
+ * gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.java: likewise.
+ * gnu/javax/sound/sampled/gstreamer/io/GstAudioFileWriter.java: likewise.
+ * resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader.in:
+ likewise.
+ * resource/META-INF/services/javax.sound.sampled.spi.MixerProvider.in:
+ likewise.
+ * resource/META-INF/services/javax.sound.sampled.spi.MixerProvider:
+ likewise.
+ * native/jni/gstreamer-peer/gstclasspathsrc.c: likewise.
+ * native/jni/gstreamer-peer/gstclasspathsrc.h: likewise.
+ * native/jni/gstreamer-peer/gstinputstream.c: likewise.
+ * native/jni/gstreamer-peer/gstinputstream.h: likewise.
+ * native/jni/gstreamer-peer/GStreamerIOPeer.c: likewise.
+ * native/jni/gstreamer-peer/Makefile.am: likewise.
+ * native/jni/gstreamer-peer/.cvsignore: likewise.
+ * include/gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReaderNativePeer.h:
+ likewise.
+ * include/Makefile.am: add gstreamer generated headers.
+ * configure.ac: add gstreamer sound backend configuration.
+ The backend is currently disabled by default.
+ * native/jni/Makefile.am: code to allow compilation of the gstreamer
+ sound backend.
+ * javax/sound/sampled/spi/MixerProvider.java (isMixerSupported):
+ indentation fixes.
+ * javax/sound/sampled/AudioFormat.java (toString): fix method to display
+ informations only when available.
+ * javax/sound/sampled/DataLine.java:
+ (Info.isFormatSupported): indentation fixes.
+ (Info): indentation fixes.
+ (Info.toString): indentation fixes.
+ (Info.matches): indentation fixes.
+
+2007-07-03 Tania Bento <tbento@redhat.com>
+
+ * java/lang/Integer.java:
+ (parseInt(String,int,boolean)): Throw NumberFormatException if
+ String is just "+".
+
+2007-07-01 Chris Burdess <dog@gnu.org>
+
+ * gnu/xml/transform/WithParam.java: Handle case where content is
+ empty.
+
+2007-06-28 Tom Tromey <tromey@redhat.com>
+
+ * include/jni.h: Fixed local variables.
+
+2007-06-26 Ito Kazumitsu <kaz@maczuka.gcd.org>
+
+ * ChangeLog: Correction of a bug fix number.
+
+2007-06-25 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/awt/peer/ClasspathFontPeer.java
+ (canDisplay): Take character as integer codepoint.
+ * gnu/java/awt/peer/gtk/GdkFontPeer.java
+ (canDisplay): Take character as integer codepoint.
+ * gnu/java/awt/peer/gtk/GtkComponentPeer.java
+ (postMouseEvent): Use MouseEvent constructor with absolute coordinates
+ to avoid deadlock (over getLocationOnScreen()).
+ * gnu/java/awt/peer/gtk/VolatileImageGraphics.java
+ (getDeviceConfiguration): Fall back to the default configuration
+ if the component is not set.
+ * gnu/java/awt/peer/qt/QtFontMetrics.java
+ (canDisplay): Take character as integer codepoint.
+ * gnu/java/awt/peer/qt/QtFontPeer.java
+ (canDisplay): Take character as integer codepoint.
+ * gnu/java/awt/peer/x/XFontPeer2.java
+ (canDisplay): Take character as integer codepoint.
+ * include/gnu_java_awt_peer_qt_QtFontMetrics.h
+ (canDisplay): Take character as integer codepoint.
+ * java/awt/Font.java
+ (DIALOG): New constant.
+ (DIALOG_INPUT): New constant.
+ (MONOSPACED): New constant.
+ (SANS_SERIF): New constant.
+ (SERIF): New constant.
+ (Font(Font)): New constructor.
+ (canDisplay(char)): Use new canDisplay(int) method.
+ (canDisplay(int)): New method.
+ (hasLayoutAttributes): New method.
+ * java/awt/event/MouseEvent.java
+ (absX,absY): New fields.
+ (MouseEvent): New constructor with absolute coordinates.
+ (getLocationOnScreen): New method.
+ (getXOnScreen): New method.
+ (getYOnScreen): New method.
+ * native/jni/qt-peer/qtfontmetrics.cpp
+ (canDisplay): Take character as integer codepoint.
+
+2007-06-25 Mark Wielaard <mark@klomp.org>
+
+ * native/jni/native-lib/cpnet.c
+ (cpnet_aton) Moved variable declaration of inet6_addr so it is
+ actually in the scope of its use.
+
+2007-06-25 Dalibor Topic <robilad@kaffe.org>
+
+ * native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
+ (THROW_NO_IPV6): New macro.
+ (Java_gnu_java_net_VMPlainSocketImpl_bind6) Conditionally
+ build code if IPv6 facilities are available, otherwise
+ throw an error.
+ (Java_gnu_java_net_VMPlainSocketImpl_setMulticastInterface6,
+ Java_gnu_java_net_VMPlainSocketImpl_join6,
+ Java_gnu_java_net_VMPlainSocketImpl_leave6,
+ Java_gnu_java_net_VMPlainSocketImpl_joinGroup6,
+ Java_gnu_java_net_VMPlainSocketImpl_leaveGroup6)
+ Use THROW_NO_IPV6.
+
+ * native/jni/java-net/java_net_VMInetAddress.c
+ (Java_java_net_VMInetAddress_getHostByAddr,
+ Java_java_net_VMInetAddress_getHostByName,
+ Java_java_net_VMInetAddress_aton) Build IPv6 dependant
+ code conditionally on IPv6 facilities being available.
+ Switched if-else blocks where necessary to allow that.
+
+ * native/jni/java-net/javanet.c
+ (_javanet_get_ip_netaddr) Build IPv6 dependant code conditionally
+ on IPv6 facilities being available.
+
+ * native/jni/native-lib/cpnet.c
+ (cpnet_getHostByName, cpnet_getHostByAddr) Build IPv6 dependant
+ code conditionally on IPv6 facilities being available.
+ (cpnet_aton) Moved variable declaration of inet6_addr to the scope
+ of its use. Build IPv6 dependant code conditionally
+ on IPv6 facilities being available.
+
+ * native/jni/native-lib/cpnet.h (cpnet_newIPV6Address,
+ cpnet_isIPV6Address, cpnet_IPV6AddressToBytes,
+ cpnet_bytesToIPV6Address): Make IPv6 dependant utility functions
+ available conditionally on IPv6 facilities being available.
+
+2007-06-25 Dalibor Topic <robilad@kaffe.org>
+
+ * m4/acinclude.m4 (CLASSPATH_CHECK_JAVAC): If the user passes an
+ explicit argument to configure, just use it, and don't attempt to
+ run AC_CHECK_PROG. This makes --with-javac="javac -J-Xmx512M" work.
+
+2007-06-25 Dalibor Topic <robilad@kaffe.org>
+
+ * configure.ac: Check for MSG_WAITALL, since it does not exist on
+ Cygwin.
+
+ * native/jni/java-nio/gnu_java_nio_VMChannel.c
+ (Java_gnu_java_nio_VMChannel_receive): Define MSG_WAITALL as 0 if
+ it does not exist.
+
+2007-06-24 Ito Kazumitsu <kaz@maczuka.gcd.org>
+
+ Fixes bug #31927
+ * native/jni/java-nio/gnu_java_nio_VMChannel.c
+ (Java_gnu_java_nio_VMChannel_available): Retry using fstat if ioctl
+ fails with ENOTTY.
+
+2007-06-22 Tania Bento <tbento@redhat.com>
+
+ * java/util/Currency.java:
+ (getInstance (Locale)): Check that the country of the
+ locale given is valid. If it is not, throw an
+ IllegalArgumentException.
+
+2007-06-22 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/awt/peer/GLightweightPeer.java
+ * gnu/java/awt/peer/gtk/GdkRobotPeer.java
+ * gnu/java/awt/peer/gtk/GtkCompoonentPeer.java
+ * gnu/java/awt/peer/gtk/GtkFramePeer.java
+ * gnu/java/awt/peer/gtk/GtkWindowPeer.java
+ * gnu/java/awt/peer/qt/QtComponentPeer.java
+ * gnu/java/awt/peer/qt/QtFramePeer.java
+ * gnu/java/awt/peer/qt/QtWindowPeer.java
+ * gnu/java/awt/peer/swing/SwingComponentPeer.java
+ * gnu/java/awt/peer/swing/SwingWindowPeer.java
+ * gnu/java/awt/peer/x/XFramePeer.java:
+ Removed @Override annotations from some interface implementation
+ methods to ensure 1.5 compatibility.
+
+2007-06-22 Christian Thalinger <twisti@complang.tuwien.ac.at>
+
+ * include/jni.h (JNINativeInterface): Renamed to
+ JNINativeInterface_, added const to arguments where necessary.
+ (JNIInvokeInterface): Renamed to JNIInvokeInterface_.
+
+2007-06-22 Roman Kennke <roman@kennke.org>
+
+ * sun/awt/CausedFocusEvent.java: New class. Needed for compatibility
+ in java.awt.peer.
+ * java/awt/Dialog.java
+ (ModalExclusionType): New enum.
+ (ModalityType): New enum.
+ * java/awt/Toolkit.java
+ (isModalExclusionTypeSupported): New abstract method.
+ (isModalityTypeSupported): New abstract method.
+ * java/awt/peer/ComponentPeer.java
+ (requestFocus): New method.
+ * java/awt/peer/FramePeer.java
+ (getBoundsPrivate): New method.
+ * java/awt/peer/RobotPeer.java
+ (dispose): New method.
+ * java/awt/peer/WindowPeer.java
+ (setAlwaysOnTop): New method.
+ (updateFocusableWindowState): New method.
+ (setModalBlocked): New method.
+ (updateMinimumSize): New method.
+ (updateIconImages): New method.
+ * gnu/java/awt/peer/GLightweightPeer.java
+ (requestFocus): New method.
+ * gnu/java/awt/peer/gtk/GdkRobotPeer.java
+ (dispose): New method.
+ * gnu/java/awt/peer/gtk/GtkComponentPeer.java
+ (requestFocus): New method.
+ * gnu/java/awt/peer/gtk/GtkFramePeer.java
+ (getBoundsPrivate): New method.
+ * gnu/java/awt/peer/gtk/GtkToolkit.java
+ (isModalExclusionTypeSupported): New method.
+ (isModalityTypeSupported): New method.
+ * gnu/java/awt/peer/gtk/GtkWindowPeer.java
+ (updateIconImages): New method.
+ (updateMinimumSize): New method.
+ (setModalBlocked): New method.
+ (updateFocusableWindowState): New method.
+ (setAlwaysOnTop): New method.
+ * gnu/java/awt/peer/headless/HeadlessToolkit.java
+ (isModalExclusionTypeSupported): New method.
+ (isModalityTypeSupported): New method.
+ * gnu/java/awt/peer/qt/QtComponentPeer.java
+ (requestFocus): New method.
+ * gnu/java/awt/peer/qt/QtFramePeer.java
+ (getBoundsPrivate): New method.
+ * gnu/java/awt/peer/qt/QtToolkit.java
+ (isModalExclusionTypeSupported): New method.
+ (isModalityTypeSupported): New method.
+ * gnu/java/awt/peer/qt/QtWindowPeer.java
+ (updateIconImages): New method.
+ (updateMinimumSize): New method.
+ (setModalBlocked): New method.
+ (updateFocusableWindowState): New method.
+ (setAlwaysOnTop): New method.
+ * gnu/java/awt/peer/swing/SwingComponentPeer.java
+ (requestFocus): New method.
+ * gnu/java/awt/peer/swing/SwingToolkit.java
+ (isModalExclusionTypeSupported): New method.
+ (isModalityTypeSupported): New method.
+ * gnu/java/awt/peer/swing/SwingWindowPeer.java
+ (updateIconImages): New method.
+ (updateMinimumSize): New method.
+ (setModalBlocked): New method.
+ (updateFocusableWindowState): New method.
+ (setAlwaysOnTop): New method.
+ * gnu/java/awt/peer/x/XFramePeer.java
+ (getBoundsPrivate): New method.
+ * gnu/java/awt/peer/x/XToolkit.java
+ (isModalExclusionTypeSupported): New method.
+ (isModalityTypeSupported): New method.
+
+2007-06-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * tools/Makefile.am:
+ Compile in com.sun.tools.javah
+ * tools/com/sun/tools/javah/Main.java:
+ Javah Sun-->Classpath wrapper.
+
+2007-06-21 Christian Thalinger <twisti@complang.tuwien.ac.at>
+
+ * javax/swing/text/html/parser/AttributeList.java (getValues):
+ Check if values is null.
+
+2007-06-21 Roman Kennke <roman@kennke.org>
+
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c:
+ Fix some type signatures.
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c:
+ Fix intendation.
+
+2007-06-21 Jeroen Frijters <jeroen@frijters.net>
+
+ * java/io/ObjectStreamClass.java (getClassUID): Return 0L for
+ enums and proxies.
+
+2007-06-21 Jeroen Frijters <jeroen@frijters.net>
+
+ * java/net/URLClassLoader.java
+ (URLClassLoader(URL[],ClassLoader,URLStreamHandlerFactory):
+ Add factory to cache before calling addURLS.
+ (run): Don't call initCause() on ClassNotFoundException.
+
+2007-06-21 Jeroen Frijters <jeroen@frijters.net>
+
+ Fixes #32356
+ * java/lang/reflect/Array.java
+ (newInstance(Class,int[])): Call createMultiArray correctly.
+ (createMultiArray): Fixed dimensions processing order.
+
+2007-06-21 Jeroen Frijters <jeroen@frijters.net>
+
+ * gnu/java/net/loader/URLLoader.java
+ (URLLoader(URLClassLoader,URLStreamHandlerCache,
+ URLStreamHandlerFactory,URL,URL)): Disabiguate CodeSource constructor
+ invocation.
+ * java/awt/AWTKeyStroke.java
+ (LinkedHashMap.removeEldestEntry): Use Map.Entry to fix compile
+ error when compiled against OpenJDK java.util package.
+ * java/awt/AlphaComposite.java
+ (LinkedHashMap.removeEldestEntry): Use Map.Entry to fix compile
+ error when compiled against OpenJDK java.util package.
+
+2007-06-21 Jeroen Frijters <jeroen@frijters.net>
+
+ * gnu/java/security/Engine.java
+ (getInstance(String,String,Provider,Object[]): Use correctly cased
+ property name.
+
+2007-07-19 Keith Seitz <keiths@redhat.com>
+
+ * classpath/gnu/classpath/jdwp/value/StringValue.java
(StringValue): Tag of StringValue is STRING not OBJECT.
(write): String values are written to the wire as tag byte
and object ID, not JdwpString.
-2007-07-20 Keith Seitz <keiths@redhat.com>
+2007-07-19 Keith Seitz <keiths@redhat.com>
* gnu/classpath/jdwp/processor/ClassTypeCommandSet.java
(executeInvokeMethod): No need to use ValueFactory any more;
MethodResult.getReturnedValue now returns a Value.
- (executeNewInstance): Double-check that return result is
+ (executeNewInstance): Double-check that return result is
an ObjectValue; throw JdwpInternalErrorException if it is not.
(invokeMethod): Method IDs come from VMMethod, not VMIdManager.
Arguments are Values not Objects.
(SetThrownException): Remove.
(getResultType): Remove.
(setResultType): Remove.
- * gnu/classpath/jdwp/value/ObjectValue.java (getValue):
+ * gnu/classpath/jdwp/value/ObjectValue.java (getValue):
New method.
* vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java
(executeMethod): Replace "nonVirtual" parameter with more
generic "options" parameter.
Replace java.lang.reflect.Method parameter with VMMethod.
- Replace Object[] parameter with Value[] parameter.
+ Replace Objet[] parameter with Value[] parameter.
+
+2007-07-10 Dalibor Topic <robilad@kaffe.org>
+
+ * configure.ac (FOUND_CACAO): Removed.
+
+2007-06-01 Robin Garner <robin.garner@anu.edu.au>
+
+ Fixes #32162
+ * gnu/xml/dom/DomNode.java: Correct concurrency problem when deep
+ cloning nodes.
+
+2007-05-30 Mark Wielaard <mark@klomp.org>
+
+ Fixes bug #32030 reported by Steve.Blackburn@anu.edu.au
+ * native/jni/java-nio/gnu_java_nio_VMChannel.c
+ (Java_gnu_java_nio_VMChannel_open): Only set O_TRUNC when
+ CPNIO_APPEND is not, but O_WRONLY is set.
+
+2007-05-25 Robert Schuster <robertschuster@fsfe.org>
+
+ * gnu/java/awt/peer/x/XGraphics2D.java:
+ (rawDrawLine): Added addition of translation.
+ (rawFillRect): Dito.
+
+2007-05-25 Robert Schuster <robertschuster@fsfe.org>
+
+ * gnu/java/awt/font/opentype/OpenTypeFont.java:
+ (getGlyphIndex): Call getGlyphCharMap() instead of
+ accessing cmap field directly.
+
+2007-05-24 Ito Kazumitsu <kaz@maczuka.gcd.org>
+
+ * native/jni/java-nio/gnu_java_nio_VMChannel.c
+ (Java_gnu_java_nio_VMChannel_available): Use fstat or select as an
+ alternative to ioctl.
+ * native/jni/native-lib/cpio.c(cpio_availableBytes): Corrected typo.
+
+2007-05-24 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/math/Fixed.java
+ (trunc): New method.
+
+2007-05-24 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/awt/java2d/AbstractGraphics2D.java
+ (fillShape): Pass rendering hints to scanline converter.
+ * gnu/java/awt/java2d/ScanlineConverter.java
+ (ONE): New constant for the number 1 as fixed point number.
+ (Y_RESOLUTION): New constant for the Y resolution.
+ (doScanline): Handle the Y resolution.
+ (renderShape): Accept rendering hints.
+ (setResolution): Adjust maximum resolution with Y resolution.
+ * gnu/java/awt/java2d/ScanlineCoverage.java
+ (Iterator.handledPixelCoverage): New field.
+ (Iterator.next): Handle single pixel coverage.
+ (Iterator.hasNext): Handle single pixel coverage.
+ (Iterator.reset): Reset single pixel coverage.
+ (Range.toString): New method.
+ (Coverage.pixelCoverage): New field.
+ (add): Include Y (pixel) coverage.
+ (findOrInsert): Reset Y coverage in reused entries.
+
+2007-05-24 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/awt/java2d/ScanlineCoverage.java
+ (Iterator): New class.
+ (Range): New class.
+ (Coverage.covDelta): Made field package private.
+ (Coverage.xPos): Made field package private.
+ (iterator): New field. Stores the iterator that is reused.
+ (ScanlineCoverage): Initialize iterator.
+ (assertion): Removed.
+ (isEmpty): Refined conditions.
+ (iterate): Return Iterator instance.
+ (next): Removed. This is done by the Iterator class now.
+ (test): Removed.
+ * gnu/java/awt/java2d/ScanlineConverter.java
+ (main): Removed.
+ * gnu/java/awt/peer/x/XGraphics2D.java
+ (renderScanline): Adjust to new coverage iterator stuff.
+ * gnu/java/awt/java2d/AbstractGraphics2D.java
+ (renderScanline): Adjust to new coverage iterator stuff.
+
+2007-05-23 Jeroen Frijters <jeroen@frijters.net>
+
+ * java/util/Arrays.java
+ (copyOfRange(T,int,int)): Fixed to instantiate right array type.
+
+2007-05-22 Robert Schuster <robertschuster@fsfe.org>
+
+ * gnu/java/awt/peer/x/XEventQueue.java:
+ (handleEvent): Calculate modifier value for mouse presse
+ and release events, clip button values.
+ (buttonToModifier): New method.
+ * gnu/java/awt/peer/x/KeyboardMapping.java:
+ (mapModifiers): Added cases for alt gr and the meta key.
+
+2007-05-22 Robert Schuster <robertschuster@fsfe.org>
+
+ * gnu/java/awt/peer/x/XEventQueue.java:
+ (handleEvent): Use Input.event_window_id for
+ key presses/releases.
+
+2007-05-22 Robert Schuster <robertschuster@fsfe.org>
+
+ * gnu/java/awt/peer/x/XEventQueue.java:
+ (handleEvent): Use Input.event_window_id instead of
+ Input.child_window_id for mouse presses/releases &
+ movement.
+
+2007-05-22 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/awt/peer/x/XFontPeer2.java
+ (XFontMetrics.charWidth): Use cached Point2D instance.
+ * gnu/java/awt/peer/x/XGraphics2D.java
+ (renderScanline): New method. Renders a scanline according to
+ the coverage information.
+ (setPaint): Call super, so that the state is updated correctly.
2007-05-19 Andreas Tobler <a.tobler@schweiz.org>
PR libgcj/31659
* m4/ax_create_stdint_h.m4: Apply patch from PR31659.
- * configure: Regenerate.
-2007-05-07 Keith Seitz <keiths@redhat.com>
+2007-05-18 Andreas Tobler <a.tobler@schweiz.org>
+
+ * autogen.sh (have_libtool): Update comments for Darwin.
+
+2007-05-18 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/awt/java2d/AbstractGraphics2D.java
+ (fillScanlineAA): Removed. Replaced by renderScanline().
+ (fillScanline): Dito.
+ (renderScanline): New method. Renders a scanline according to
+ the coverage information from the scanline converter.
+ * gnu/java/awt/java2d/Pixelizer.java: New interface. Describes
+ the targets of the rasterizer.
+ * gnu/java/awt/java2d/ScanlineConverter.java
+ (alphaRes): Removed.
+ (ONE): Removed.
+ (scanlineCoverage): New field. Manages the coverage information.
+ (scanlinesPerPixel): Removed.
+ (scanlineXCov): Removed.
+ (scanlineYCov): Removed.
+ (slPix0): Removed.
+ (ScanlineConverter): Initialize scanline coverage data structure.
+ (clear): Also clear the scanline coverage.
+ (doScanline): Work with Pixelizer objects.
+ Use the ScanlineCoverage datastructure.
+ (main): New method. Performs some tests.
+ (renderShape): Work with pixelizer objects rather than directly
+ on AbstractGraphic2D. Adjust to use ScanlineCoverage datastructure.
+ (setResolution): Set resolution on ScanlineCoverage data too.
+ * gnu/java/awt/java2d/ScanlineCoverage.java: New class. Stores
+ and manages scanline coverage information.
+
+2007-05-14 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * java/rmi/MarshelledObject.java,
+ * java/rmi/activation/Activatable.java,
+ * java/rmi/activation/ActivationDesc.java,
+ * java/rmi/activation/ActivationGroup.java,
+ * java/rmi/activation/ActivationGroupDesc.java,
+ * java/rmi/activation/ActivationInstantiator.java,
+ * java/rmi/activation/ActivationMonitor.java,
+ * java/rmi/activation/Activator.java:
+ Genericized.
+
+2007-05-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * configure.ac:
+ Check if nsl library is needed for inet_pton.
+ * tools/gappletviewer.in,
+ * tools/gjar.in,
+ * tools/gjarsigner.in,
+ * tools/gjavah.in,
+ * tools/gkeytool.in,
+ * tools/gnative2ascii.in,
+ * tools/gorbd.in,
+ * tools/grmic.in,
+ * tools/grmid.in,
+ * tools/grmiregistry.in,
+ * tools/gserialver.in,
+ * tools/gtnameserv.in:
+ Remove spaces around '=' in setting of datarootdir.
+
+2007-05-11 Kyle Galloway <kgallowa@redhat.com>
+
+ * gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java
+ (executeMethods): Remove cast to ClassReferenceTypeId.
+
+2007-05-11 Jeroen Frijters <jeroen@frijters.net>
+
+ * java/lang/Float.java
+ (toString(float)): Call VMFloat instead of VMDouble.
+ (parseFloat): Call VMFloat. Fixed comment.
+ * vm/reference/java/lang/VMFloat.java
+ (toString, parseFloat): New methods.
+ NEWS: added note about these changes.
+
+2007-05-08 Kyle Galloway <kgallowa@redhat.com>
+
+ * vm/reference/VMFrame.java (<init>): Add a parameter for the "this"
+ pointer of the frame.
+
+2007-05-08 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/awt/peer/x/XFontPeer.java: Removed.
+ * gnu/java/awt/peer/x/XGraphics.java: Removed
+ * gnu/java/awt/peer/x/XFontPeer2.java
+ (XLineMetrics.getDescent): Use cached idendity transform.
+ (XFontMetrics.cachedPoint): New field. Caches a Point2D instance
+ for reuse.
+ (XFontMetrics.getAscent): Use cached idendity transform.
+ (XFontMetrics.getDescent): Use cached idendity transform.
+ (XFontMetrics.getHeight): Use cached idendity transform.
+ (XFontMetrics.charWidth): Map character to glyph index first.
+ (XFontMetrics.stringWidth): Use cached idendity transform.
+ (IDENDITY): New static field. A reused AffineTransform instance.
+
+2007-05-08 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/awt/font/FontDelegate.java
+ (getGlyphIndex): New method. Maps characters to their
+ glyph index in the font.
+ M gnu/java/awt/font/opentype/OpenTypeFont.java
+ (getGlyphIndex): New method. Maps characters to their
+ glyph index in the font.
+
+2007-05-08 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/awt/java2d/AbstractGraphics2D.java
+ (AA_SAMPLING): Removed.
+ (alpha): Removed field.
+ (edgeTable): Removed field.
+ (fillScanlineAA): Removed obsolete method.
+ (drawPolyline): Implemented by using a GeneralPath.
+ (drawPolygon): Reset the cached polygon.
+ (fillPolygon): Reset the cached polygon.
+ (fillShape): Default to antialias on for text.
+ (rawDrawLine): Use ShapeCache.
+ (rawDrawRect): Use ShapeCache.
+ (rawFillRect): Use ShapeCache.
+ (fillScanlineAA): New method for antialiased rendering.
+ * gnu/java/awt/java2d/ScanlineConverter.java
+ (scanlinesPerPixel): New field.
+ (minX,maxX): New fields.
+ (scanlineYCov,scanlineXCov): New fields.
+ (slPix0): New field.
+ (alphaRes): New field.
+ (renderShape): Add antialiasing functionality.
+ (doScanline): Add antialiasing functionality.
+ (setResolution): Add antialiasing functionality.
+ (addShape): Determine span in X direction.
+ (fit): Fix thinko.
+ * gnu/java/awt/java2d/ShapeCache.java
+ (polyline): New field for caching polylines.
+
+2007-05-08 Roman Kennke <roman@kennke.org>
+
+ * examples/gnu/classpath/examples/awt/HintingDemo.java
+ Add support for showing the original vs the hinted glyphs plus
+ a grid.
+
+2007-05-08 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * lib/Makefile.am: Print property files as well.
+
+2007-05-08 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * native/jni/gtk-peer/gtkpeer.c:
+ Added support for 64-bit architectures.
+
+2007-05-04 Chris Burdess <dog@gnu.org>
+
+ Fixes PR #31814
+ * gnu/xml/dom/DomDocument.java,
+ gnu/xml/dom/ls/SAXEventSink.java: Don't default attribute when mode is
+ #IMPLIED and value is not specified.
+ * gnu/xml/stream/XMLParser.java: Add debugging info.
+
+2007-05-03 Keith Seitz <keiths@redhat.com>
* gnu/classpath/jdwp/Jdwp.java (notify): Rewrite to call
new array-based method.
Change parameters to use arrays for events and requests.
Add suspendPolicy parameter.
+2007-05-03 Thomas Fitzsimmons <fitzsim@redhat.com>
+
+ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=237304
+ * javax/swing/text/html/HTMLEditorKit.java
+ (getStyleSheet): Throw RuntimeException when style loading fails.
+ * lib/Makefile.am: Treat css files as a property files.
+ * javax/swing/text/html/default.css: Move to...
+ * resource/javax/swing/text/html/default.css: New file.
+
2007-05-03 Andrew Haley <aph@redhat.com>
* gnu/javax/management/Server.java (Server): Record the delegate.
(unregisterMBean): Likewise.
(notify): New method.
+2007-04-30 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/awt/peer/x/XLightweightPeer.java: Removed.
+ * gnu/java/awt/peer/x/XEventPump.java
+ (handleEvent): Improved handling of event ids to window mapping.
+ * gnu/java/awt/peer/x/XFontPeer2.java:
+ Load font.properties at startup.
+ (XLineMetrics.glyphVector): New field.
+ (XLineMetrics.XLineMetrics): Get glyphVector from font delegate.
+ (XLineMetrics.getHeight): Implemented using glyph vector.
+ (XLineMetrics.getLeading): Implemented.
+ (XFontPeer2): Change hardwired font to something more common.
+ (encodeFont): New methods, encodes a font to the font.properties
+ format.
+ (validName): New method. Checks and returns a valid font name.
+ * gnu/java/awt/peer/x/XGraphics2D.java
+ (foreground): New field.
+ (rawSetPixel): Removed.
+ (rawDrawLine): Draw a segment.
+ (rawSetForeground): Removed.
+ (fillScanline): New method.
+ (fillScanlineAA): New method.
+ (setPaint): Set the foreground color.
+ (fillShape): Synchronize super behaviour.
+ (rawDrawImage): Optimize XImage.
+ * gnu/java/awt/peer/x/XGraphicsDevice.java
+ (getDisplay): Improve creation of socket.
+ (createLocalSocket): New helper method to create a local socket.
+ * gnu/java/awt/peer/x/XImage.java
+ (getGraphics): Return an XGraphics2D.
+ * gnu/java/awt/peer/x/XToolkit.java
+ (getClasspathFontPeer): Use XFontPeer2.
+ (createComponent): Removed.
+ * gnu/java/awt/peer/x/XWindowPeer.java
+ (getGraphics): Return an XGraphics2D.
+ (show): Clear the window.
+ (getFontMetrics): Use XFontPeer2.
+
+2007-04-30 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/awt/peer/swing/SwingButtonPeer.java
+ (SwingButton.handleFocusEvent): New method. Handles focus events.
+ (SwingButton.requestFocus): Overridden to avoid loop into peer
+ and back.
+ (SwingButton.requestFocus(boolean)): Overridden to avoid loop
+ into peer and back.
+ * gnu/java/awt/peer/swing/SwingCheckboxPeer.java: New class.
+ Implements CheckboxPeer for Swing toolkit.
+ * gnu/java/awt/peer/swing/SwingComponent.java
+ (handleFocusEvent): New method. Handles focus events.
+ * gnu/java/awt/peer/swing/SwingComponentPeer.java
+ (getMinimumSize): Delegate to minimumSize().
+ (getPreferredSize): Delegate to preferredSize().
+ (handleEvent): Only paint when component is showing. Coalesce
+ paint event in any case. Reformat. Handle focus events.
+ (requestFocus): Post FOCUS_GAINED event.
+ (handleFocusEvent): New method. Delegate to SwingComponent
+ object.
+ * gnu/java/awt/peer/swing/SwingContainerPeer.java
+ (addHeavyweightDescendent): Make this protected.
+ (removeHeavyweightDescendent): Make this protected.
+ (getHeavyweightDescendents): New method. Returns all registered
+ heavyweights.
+ (handleKeyEvent): Delegate to peer's handleEvent() method.
+ * gnu/java/awt/peer/swing/SwingLabelPeer.java
+ (SwingLabel.handleFocusEvent): New method.
+ * gnu/java/awt/peer/swing/SwingListPeer.java
+ (SwingList.handleFocusEvent): New method.
+ * gnu/java/awt/peer/swing/SwingPanelPeer.java
+ Fix typo and import.
+ * gnu/java/awt/peer/swing/SwingTextAreaPeer.java
+ Wrap up text area in viewport.
+ * gnu/java/awt/peer/swing/SwingTextFieldPeer.java
+ (SwingTextField.handleFocusEvent): New method.
+ (SwingTextField.requestFocus): New method.
+ (SwingTextField.requestFocus(boolean)): New method.
+
+2007-04-27 Keith Seitz <keiths@redhat.com>
+
+ * gnu/classpath/jdwp/event/EventManager.java
+ (getEventRequest): Rename to...
+ (getEventRequests): ...this.
+ Change return type to array of requests.
+ Construct a list of all matching events and return
+ them all.
+ * gnu/classpath/jdwp/Jdwp.java (notify): Use getEventRequests
+ and send event notifications for all matching requests.
+
+2007-04-27 Keith Seitz <keiths@redhat.com>
+
+ * gnu/classpath/jdwp/event/filters/LocationOnlyFilter.java
+ (matches): Use Location.equals to determine equality.
+ * vm/reference/gnu/classpath/jdwp/VMMethod.java (equals):
+ New method.
+ * gnu/classpath/jdwp/util/Location.java (equals):
+ New method.
+
+2007-04-27 Roman Kennke <roman@kennke.org>
+
+ * java/nio/CharViewBufferImpl.java
+ (slice): Fixed offset for slice buffer.
+ * java/nio/DoubleViewBufferImpl.java
+ (slice): Fixed offset for slice buffer.
+ * java/nio/FloatViewBufferImpl.java
+ (slice): Fixed offset for slice buffer.
+ * java/nio/IntViewBufferImpl.java
+ (slice): Fixed offset for slice buffer.
+ * java/nio/LongViewBufferImpl.java
+ (slice): Fixed offset for slice buffer.
+ * java/nio/ShortViewBufferImpl.java
+ (slice): Fixed offset for slice buffer.
+
+2007-04-25 Roman Kennke <roman@kennke.org>
+
+ * gnu/java/awt/peer/gtk/GdkFontPeer.java,
+ * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java,
+ * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,
+ * gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java,
+ * gnu/java/awt/peer/gtk/GtkGenericPeer.java,
+ * gnu/java/awt/peer/gtk/GtkToolkit.java:
+ Added fields to hold the native state. Added class initialization
+ things to fetch the JNI field IDs.
+ * include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h,
+ * include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h,
+ * include/gnu_java_awt_peer_gtk_GtkGenericPeer.h,
+ * include/gnu_java_awt_peer_gtk_GtkToolkit.h:
+ Added / changed class init methods for field ID initialization.
+ * native/jni/classpath/Makefile.am: Removed native_state stuff.
+ * native/jni/classpath/native_state.c,
+ * native/jni/classpath/native_state.h: Removed.
+ * native/jni/gconf-peer/Makefile.am: Removed native_state stuff.
+ * native/jni/gtk-peer/Makefile.am: Removed native_state stuff.
+ * native/jni/gtk-peer/cairographics2d.h,
+ * native/jni/gtk-peer/gdkdisplay.h,
+ * native/jni/gtk-peer/gdkfont.h,
+ * native/jni/gtk-peer/GtkDragSourceContextPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkGenericPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollbarPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c,
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,
+ * native/jni/gtk-peer/gtk_jawt.c:
+ Removed native state stuff and replaced that with an approach
+ to store the native state of an object directly in that object.
+ * native/jni/gtk-peer/gtkpeer.c: New file. Implements the new native
+ state management.
+ * native/jni/gtk-peer/gtkpeer.h: Remove NSA stuff and added
+ prototypes for new native state handling.
+
2007-04-23 Mark Wielaard <mark@klomp.org>
- * configure.ac (VERSION): Set to 0.95.
+ * doc/www.gnu.org/newsitems.txt: Add 0.95.
+ * doc/www.gnu.org/downloads/downloads.wml: Likewise.
+ * doc/www.gnu.org/announce/20070423.wml: New file.
2007-04-23 Mark Wielaard <mark@klomp.org>
PR classpath/31646:
* java/util/Arrays.java (qsort): Corrected initial median calculation.
-2007-04-19 Andrew John Hughes <gnu_andrew@member.fsf.org>
+2007-04-22 Dalibor Topic <robilad@kaffe.org>
- * m4/acinclude.m4
- (CLASSPATH_FIND_JAVAC): Allow detected JAVAC.
+ * Makefile.am (ACLOCAL_AMFLAGS): Add contents of env var
+ LOCAL_AUTORECONF_AMFLAGS to allow for systems where the user
+ has a mix of system & hacked-up autotools.
+
+2007-04-22 Dalibor Topic <robilad@kaffe.org>
+
+ * autogen.sh: Removed unnecessary -I m4 flag.
2007-04-19 Casey Marshall <csm@gnu.org>
* gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
(createSocket): New method.
+2007-04-19 Dalibor Topic <robilad@kaffe.org>
+
+ * tools/gappletviewer.in,
+ tools/gjar.in,
+ tools/gjarsigner.in,
+ tools/gjavah.in,
+ tools/gkeytool.in,
+ tools/gnative2ascii.in,
+ tools/gorbd.in,
+ tools/grmic.in,
+ tools/grmid.in,
+ tools/grmiregistry.in,
+ tools/gserialver.in,
+ tools/gtnameserv.in: Set datarootdir to fix a warning from
+ configure.
+
+2007-04-19 Dalibor Topic <robilad@kaffe.org>
+
+ * INSTALL: Removed file generated by autogen.sh.
+
+ * .cvsignore: Added INSTALL.
+
+2007-04-19 Dalibor Topic <robilad@kaffe.org>
+
+ * INSTALL: Replaced by generic install file.
+
+ * autogen.sh: Removed redundant and no longer necessary
+ sections. Use autoreconf.
+
+2007-04-19 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * m4/acinclude.m4
+ (CLASSPATH_FIND_JAVAC): Allow detected JAVAC.
+
+2007-04-19 Dalibor Topic <robilad@kaffe.org>
+
+ * lib/Makefile.am (propertyfiles, cssfiles, metafiles,
+ iconfiles) Removed variables, inlined them into resource
+ target to avoid use of shell construct and fix portability
+ warning from automake 1.10.
+
+2007-04-18 Tom Tromey <tromey@redhat.com>
+
+ * tools/gnu/classpath/tools/javah/MethodHelper.java (print):
+ Changed arguments. Directly print method name.
+ * tools/gnu/classpath/tools/javah/ClassWrapper.java
+ (methodNameMap): New field.
+ (makeVtable): Initialize it.
+ (printMethods): Compute name for bridge targets.
+
+2007-04-18 Andrew Haley <aph@redhat.com>
+
+ * gnu/java/rmi/server/UnicastConnectionManager.java
+ (UnicastConnectionManager(int port, RMIServerSocketFactory)):
+ Listen on "localhost", not localhost.
+
+2007-04-18 Dalibor Topic <robilad@kaffe.org>
+
+ * include/GtkDragSourceContextPeer.h: Removed, renamed to ..
+
+ * include/gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer.h:
+ New file.
+
+ * native/jni/gtk-peer/GtkDragSourceContextPeer.c: Include
+ gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer.h.
+
+ * include/Makefile.am (GTKPEER_H_FILES): Renamed
+ GtkDragSourceContextPeer.h to
+ gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer.h
+ per current convention. Use portable construct to create
+ gtk and libxmlj peer headers. Depend on the java source code,
+ rather then the class files in order to avoid spurious
+ regeneration.
+
+2007-04-18 Dalibor Topic <robilad@kaffe.org>
+
+ * include/Makefile.am: Use portable construct to create
+ qt peer headers. Depend on the java source code,
+ rather then the class files in order to avoid spurious
+ regeneration.
+
+2007-04-18 Dalibor Topic <robilad@kaffe.org>
+
+ * include/Makefile.am: Use portable construct to create
+ alsa and dssi peer headers. Depend on the java source code,
+ rather then the class files in order to avoid spurious
+ regeneration.
+
+2007-04-18 Dalibor Topic <robilad@kaffe.org>
+
+ * include/Makefile.am: Use portable construct to create
+ gconf peer header. Depend on the java source code, rather
+ the class file to avoid spurious regeneration.
+
+2007-04-18 Dalibor Topic <robilad@kaffe.org>
+
+ * include/gnu_java_awt_peer_qt_QtGraphicsEnvironment.h:
+ Removed empty header file.
+
+ * include/Makefile.am (QTPEER_H_FILES):
+ Removed gnu_java_awt_peer_qt_QtGraphicsEnvironment.h.
+
+2007-04-18 Dalibor Topic <robilad@kaffe.org>
+
+ * native/jni/xmlj/xmlj_xpath.c: Don't include
+ gnu_xml_libxmlj_dom_GnomeXPathNSResolver.h.
+
+ * include/gnu_xml_libxmlj_dom_GnomeXPathNSResolver.h:
+ Removed empty header file.
+
+ * include/Makefile.am (XMLJ_H_FILES): Removed
+ gnu_xml_libxmlj_dom_GnomeXPathNSResolver.h.
+
+2007-04-18 Dalibor Topic <robilad@kaffe.org>
+
+ * include/gnu_java_awt_peer_qt_QtContainerPeer.h: Removed
+ empty header file.
+
+ * include/Makefile.am (QTPEER_H_FILES): Removed
+ gnu_java_awt_peer_qt_QtContainerPeer.h.
+
2007-04-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* native/jni/java-net/local.c:
* native/jni/java-nio/gnu_java_nio_VMChannel.c,
* native/jni/native-lib/cpnet.c:
Likewise.
+
+2007-04-17 Dalibor Topic <robilad@kaffe.org>
+
+ * m4/acinclude.m4 (CLASSPATH_CHECK_JAVAH):
+ Use AC_CHECK_PROGS and AC_MSG_ERROR. Check for
+ gjavah, gcjh-wrapper-4.1 and gcjh-4.1. Error out
+ when no javah implementation can be found.
+
+2007-04-17 Dalibor Topic <robilad@kaffe.org>
+
+ * configure.ac (CLASSPATH_WITH_JAVAH): Only check if
+ the JNI headers need to be regenerated.
+
+ * m4/acinclude.m4 (USER_SPECIFIED_JAVAH): Removed unused
+ conditional.
+
+2007-04-17 Dalibor Topic <robilad@kaffe.org>
+
+ * lib/Makefile.am (JAVAH): Removed unused variable.
+
+2007-04-17 Casey Marshall <csm@gnu.org>
+
+ PR classpath/31302:
+ * gnu/javax/net/ssl/provider/SSLSocketImpl.java (SSLSocketImpl):
+ Always make a new socket.
+ (bind, connect, getInetAddress, getLocalAddress, getPort,
+ getLocalPort, getRemoteSocketAddress, getLocalSocketAddress,
+ setTcpNoDelay, getTcpNoDelay, setSoLinger, getSoLinger,
+ setOOBInline, getOOBInline, setSoTimeout, getSoTimeout,
+ setSendBufferSize, getSendBufferSize, setReceiveBufferSize,
+ getReceiveBufferSize, setKeepAlive, getKeepAlive, setTrafficClass,
+ getTrafficClass, setReuseAddress, getReuseAddress, close,
+ shutdownInput, shutdownOutput, isConnected, isBound, isClosed,
+ isInputShutdown, isOutputShutdown): Always use
+ 'underlyingSocket'.
2007-04-16 Dalibor Topic <robilad@kaffe.org>
* native/plugin/Makefile.am (libgcjwebplugin_la_LDFLAGS):
Added AM_LDFLAGS for automake 1.10.
-2007-04-15 Dalibor Topic <robilad@kaffe.org>
+2007-04-16 Tom Tromey <tromey@redhat.com>
- * depcomp, install-sh, missing, mkinstalldirs,
- doc/texinfo.tex: Removed files generated by autogen.sh.
+ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=236614
+ * gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
+ (createSocket): Change order of delegation.
- * .cvsignore: Ignore generated files depcomp, install-sh,
- missing, mkinstalldirs.
+2007-04-16 Andrew Haley <aph@redhat.com>
- * doc/.cvsignore: Ignore generated file doc/texinfo.tex.
+ * java/io/ObjectInputStream.java: (parseContent): Call (String,
+ Object) version of dumpElementln.
+ (dumpElementln(String, Object)): New method.
+ * java/io/ObjectOutputStream.java (writeObject): Call (String,
+ Object) version of dumpElementln.
+ (dumpElementln(String, Object)): New method.
+
+2007-04-16 Mark Wielaard <mark@klomp.org>
+
+ Fixes bug #31590
+ * java/net/URI.java (parseServerAuthority): Allow empty portStr.
+
+2007-04-16 Andrew Haley <aph@redhat.com>
+
+ * org/omg/IOP/TaggedComponentHelper.java (read): Use
+ read_octet_array(), not read().
+ (write): Use write_octet_array(), not write().
+
+ * org/omg/PortableServer/Servant.java (_get_delegate): Throw if no
+ delegate has been set.
+
+2007-04-16 Chris Burdess <dog@gnu.org>
+
+ * gnu/xml/stream/XMLParser.java: Work around a problem with incorrectly
+ formatted file URLs.
2007-04-15 Dalibor Topic <robilad@kaffe.org>
* native/target/.cvsignore: Removed.
+2007-04-15 Dalibor Topic <robilad@kaffe.org>
+
+ * doc/Makefile.am: Fix portability warnings from
+ automake 1.10.
+
2007-04-15 Roman Kennke <roman@kennke.org>
* native/target/Linux/.cvsignore,
2007-04-15 Dalibor Topic <robilad@kaffe.org>
- * doc/Makefile.am: Fix portability warnings from
- automake 1.10.
+ * depcomp, install-sh, missing, mkinstalldirs,
+ doc/texinfo.tex: Removed files generated by autogen.sh.
+
+ * .cvsignore: Ignore generated files depcomp, install-sh,
+ missing, mkinstalldirs.
+
+ * doc/.cvsignore: Ignore generated file doc/texinfo.tex.
2007-04-15 Dalibor Topic <robilad@kaffe.org>
2007-04-15 Dalibor Topic <robilad@kaffe.org>
- * configure.ac: Added support for Iceape libraries as
+ * configure.ac: Added support for Iceape libraries as
a substitute for Mozilla for Debian.
-2007-04-17 Tom Tromey <tromey@redhat.com>
+2007-04-12 Roman Kennke <roman@kennke.org>
- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=236614
- * gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
- (createSocket): Change order of delegation.
+ * java/nio/Buffer.java
+ (array): New abstract method.
+ (hasArray): New abstract method.
+ (arrayOffset): New abstract method.
+ (isDirect): New abstract method.
-2007-04-17 Casey Marshall <csm@gnu.org>
+2007-04-12 Roman Kennke <roman@kennke.org>
- PR classpath/31302:
- * gnu/javax/net/ssl/provider/SSLSocketImpl.java (SSLSocketImpl):
- Always make a new socket.
- (bind, connect, getInetAddress, getLocalAddress, getPort,
- getLocalPort, getRemoteSocketAddress, getLocalSocketAddress,
- setTcpNoDelay, getTcpNoDelay, setSoLinger, getSoLinger,
- setOOBInline, getOOBInline, setSoTimeout, getSoTimeout,
- setSendBufferSize, getSendBufferSize, setReceiveBufferSize,
- getReceiveBufferSize, setKeepAlive, getKeepAlive, setTrafficClass,
- getTrafficClass, setReuseAddress, getReuseAddress, close,
- shutdownInput, shutdownOutput, isConnected, isBound, isClosed,
- isInputShutdown, isOutputShutdown): Always use
- 'underlyingSocket'.
+ * java/nio/CharBuffer.java
+ (wrap(CharSequence,int,int)): Reimplemented using specialized
+ subclass.
+ * java/nio/CharSequenceBuffer.java: New class. Implements char
+ buffers that wrap CharSequences.
-2007-04-16 Mark Wielaard <mark@klomp.org>
+2007-04-12 Francis Kung <fkung@redhat.com>
- Fixes bug #31590
- * java/net/URI.java (parseServerAuthority): Allow empty portStr.
+ PR 23887
+ * gnu/java/awt/peer/gtk/CairoGraphics2D.java
+ (drawGlyphVector): Check for transforms before using optimized path.
+ * gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
+ (FreetypeGlyphVector(FreetypeGlyphVector)): Initialize glyphTransforms array
+ to null and check for nulls in copied array.
+ (hasTransforms): New method.
+ (performDefaultLayout): Check for identity transform.
+ (setGlyphTransform): Check for equality before making changes.
-2007-04-16 Chris Burdess <dog@gnu.org>
+2007-04-12 Francis Kung <fkung@redhat.com>
- * gnu/xml/stream/XMLParser.java: Work around a problem with
- incorrectly formatted file URLs.
+ PR 23887
+ * gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
+ (getGlyphLogicalBounds): Fix number of coordinates in transform call.
+ (performDefaultLayout): Respect transformation in font attributes.
+ * javax/swing/plaf/basic/BasicProgressBarUI.java
+ (getStringPlacement): Handle vertical orientations.
+ (paintString): Space vertical text properly.
-2007-04-11 Christian Thalinger <twisti@complang.tuwien.ac.at>
+2007-04-12 Francis Kung <fkung@redhat.com>
- * configure.ac: Added AC_C_INLINE.
+ PR 31539
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
+ (ft2_map): New static variable.
+ (Java_gnu_java_awt_peer_gtk_GdkFontPeer_initStaticState): Set up ft2_map.
+ (Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont): Use cached ft2_map.
+
+2007-04-12 Christian Thalinger <twisti@complang.tuwien.ac.at>
+
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c
+ (clipboard_get_func): Call DeleteLocalRef.
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkSelection.c
+ (clipboard_targets_received): Likewise.
+ (clipboard_uris_received): Likewise.
2007-04-12 Christian Thalinger <twisti@complang.tuwien.ac.at>
* native/jni/native-lib/cpnet.c (cpnet_getHostByName): Check for
different number of arguments of gethostbyname_r.
-2007-04-11 Francis Kung <fkung@redhat.com>
+2007-04-12 Mark Wielaard <mark@klomp.org>
- * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
- (Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphs): Avoid
- unneeded object reference.
- * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
- (Java_gnu_java_awt_peer_gtk_GdkFontPeer_getFontMetrics): Unlock font.
- (Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont): Remove redundant
- checks.
+ * gnu/java/awt/peer/ClasspathFontPeer.java (LRUCache): New static
+ inner class.
+ (transCache): New static LRUChache field.
+ (copyTransformToAttrs): Check whether a TransformAttribute already
+ exists in the transCache for the given AffineTransform.
-2007-04-11 Christian Thalinger <twisti@complang.tuwien.ac.at>
+2007-04-12 Mark Wielaard <mark@klomp.org>
- * native/jni/native-lib/cpproc.c (cpproc_forkAndExec): Fixed
- warning on some compilers, e.g. MIPSpro.
+ * configure.ac (COMPILE_GTK_PEER): Add check for cairo >= 1.1.8.
2007-04-11 Christian Thalinger <twisti@complang.tuwien.ac.at>
* native/jni/java-nio/javanio.c: Include fcntl.h instead of
sys/fcntl.h.
-2007-04-12 Mark Wielaard <mark@klomp.org>
+2007-04-11 Christian Thalinger <twisti@complang.tuwien.ac.at>
- * gnu/java/awt/peer/ClasspathFontPeer.java (LRUCache): New static
- inner class.
- (transCache): New static LRUChache field.
- (copyTransformToAttrs): Check whether a TransformAttribute already
- exists in the transCache for the given AffineTransform.
+ * native/jni/native-lib/cpproc.c (cpproc_forkAndExec): Fixed
+ warning on some compilers, e.g. MIPSpro.
-2007-04-12 Mark Wielaard <mark@klomp.org>
+2007-04-11 Francis Kung <fkung@redhat.com>
- * configure.ac (COMPILE_GTK_PEER): Add check for cairo >= 1.1.8.
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
+ (Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphs): Avoid unneeded
+ object reference.
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
+ (Java_gnu_java_awt_peer_gtk_GdkFontPeer_getFontMetrics): Unlock font.
+ (Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont): Remove redundant checks.
+
+2007-04-11 Christian Thalinger <twisti@complang.tuwien.ac.at>
+
+ * configure.ac: Added AC_C_INLINE.
+
+2007-04-10 Mark Wielaard <mark@klomp.org>
+
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
+ (Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile):
+ Destroy surface after it is used to create a cairo context.
2007-04-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
(quote(String)): Handle newlines and quotes
correctly.
-2007-04-10 Mark Wielaard <mark@klomp.org>
-
- * native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
- (Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile):
- Destroy surface after it is used to create a cairo context.
-
2007-04-09 Francis Kung <fkung@redhat.com>
PR 31311
* gnu_java_awt_peer_gtk_ComponentGraphics.h: Regenerated.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
(Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface): Removed.
- (Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState): Destroy surfac
-e
+ (Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState): Destroy surface
after it is used to create a cairo context.
+2007-04-07 Andrew John Hughes <gnu_andrew@member.fsf.org>
+ * javax/management/ObjectName.java:
+ (propertyValuePattern): New cache variable.
+ (parse(String)): Record in propertyListPattern
+ not propertyPattern and set propertyValuePattern.
+ (isPropertyPattern()): Semantics altered to be the
+ OR of isPropertyListPattern() and isPropertyValuePattern().
+ (isPropertyListPattern()): Implemented.
+ (isPropertyValuePattern()): Implemented.
+ (isPropertyValuePattern(String)): Implemented.
+
2007-04-07 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/ObjectName.java:
(parse(String)): Fix result of getKeyPropertyListString().
-
+
2007-04-07 Mark Wielaard <mark@klomp.org>
* resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactor,
2007-04-07 Andrew John Hughes <gnu_andrew@member.fsf.org>
+ * javax/management/ObjectName.java:
+ (checkComponents()): Separate value and
+ key illegal characters to allow value wildcards.
+
+2007-04-07 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
* javax/management/ObjectName.java
(parse(String)): Fix parsing where the wildcard
is juxtaposed between other pairs.
-
+
2007-04-06 Mark Wielaard <mark@klomp.org>
- * configure.ac (VERSION): Set to 0.95-rc.
+ * configure.ac (VERSION): Set to 0.96-pre.
2007-04-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
+2007-08-04 Matthias Klose <doko@ubuntu.com>
+
+ * java/util/EnumMap.java (clone): Add cast.
+
2007-07-12 Matthias Klose <doko@ubuntu.com>
* lib/jazzlib, tools/gnu/classpath/tools/rmi: Remove empty directories.
-Installing GNU Classpath - Last updated: June 19, 2006
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
-First, this is a development release only! Unless you are interested in
-active development and debugging, or just like running random alpha code,
-this release is probably not for you. Please see the README file for a
-list of VMs that work with GNU Classpath.
+Specifying the System Type
+==========================
-Note that if you are building from a non-released (CVS) version of GNU
-classpath, installation instructions are found in the doc/hacking.texi
-file. Or at http://www.gnu.org/software/classpath/docs/hacking.html
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
-------------------------------------------------------------------
-Suggested Software
-------------------------------------------------------------------
- GNU make ("gmake") is required for building Classpath.
+ CPU-COMPANY-SYSTEM
- For any build environment involving native libraries, these
- new versions of autoconf, automake, and libtool are required
- if changes are made that require rebuilding configure, Makefile.in,
- aclocal.m4, or config.h.in.
+where SYSTEM can have one of these forms:
- - GNU autoconf 2.59+
- - GNU automake 1.9+
- - GNU libtool 1.5+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
- When working from CVS you can run the above tools by executing
- ./autogen.sh in the source directory.
+Sharing Defaults
+================
- For building the Java bytecode (.class files), one of these
- compilers are required. You can select which compiler using
- --with-jikes, --with-gcj, --with-ecj or --with-kjc as argument to
- configure; the present default is gcj.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
- - GCJ 4.0+ (part of the GNU GCC package).
- - IBM jikes 1.19+.
- - Eclipse Compiler for Java 3.1+
- - The kjc compiler is supported with configure but we have
- been unable to successfully compile with it.
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script). Here is a another example:
+
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
- IMPORTANT: Versions of GCJ which are earlier than 4.0 contain
- bugs which make it impossible to compile the class library and
- are *not* supported any more. If you are stuck on a system where
- GCC 3.x is the system compiler we recommend using Jikes.
-
- For building the gtk+ AWT peer JNI native libraries, the following
- are required unless --disable-gtk-peer is used as an argument to
- configure.
-
- - GTK+ 2.8.x (or higher)
- - gdk-pixbuf
-
- - XTest Extension (libXtst) for GdkRobot support in java.awt.
-
- - There is a bug in earlier versions of at-spi, atk, and gail, which are
- used for GNOME accessibility. Prior to version 1.18.0 of these packages,
- gtk graphical applications should be run without accessibility (clear the
- GTK_MODULES environment variable).
-
- For building gcjwebplugin you'll need the Mozilla plugin
- support headers and libraries.
-
- The GConf-based backend for java.util.prefs needs the following
- library headers:
-
- - gconf 2.11.2 (or higher)
-
- For building the Qt AWT peer JNI native libraries you have to
- specify --enable-qt-peer and need the following library:
-
- - Qt 4.0.1
-
- For building the X AWT peers see information below
- (Building and running with the X AWT peers). You will need
- the Escher 0.2.3 library:
- http://escher.sourceforge.net
-
- Please note that at the moment most operating systems do not
- ship Qt4 by default. We recommend using GNU Classpath' Qt4
- support only for its developers and bug reporters. See
- http://developer.classpath.org/mediation/ClasspathShowcase
- for details on how to get it to work.
-
- For building the xmlj JAXP implementation (disabled by default, use
- configure --enable-xmlj) you need the following installed:
- - The XML C library for Gnome (libxml2)
- http://www.xmlsoft.org/
- Minimum version of libxml2 required: 2.6.8
-
- - The XSLT C library for Gnome (libxslt)
- http://www.xmlsoft.org/XSLT/
- Minimum version of libxslt required: 1.1.11
-
- For building the documentation you will need
-
- - texinfo 4.2 or higher.
-
- For building the ALSA midi provider code you will need
- ALSA. http://www.alsa-project.org.
-
- For building the DSSI midi synthesizer provider code you will
- need DSSI from http://dssi.sourceforge.net. This, in turn,
- introduces many dependencies, including:
-
- - liblo: the Lightweight OSC implementation
- http://plugin.org.uk/liblo/
-
- - LADSPA: Linux Audio Developer's Simple Plugin API
- http://www.ladspa.org
-
- - the JACK Audio Connection Kit: A low latency audio server
- http://jackit.sourceforge.net
-
- - libsndfile: an audio file I/O library
- http://www.mega-nerd.com/libsndfile/
-
- - fluidsynth: a real-time SoundFont 2 based soft-synth
- http://www.fluidsynth.org/
-
- For enabling the com.sun.tools.javac support in tools.zip you
- will a need jar file containing the Eclipse Java Compiler.
- Otherwise com.sun.tools.javac will not be included in tools.zip.
-
-This package was designed to use the GNU standard for configuration
-and makefiles. To build and install do the following:
-
-1). Run the "configure" script to configure the package. There are
-various options you might want to pass to configure to control how the
-package is built. Consider the following options, "configure --help"
-gives a complete list.
-
- --enable-java compile Java source default=yes
- --enable-jni compile JNI source default=yes
- --enable-gtk-peer compile GTK native peers default=yes
- --enable-qt-peer compile Qt4 native peers default=no
- --enable-default-toolkit
- fully qualified class name of default AWT toolkit
- default=no
- --enable-xmlj compile native libxml/xslt library default=no
- --enable-load-library enable to use JNI native methods default=yes
- --enable-local-sockets enable build of local Unix sockets
- --with-jikes to compile the class library using jikes
- the default is to use gcj
- --with-glibj define what to install (zip|flat|both|none)
- default=zip
- --with-escher=/path/to/escher
- enable build of the X/Escher peers, with
- the escher library at /path/to/escher, either
- in the form of a JAR file, or a directory
- containing the .class files of Escher.
- --enable-Werror whether to compile C code with -Werror which turns
- any compiler warning into a compilation failure
- default=no
- --with-gjdoc generate documentation using gjdoc default=no
- --with-jay Regenerate the parsers with jay must be given the
- path to the jay executable
- --with-glibj-zip=ABS.PATH
- use prebuilt glibj.zip class library
- --with-ecj-jar=ABS.PATH specify jar file containing the Eclipse Java
- Compiler
-
-For more flags run configure --help.
-
-2). Type "gmake" to build the package. There is no longer a
-dependency problem and we aim to keep it that way.
-
-3). Type "gmake install" to install everything. This may require
-being the superuser. The default install path is /usr/local/classpath
-you may change it by giving configure the --prefix=<path> option.
-
-Report bugs to classpath@gnu.org or much better via Savannah at this
-URL: http://savannah.gnu.org/support/?func=addsupport&group=classpath
-
-Happy Hacking!
-
-Once installed, GNU Classpath is ready to be used by any VM that supports
-using the official version of GNU Classpath. Simply ensure that
-/usr/local/classpath/share/classpath is in your $CLASSPATH environment
-variable. You'll also have to set your LD_LIBRARY_PATH
-variable (or similar system configuration) to include the Classpath
-native libraries in /usr/local/classpath/lib/classpath.
-
-*NOTE* All example paths assume the default prefix is used with configure.
-If you don't know what this means then the examples are correct.
-
-LD_LIBRARY_PATH=/usr/local/classpath/lib/classpath
-CLASSPATH=/usr/local/classpath/share/classpath/glibj.zip:.
-export LD_LIBRARY_PATH CLASSPATH
-
-More information about the VMs that use GNU Classpath can be found in the
-README file.
-
-------------------------------------------------------------------
-Building and running with the X AWT peers
-------------------------------------------------------------------
-
-In order build the X peers you need the Escher library version 0.2.3
-from http://escher.sourceforge.net . Unpack (and optionally build) the
-Escher library following the instructions in the downloaded
-package. Enable the build of the X peers by passing
---with-escher=/path/to/escher to ./configure where /path/to/escher
-either points to a directory structure or JAR file containing the
-Escher classes. For Unix systems it is preferable to also build local
-socket support by passing --enable-local-sockets, which accelerates
-the network communication to the X server significantly.
-
-In this release you have to enable the X peers at runtime by
-setting the system property awt.toolkit=gnu.java.awt.peer.x.XToolkit
-by passing -Dawt.toolkit=gnu.java.awt.peer.x.XToolkit to the java
-command when running an application.
-
-------------------------------------------------------------------
-Misc. Notes
-------------------------------------------------------------------
-Compilation is accomplished using a compiler's @file syntax. For our
-part, we avoid placing make style dependencies as rules upon the
-compilation of a particular class file and leave this up to the Java
-compiler instead.
-
-The --enable-maintainer-mode option to configure currently does very
-little and shouldn't be used by ordinary developers or users anyway.
-
-On Windows machines, the native libraries do not currently build, but
-the Java bytecode library will. Gcj trunk is beginning to work under
-Cygwin. The mingw32 version of jikes cannot follow symbolic links, you
-must use a cygwin build of jikes to access this limited functionality.
SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR)
DIST_SUBDIRS = lib doc external include native resource scripts tools examples
+# Allow users to pass site-specific flags to autoreconf via an env var.
## GCJ LOCAL: we need an extra -I here.
-ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config
+ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config ${LOCAL_AUTORECONF_FLAGS}
native: lib
$(top_srcdir)/gnu/classpath/Configuration.java.in \
$(top_srcdir)/gnu/java/security/Configuration.java.in \
$(top_srcdir)/resource/META-INF/services/java.util.prefs.PreferencesFactory.in \
+ $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader.in \
+ $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.MixerProvider.in \
../../ABOUT-NLS ../../COPYING ../../COPYING.LIB \
../../ChangeLog ../../README ../../compile ../../config.guess \
../../config.rpath ../../config.sub ../../depcomp \
CONFIG_HEADER = $(top_builddir)/include/config.h
CONFIG_CLEAN_FILES = gnu/classpath/Configuration.java \
gnu/java/security/Configuration.java \
- resource/META-INF/services/java.util.prefs.PreferencesFactory
+ resource/META-INF/services/java.util.prefs.PreferencesFactory \
+ resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader \
+ resource/META-INF/services/javax.sound.sampled.spi.MixerProvider
SOURCES =
DIST_SOURCES =
MULTISRCTOP =
CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
+CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@
+CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@
CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
CREATE_GTK_PEER_LIBRARIES_TRUE = @CREATE_GTK_PEER_LIBRARIES_TRUE@
CREATE_JNI_HEADERS_FALSE = @CREATE_JNI_HEADERS_FALSE@
FASTJAR = @FASTJAR@
FGREP = @FGREP@
FIND = @FIND@
-FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
-FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
FOUND_GCJ_FALSE = @FOUND_GCJ_FALSE@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
+GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@
+GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_FILE_READER = @GSTREAMER_FILE_READER@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
+GSTREAMER_MIXER_PROVIDER = @GSTREAMER_MIXER_PROVIDER@
+GSTREAMER_PLUGINS_BASE_CFLAGS = @GSTREAMER_PLUGINS_BASE_CFLAGS@
+GSTREAMER_PLUGINS_BASE_LIBS = @GSTREAMER_PLUGINS_BASE_LIBS@
+GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
USER_JAVAH = @USER_JAVAH@
USER_SPECIFIED_CLASSLIB_FALSE = @USER_SPECIFIED_CLASSLIB_FALSE@
USER_SPECIFIED_CLASSLIB_TRUE = @USER_SPECIFIED_CLASSLIB_TRUE@
-USER_SPECIFIED_JAVAH_FALSE = @USER_SPECIFIED_JAVAH_FALSE@
-USER_SPECIFIED_JAVAH_TRUE = @USER_SPECIFIED_JAVAH_TRUE@
USE_ESCHER_FALSE = @USE_ESCHER_FALSE@
USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
# lib first, to compile .class files before native code, last examples
SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR)
DIST_SUBDIRS = lib doc external include native resource scripts tools examples
-ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config
+
+# Allow users to pass site-specific flags to autoreconf via an env var.
+ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config ${LOCAL_AUTORECONF_FLAGS}
EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE \
ChangeLog-2003 ChangeLog-2004 ChangeLog-2005 ChangeLog-2006 \
ChangeLog.gnujaxp.1 ChangeLog.gnujaxp.2 ChangeLog.libxmlj \
cd $(top_builddir) && $(SHELL) ./config.status $@
resource/META-INF/services/java.util.prefs.PreferencesFactory: $(top_builddir)/config.status $(top_srcdir)/resource/META-INF/services/java.util.prefs.PreferencesFactory.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader: $(top_builddir)/config.status $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+resource/META-INF/services/javax.sound.sampled.spi.MixerProvider: $(top_builddir)/config.status $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.MixerProvider.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
+New in release 0.96
+
+Runtime interface changes:
+
+* Add VMFloat.toString(float) and VMFloat.parseFloat(String). Default
+ implementations are the same as previous behavior.
+
New in release 0.95 (Apr 23, 2007)
* Full merge of 1.5 generics work.
echo "You must have libtool 1.5 installed to compile $PROJECT."
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
- echo "For Darwin you need the latest stable (1.5.18) to support"
- echo "Frameworks linking. Also, you have to point ACLOCAL_FLAGS"
- echo "to this libtool/share/aclocal."
- DIE=1
-fi
-
-have_autoconf=false
-if autoconf --version < /dev/null > /dev/null 2>&1 ; then
- autoconf_version=`autoconf --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
- case $autoconf_version in
- 2.59* | 2.6[0-9]* )
- have_autoconf=true
- ;;
- esac
-fi
-if $have_autoconf ; then : ; else
- echo
- echo "You must have autoconf 2.59 or later installed for $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
- DIE=1
-fi
-
-have_automake=false
-# We know each 1.9.x version works
-if automake-1.9 --version < /dev/null > /dev/null 2>&1 ; then
- AUTOMAKE=automake-1.9
- ACLOCAL=aclocal-1.9
- have_automake=true
-elif automake --version < /dev/null > /dev/null 2>&1 ; then
- AUTOMAKE=automake
- ACLOCAL=aclocal
- automake_version=`automake --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
- case $automake_version in
- 1.9* | 1.10*)
- have_automake=true
- ;;
- esac
-fi
-if $have_automake ; then : ; else
- echo
- echo "You must have automake 1.9 or 1.10 installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
+ echo "For Darwin you need the latest stable (1.5.22) to support"
+ echo "Frameworks linking. Also, you have to point"
+ echo "LOCAL_AUTORECONF_FLAGS to this libtool/share/aclocal."
DIE=1
fi
fi
fi
-if test -z "$ACLOCAL_FLAGS"; then
-
- acdir=`$ACLOCAL --print-ac-dir`
- m4list="glib-2.0.m4 glib-gettext.m4"
-
- for file in $m4list
- do
- if [ ! -f "$acdir/$file" ]; then
- echo "WARNING: aclocal's directory is $acdir, but..."
- echo " no file $acdir/$file"
- echo " You may see fatal macro warnings below."
- echo " If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
- echo " environment variable to \"-I /some/dir\", or install"
- echo " $acdir/$file."
- echo ""
- fi
- done
-fi
-
-# Use the "-I m4 flag in order to include pkg.m4 and other .m4 files.
-$ACLOCAL -I m4 $ACLOCAL_FLAGS || exit $?
-
-${LIBTOOLIZE} --force || exit $?
-
-autoheader || exit $?
+autoreconf --force --install --warnings=no-portability || exit $?
-$AUTOMAKE --add-missing || exit $?
-autoconf || exit $?
cd $ORIGDIR || exit $?
if test "x$AUTOGEN_SUBDIR_MODE" = "xyes"; then
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for GNU Classpath 0.95.
+# Generated by GNU Autoconf 2.59 for GNU Classpath 0.96-pre.
#
# Report bugs to <classpath@gnu.org>.
#
# Identity of this package.
PACKAGE_NAME='GNU Classpath'
PACKAGE_TARNAME='classpath'
-PACKAGE_VERSION='0.95'
-PACKAGE_STRING='GNU Classpath 0.95'
+PACKAGE_VERSION='0.96-pre'
+PACKAGE_STRING='GNU Classpath 0.96-pre'
PACKAGE_BUGREPORT='classpath@gnu.org'
ac_unique_file="java/lang/System.java"
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE GENINSRC_TRUE GENINSRC_FALSE multi_basedir LIBVERSION CLASSPATH_MODULE CLASSPATH_CONVENIENCE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CREATE_COLLECTIONS_TRUE CREATE_COLLECTIONS_FALSE CREATE_JNI_LIBRARIES_TRUE CREATE_JNI_LIBRARIES_FALSE CREATE_CORE_JNI_LIBRARIES_TRUE CREATE_CORE_JNI_LIBRARIES_FALSE CREATE_GCONF_PEER_LIBRARIES_TRUE CREATE_GCONF_PEER_LIBRARIES_FALSE default_toolkit CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE CREATE_QT_PEER_LIBRARIES_TRUE CREATE_QT_PEER_LIBRARIES_FALSE CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE toolexeclibdir nativeexeclibdir glibjdir VM_BINARY FOUND_CACAO_TRUE FOUND_CACAO_FALSE CREATE_JNI_HEADERS_TRUE CREATE_JNI_HEADERS_FALSE CREATE_WRAPPERS_TRUE CREATE_WRAPPERS_FALSE LN_S LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM AR ac_ct_AR RANLIB ac_ct_RANLIB lt_ECHO CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP PERL COLLECTIONS_PREFIX LIBMAGIC LIBICONV LTLIBICONV WARNING_CFLAGS STRICT_WARNING_CFLAGS ERROR_CFLAGS PKG_CONFIG XML_CFLAGS XML_LIBS XSLT_CFLAGS XSLT_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CFLAGS GTK_LIBS FREETYPE2_CFLAGS FREETYPE2_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS CAIRO_CFLAGS CAIRO_LIBS XTEST_LIBS GCONF_CFLAGS GCONF_LIBS GDK_CFLAGS GDK_LIBS QT_CFLAGS QT_LIBS MOC MOZILLA_CFLAGS MOZILLA_LIBS GLIB_CFLAGS GLIB_LIBS PLUGIN_DIR USER_JAVAH USER_SPECIFIED_JAVAH_TRUE USER_SPECIFIED_JAVAH_FALSE CLASSPATH_INCLUDES GCJ JIKES JIKESENCODING JIKESWARNINGS KJC ECJ JAVAC FOUND_GCJ_TRUE FOUND_GCJ_FALSE FOUND_JIKES_TRUE FOUND_JIKES_FALSE FOUND_ECJ_TRUE FOUND_ECJ_FALSE FOUND_JAVAC_TRUE FOUND_JAVAC_FALSE FOUND_KJC_TRUE FOUND_KJC_FALSE USER_CLASSLIB USER_SPECIFIED_CLASSLIB_TRUE USER_SPECIFIED_CLASSLIB_FALSE vm_classes MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBDEBUG INIT_LOAD_LIBRARY ECJ_JAR JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION REMOVE MKDIR CP DATE FIND ZIP FASTJAR INSTALL_GLIBJ_ZIP_TRUE INSTALL_GLIBJ_ZIP_FALSE INSTALL_CLASS_FILES_TRUE INSTALL_CLASS_FILES_FALSE BUILD_CLASS_FILES_TRUE BUILD_CLASS_FILES_FALSE EXAMPLESDIR GJDOC CREATE_API_DOCS_TRUE CREATE_API_DOCS_FALSE JAY JAY_SKELETON REGEN_PARSERS_TRUE REGEN_PARSERS_FALSE USE_PREBUILT_GLIBJ_ZIP_TRUE USE_PREBUILT_GLIBJ_ZIP_FALSE PATH_TO_GLIBJ_ZIP USE_ESCHER_TRUE USE_ESCHER_FALSE PATH_TO_ESCHER ENABLE_LOCAL_SOCKETS_TRUE ENABLE_LOCAL_SOCKETS_FALSE DEFAULT_PREFS_PEER LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE GENINSRC_TRUE GENINSRC_FALSE multi_basedir LIBVERSION CLASSPATH_MODULE CLASSPATH_CONVENIENCE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CREATE_COLLECTIONS_TRUE CREATE_COLLECTIONS_FALSE CREATE_JNI_LIBRARIES_TRUE CREATE_JNI_LIBRARIES_FALSE CREATE_CORE_JNI_LIBRARIES_TRUE CREATE_CORE_JNI_LIBRARIES_FALSE CREATE_GCONF_PEER_LIBRARIES_TRUE CREATE_GCONF_PEER_LIBRARIES_FALSE CREATE_GSTREAMER_PEER_LIBRARIES_TRUE CREATE_GSTREAMER_PEER_LIBRARIES_FALSE default_toolkit CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE CREATE_QT_PEER_LIBRARIES_TRUE CREATE_QT_PEER_LIBRARIES_FALSE CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE toolexeclibdir nativeexeclibdir glibjdir VM_BINARY CREATE_JNI_HEADERS_TRUE CREATE_JNI_HEADERS_FALSE CREATE_WRAPPERS_TRUE CREATE_WRAPPERS_FALSE LN_S LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM AR ac_ct_AR RANLIB ac_ct_RANLIB lt_ECHO CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP PERL COLLECTIONS_PREFIX LIBMAGIC LIBICONV LTLIBICONV WARNING_CFLAGS STRICT_WARNING_CFLAGS ERROR_CFLAGS PKG_CONFIG XML_CFLAGS XML_LIBS XSLT_CFLAGS XSLT_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CFLAGS GTK_LIBS FREETYPE2_CFLAGS FREETYPE2_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS CAIRO_CFLAGS CAIRO_LIBS XTEST_LIBS GCONF_CFLAGS GCONF_LIBS GDK_CFLAGS GDK_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS GSTREAMER_BASE_CFLAGS GSTREAMER_BASE_LIBS GSTREAMER_PLUGINS_BASE_CFLAGS GSTREAMER_PLUGINS_BASE_LIBS GST_PLUGIN_LDFLAGS GSTREAMER_FILE_READER GSTREAMER_MIXER_PROVIDER QT_CFLAGS QT_LIBS MOC MOZILLA_CFLAGS MOZILLA_LIBS GLIB_CFLAGS GLIB_LIBS PLUGIN_DIR USER_JAVAH CLASSPATH_INCLUDES GCJ JIKES JIKESENCODING JIKESWARNINGS KJC ECJ JAVAC FOUND_GCJ_TRUE FOUND_GCJ_FALSE FOUND_JIKES_TRUE FOUND_JIKES_FALSE FOUND_ECJ_TRUE FOUND_ECJ_FALSE FOUND_JAVAC_TRUE FOUND_JAVAC_FALSE FOUND_KJC_TRUE FOUND_KJC_FALSE USER_CLASSLIB USER_SPECIFIED_CLASSLIB_TRUE USER_SPECIFIED_CLASSLIB_FALSE vm_classes MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBDEBUG INIT_LOAD_LIBRARY ECJ_JAR JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION REMOVE MKDIR CP DATE FIND ZIP FASTJAR INSTALL_GLIBJ_ZIP_TRUE INSTALL_GLIBJ_ZIP_FALSE INSTALL_CLASS_FILES_TRUE INSTALL_CLASS_FILES_FALSE BUILD_CLASS_FILES_TRUE BUILD_CLASS_FILES_FALSE EXAMPLESDIR GJDOC CREATE_API_DOCS_TRUE CREATE_API_DOCS_FALSE JAY JAY_SKELETON REGEN_PARSERS_TRUE REGEN_PARSERS_FALSE USE_PREBUILT_GLIBJ_ZIP_TRUE USE_PREBUILT_GLIBJ_ZIP_FALSE PATH_TO_GLIBJ_ZIP USE_ESCHER_TRUE USE_ESCHER_FALSE PATH_TO_ESCHER ENABLE_LOCAL_SOCKETS_TRUE ENABLE_LOCAL_SOCKETS_FALSE DEFAULT_PREFS_PEER LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNU Classpath 0.95 to adapt to many kinds of systems.
+\`configure' configures GNU Classpath 0.96-pre to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNU Classpath 0.95:";;
+ short | recursive ) echo "Configuration of GNU Classpath 0.96-pre:";;
esac
cat <<\_ACEOF
--disable-gconf-peer compile GConf native peers (disabled by
--disable-jni) default=yes
+ --enable-gstreamer-peer compile GStreamer native peers (disabled by
+ --disable-jni) default=no
--enable-Werror whether to compile C code with -Werror which turns
any compiler warning into a compilation failure
default=no
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-GNU Classpath configure 0.95
+GNU Classpath configure 0.96-pre
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNU Classpath $as_me 0.95, which was
+It was created by GNU Classpath $as_me 0.96-pre, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
# Define the identity of the package.
PACKAGE='classpath'
- VERSION='0.95'
+ VERSION='0.96-pre'
cat >>confdefs.h <<_ACEOF
{ (exit 1); exit 1; }; }
fi;
+# Check whether --enable-gstreamer-peer or --disable-gstreamer-peer was given.
+if test "${enable_gstreamer_peer+set}" = set; then
+ enableval="$enable_gstreamer_peer"
+ case "${enableval}" in
+ yes) COMPILE_GSTREAMER_PEER=yes ;;
+ no) COMPILE_GSTREAMER_PEER=no ;;
+ *) COMPILE_GSTREAMER_PEER=default ;;
+ esac
+else
+ COMPILE_GSTREAMER_PEER=default
+fi;
+
+
+if test "x${COMPILE_GSTREAMER_PEER}" = xyes; then
+ CREATE_GSTREAMER_PEER_LIBRARIES_TRUE=
+ CREATE_GSTREAMER_PEER_LIBRARIES_FALSE='#'
+else
+ CREATE_GSTREAMER_PEER_LIBRARIES_TRUE='#'
+ CREATE_GSTREAMER_PEER_LIBRARIES_FALSE=
+fi
+
+
+# Check whether --enable-gstreamer-peers or --disable-gstreamer-peers was given.
+if test "${enable_gstreamer_peers+set}" = set; then
+ enableval="$enable_gstreamer_peers"
+ { { echo "$as_me:$LINENO: error: No --enable-gstreamer-peers (or --disable-gstreamer-peers) option; you want --enable-gstreamer-peer" >&5
+echo "$as_me: error: No --enable-gstreamer-peers (or --disable-gstreamer-peers) option; you want --enable-gstreamer-peer" >&2;}
+ { (exit 1); exit 1; }; }
+fi;
+
# Check whether --enable-Werror or --disable-Werror was given.
if test "${enable_Werror+set}" = set; then
enableval="$enable_Werror"
-
-if test "x`basename $VM_BINARY`" = xcacao; then
- FOUND_CACAO_TRUE=
- FOUND_CACAO_FALSE='#'
-else
- FOUND_CACAO_TRUE='#'
- FOUND_CACAO_FALSE=
-fi
-
-
# Check whether --enable-regen-headers or --disable-regen-headers was given.
if test "${enable_regen_headers+set}" = set; then
enableval="$enable_regen_headers"
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5683: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5705: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5686: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5708: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5689: output\"" >&5)
+ (eval echo "\"\$as_me:5711: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6733 "configure"' > conftest.$ac_ext
+ echo '#line 6755 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7365: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7387: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7369: \$? = $ac_status" >&5
+ echo "$as_me:7391: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7687: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7709: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7691: \$? = $ac_status" >&5
+ echo "$as_me:7713: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7792: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7814: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7796: \$? = $ac_status" >&5
+ echo "$as_me:7818: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7847: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7869: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7851: \$? = $ac_status" >&5
+ echo "$as_me:7873: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10699 "configure"
+#line 10721 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10799 "configure"
+#line 10821 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15196: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15218: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15200: \$? = $ac_status" >&5
+ echo "$as_me:15222: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15295: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15317: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15299: \$? = $ac_status" >&5
+ echo "$as_me:15321: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15347: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15369: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15351: \$? = $ac_status" >&5
+ echo "$as_me:15373: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
rm -f conftest*
+ echo "$as_me:$LINENO: checking for library containing inet_pton" >&5
+echo $ECHO_N "checking for library containing inet_pton... $ECHO_C" >&6
+if test "${ac_cv_search_inet_pton+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+ac_cv_search_inet_pton=no
+if test x$gcc_no_link = xyes; then
+ { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5
+echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char inet_pton ();
+int
+main ()
+{
+inet_pton ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_search_inet_pton="none required"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+if test "$ac_cv_search_inet_pton" = no; then
+ for ac_lib in nsl; do
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ if test x$gcc_no_link = xyes; then
+ { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5
+echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char inet_pton ();
+int
+main ()
+{
+inet_pton ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_search_inet_pton="-l$ac_lib"
+break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ done
+fi
+LIBS=$ac_func_search_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_search_inet_pton" >&5
+echo "${ECHO_T}$ac_cv_search_inet_pton" >&6
+if test "$ac_cv_search_inet_pton" != no; then
+ test "$ac_cv_search_inet_pton" = "none required" || LIBS="$ac_cv_search_inet_pton $LIBS"
+
+fi
+
fi
fi
- if test "x${COMPILE_QT_PEER}" = xyes; then
+ if test "x${COMPILE_GSTREAMER_PEER}" = xyes; then
+ GST_MAJORMINOR=0.10
+ GST_REQUIRED=0.10.10
+
succeeded=no
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for QtCore QtGui >= 4.1.0" >&5
-echo $ECHO_N "checking for QtCore QtGui >= 4.1.0... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED" >&5
+echo $ECHO_N "checking for gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED... $ECHO_C" >&6
- if $PKG_CONFIG --exists "QtCore QtGui >= 4.1.0" ; then
+ if $PKG_CONFIG --exists "gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
- echo "$as_me:$LINENO: checking QT_CFLAGS" >&5
-echo $ECHO_N "checking QT_CFLAGS... $ECHO_C" >&6
- QT_CFLAGS=`$PKG_CONFIG --cflags "QtCore QtGui >= 4.1.0"`
- echo "$as_me:$LINENO: result: $QT_CFLAGS" >&5
-echo "${ECHO_T}$QT_CFLAGS" >&6
-
- echo "$as_me:$LINENO: checking QT_LIBS" >&5
-echo $ECHO_N "checking QT_LIBS... $ECHO_C" >&6
- QT_LIBS=`$PKG_CONFIG --libs "QtCore QtGui >= 4.1.0"`
- echo "$as_me:$LINENO: result: $QT_LIBS" >&5
-echo "${ECHO_T}$QT_LIBS" >&6
+ echo "$as_me:$LINENO: checking GSTREAMER_CFLAGS" >&5
+echo $ECHO_N "checking GSTREAMER_CFLAGS... $ECHO_C" >&6
+ GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED"`
+ echo "$as_me:$LINENO: result: $GSTREAMER_CFLAGS" >&5
+echo "${ECHO_T}$GSTREAMER_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking GSTREAMER_LIBS" >&5
+echo $ECHO_N "checking GSTREAMER_LIBS... $ECHO_C" >&6
+ GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED"`
+ echo "$as_me:$LINENO: result: $GSTREAMER_LIBS" >&5
+echo "${ECHO_T}$GSTREAMER_LIBS" >&6
else
- QT_CFLAGS=""
- QT_LIBS=""
+ GSTREAMER_CFLAGS=""
+ GSTREAMER_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- QT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtCore QtGui >= 4.1.0"`
-
+ GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED"`
+ echo $GSTREAMER_PKG_ERRORS
fi
fi
if test $succeeded = yes; then
- HAVE_QT4="yes"
+ :
else
- HAVE_QT4="no"
+ { { echo "$as_me:$LINENO: error: Library requirements (gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+ { (exit 1); exit 1; }; }
fi
- if test "x$HAVE_QT4" = "xyes"; then
- QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtGui`
- EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"
- as_ac_File=`echo "ac_cv_file_$QT_INCLUDE_DIR/QWidget" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $QT_INCLUDE_DIR/QWidget" >&5
-echo $ECHO_N "checking for $QT_INCLUDE_DIR/QWidget... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- test "$cross_compiling" = yes &&
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
-if test -r "$QT_INCLUDE_DIR/QWidget"; then
- eval "$as_ac_File=yes"
-else
- eval "$as_ac_File=no"
-fi
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
- { echo "$as_me:$LINENO: No extra QT_INCLUDE_DIR needed" >&5
-echo "$as_me: No extra QT_INCLUDE_DIR needed" >&6;}
-else
- as_ac_File=`echo "ac_cv_file_$EXTRA_QT_INCLUDE_DIR/QWidget" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $EXTRA_QT_INCLUDE_DIR/QWidget" >&5
-echo $ECHO_N "checking for $EXTRA_QT_INCLUDE_DIR/QWidget... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- test "$cross_compiling" = yes &&
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
-if test -r "$EXTRA_QT_INCLUDE_DIR/QWidget"; then
- eval "$as_ac_File=yes"
-else
- eval "$as_ac_File=no"
-fi
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
- QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR"
-else
- { echo "$as_me:$LINENO: WARNING: QWidget not found" >&5
-echo "$as_me: WARNING: QWidget not found" >&2;}
-fi
-fi
- # Extract the first word of "moc", so it can be a program name with args.
-set dummy moc; ac_word=$2
+
+
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_MOC+set}" = set; then
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$MOC"; then
- ac_cv_prog_MOC="$MOC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MOC="moc"
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
fi
-fi
-MOC=$ac_cv_prog_MOC
-if test -n "$MOC"; then
- echo "$as_me:$LINENO: result: $MOC" >&5
-echo "${ECHO_T}$MOC" >&6
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
- # Extract the first word of "moc-qt4", so it can be a program name with args.
-set dummy moc-qt4; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_MOC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$MOC"; then
- ac_cv_prog_MOC="$MOC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ echo "$as_me:$LINENO: checking for gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED" >&5
+echo $ECHO_N "checking for gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED... $ECHO_C" >&6
+
+ if $PKG_CONFIG --exists "gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ succeeded=yes
+
+ echo "$as_me:$LINENO: checking GSTREAMER_BASE_CFLAGS" >&5
+echo $ECHO_N "checking GSTREAMER_BASE_CFLAGS... $ECHO_C" >&6
+ GSTREAMER_BASE_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED"`
+ echo "$as_me:$LINENO: result: $GSTREAMER_BASE_CFLAGS" >&5
+echo "${ECHO_T}$GSTREAMER_BASE_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking GSTREAMER_BASE_LIBS" >&5
+echo $ECHO_N "checking GSTREAMER_BASE_LIBS... $ECHO_C" >&6
+ GSTREAMER_BASE_LIBS=`$PKG_CONFIG --libs "gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED"`
+ echo "$as_me:$LINENO: result: $GSTREAMER_BASE_LIBS" >&5
+echo "${ECHO_T}$GSTREAMER_BASE_LIBS" >&6
+ else
+ GSTREAMER_BASE_CFLAGS=""
+ GSTREAMER_BASE_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ GSTREAMER_BASE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED"`
+ echo $GSTREAMER_BASE_PKG_ERRORS
+ fi
+
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
+ fi
+ fi
+
+ if test $succeeded = yes; then
+ :
+ else
+ { { echo "$as_me:$LINENO: error: Library requirements (gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
+
+
+
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ echo "$as_me:$LINENO: checking for gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQUIRED" >&5
+echo $ECHO_N "checking for gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQUIRED... $ECHO_C" >&6
+
+ if $PKG_CONFIG --exists "gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQUIRED" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ succeeded=yes
+
+ echo "$as_me:$LINENO: checking GSTREAMER_PLUGINS_BASE_CFLAGS" >&5
+echo $ECHO_N "checking GSTREAMER_PLUGINS_BASE_CFLAGS... $ECHO_C" >&6
+ GSTREAMER_PLUGINS_BASE_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQUIRED"`
+ echo "$as_me:$LINENO: result: $GSTREAMER_PLUGINS_BASE_CFLAGS" >&5
+echo "${ECHO_T}$GSTREAMER_PLUGINS_BASE_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking GSTREAMER_PLUGINS_BASE_LIBS" >&5
+echo $ECHO_N "checking GSTREAMER_PLUGINS_BASE_LIBS... $ECHO_C" >&6
+ GSTREAMER_PLUGINS_BASE_LIBS=`$PKG_CONFIG --libs "gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQUIRED"`
+ echo "$as_me:$LINENO: result: $GSTREAMER_PLUGINS_BASE_LIBS" >&5
+echo "${ECHO_T}$GSTREAMER_PLUGINS_BASE_LIBS" >&6
+ else
+ GSTREAMER_PLUGINS_BASE_CFLAGS=""
+ GSTREAMER_PLUGINS_BASE_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ GSTREAMER_PLUGINS_BASE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQUIRED"`
+ echo $GSTREAMER_PLUGINS_BASE_PKG_ERRORS
+ fi
+
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
+ fi
+ fi
+
+ if test $succeeded = yes; then
+ :
+ else
+ { { echo "$as_me:$LINENO: error: Library requirements (gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
+
+
+ GST_PLUGIN_LDFLAGS='-module -avoid-version -Wno-unused-parameter -no-undefined'
+
+
+ GSTREAMER_FILE_READER=gnu.javax.sound.sampled.gstreamer.io.GstAudioFileReader
+ GSTREAMER_MIXER_PROVIDER=gnu.javax.sound.sampled.gstreamer.GStreamerMixerProvider
+ fi
+
+
+
+ if test "x${COMPILE_QT_PEER}" = xyes; then
+
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ echo "$as_me:$LINENO: checking for QtCore QtGui >= 4.1.0" >&5
+echo $ECHO_N "checking for QtCore QtGui >= 4.1.0... $ECHO_C" >&6
+
+ if $PKG_CONFIG --exists "QtCore QtGui >= 4.1.0" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ succeeded=yes
+
+ echo "$as_me:$LINENO: checking QT_CFLAGS" >&5
+echo $ECHO_N "checking QT_CFLAGS... $ECHO_C" >&6
+ QT_CFLAGS=`$PKG_CONFIG --cflags "QtCore QtGui >= 4.1.0"`
+ echo "$as_me:$LINENO: result: $QT_CFLAGS" >&5
+echo "${ECHO_T}$QT_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking QT_LIBS" >&5
+echo $ECHO_N "checking QT_LIBS... $ECHO_C" >&6
+ QT_LIBS=`$PKG_CONFIG --libs "QtCore QtGui >= 4.1.0"`
+ echo "$as_me:$LINENO: result: $QT_LIBS" >&5
+echo "${ECHO_T}$QT_LIBS" >&6
+ else
+ QT_CFLAGS=""
+ QT_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ QT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtCore QtGui >= 4.1.0"`
+
+ fi
+
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
+ fi
+ fi
+
+ if test $succeeded = yes; then
+ HAVE_QT4="yes"
+ else
+ HAVE_QT4="no"
+ fi
+
+ if test "x$HAVE_QT4" = "xyes"; then
+ QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtGui`
+ EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"
+ as_ac_File=`echo "ac_cv_file_$QT_INCLUDE_DIR/QWidget" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $QT_INCLUDE_DIR/QWidget" >&5
+echo $ECHO_N "checking for $QT_INCLUDE_DIR/QWidget... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "$QT_INCLUDE_DIR/QWidget"; then
+ eval "$as_ac_File=yes"
+else
+ eval "$as_ac_File=no"
+fi
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+ { echo "$as_me:$LINENO: No extra QT_INCLUDE_DIR needed" >&5
+echo "$as_me: No extra QT_INCLUDE_DIR needed" >&6;}
+else
+ as_ac_File=`echo "ac_cv_file_$EXTRA_QT_INCLUDE_DIR/QWidget" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $EXTRA_QT_INCLUDE_DIR/QWidget" >&5
+echo $ECHO_N "checking for $EXTRA_QT_INCLUDE_DIR/QWidget... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "$EXTRA_QT_INCLUDE_DIR/QWidget"; then
+ eval "$as_ac_File=yes"
+else
+ eval "$as_ac_File=no"
+fi
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+ QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR"
+else
+ { echo "$as_me:$LINENO: WARNING: QWidget not found" >&5
+echo "$as_me: WARNING: QWidget not found" >&2;}
+fi
+
+fi
+
+ # Extract the first word of "moc", so it can be a program name with args.
+set dummy moc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_MOC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$MOC"; then
+ ac_cv_prog_MOC="$MOC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_MOC="moc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+MOC=$ac_cv_prog_MOC
+if test -n "$MOC"; then
+ echo "$as_me:$LINENO: result: $MOC" >&5
+echo "${ECHO_T}$MOC" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ # Extract the first word of "moc-qt4", so it can be a program name with args.
+set dummy moc-qt4; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_MOC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$MOC"; then
+ ac_cv_prog_MOC="$MOC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me:$LINENO: checking for MSG_WAITALL" >&5
+echo $ECHO_N "checking for MSG_WAITALL... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/socket.h>
+int
+main ()
+{
+ int f = MSG_WAITALL;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MSG_WAITALL 1
+_ACEOF
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
if test "x${COMPILE_PLUGIN}" = xyes; then
fi
fi
+if test "x${REGENERATE_JNI_HEADERS}" = xyes; then
# Check whether --with-javah or --without-javah was given.
fi
else
- for javah_name in gcjh javah; do
- # Extract the first word of ""$javah_name"", so it can be a program name with args.
-set dummy "$javah_name"; ac_word=$2
+ for ac_prog in gjavah gcjh-wrapper-4.1 gcjh-4.1 gcjh javah
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_USER_JAVAH+set}" = set; then
echo "${ECHO_T}no" >&6
fi
- if test "x${USER_JAVAH}" != x; then
- break
- fi
- done
+ test -n "$USER_JAVAH" && break
+done
+
fi
-# if test "x${USER_JAVAH}" = x; then
-# echo "configure: cannot find javah" 1>&2
-# exit 1
-# fi
+ if test "x${USER_JAVAH}" = x; then
+ { { echo "$as_me:$LINENO: error: can not find javah" >&5
+echo "$as_me: error: can not find javah" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
else
fi
else
- for javah_name in gcjh javah; do
- # Extract the first word of ""$javah_name"", so it can be a program name with args.
-set dummy "$javah_name"; ac_word=$2
+ for ac_prog in gjavah gcjh-wrapper-4.1 gcjh-4.1 gcjh javah
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_USER_JAVAH+set}" = set; then
echo "${ECHO_T}no" >&6
fi
- if test "x${USER_JAVAH}" != x; then
- break
- fi
- done
+ test -n "$USER_JAVAH" && break
+done
+
fi
-# if test "x${USER_JAVAH}" = x; then
-# echo "configure: cannot find javah" 1>&2
-# exit 1
-# fi
+ if test "x${USER_JAVAH}" = x; then
+ { { echo "$as_me:$LINENO: error: can not find javah" >&5
+echo "$as_me: error: can not find javah" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
fi
fi
else
- for javah_name in gcjh javah; do
- # Extract the first word of ""$javah_name"", so it can be a program name with args.
-set dummy "$javah_name"; ac_word=$2
+ for ac_prog in gjavah gcjh-wrapper-4.1 gcjh-4.1 gcjh javah
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_USER_JAVAH+set}" = set; then
echo "${ECHO_T}no" >&6
fi
- if test "x${USER_JAVAH}" != x; then
- break
- fi
- done
+ test -n "$USER_JAVAH" && break
+done
+
fi
-# if test "x${USER_JAVAH}" = x; then
-# echo "configure: cannot find javah" 1>&2
-# exit 1
-# fi
+ if test "x${USER_JAVAH}" = x; then
+ { { echo "$as_me:$LINENO: error: can not find javah" >&5
+echo "$as_me: error: can not find javah" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
fi;
-if test "x${USER_JAVAH}" != x; then
- USER_SPECIFIED_JAVAH_TRUE=
- USER_SPECIFIED_JAVAH_FALSE='#'
-else
- USER_SPECIFIED_JAVAH_TRUE='#'
- USER_SPECIFIED_JAVAH_FALSE=
fi
-
-
-
CLASSPATH_INCLUDES="-I\$(top_srcdir)/include -I\$(top_srcdir)/native/jni/classpath -I\$(top_srcdir)/native/jni/native-lib"
if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
if test "x${withval}" != x; then
- if test -f "${withval}"; then
- JAVAC="${withval}"
- else
- # Extract the first word of ""${withval}"", so it can be a program name with args.
-set dummy "${withval}"; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_JAVAC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $JAVAC in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- ;;
-esac
-fi
-JAVAC=$ac_cv_path_JAVAC
-
-if test -n "$JAVAC"; then
- echo "$as_me:$LINENO: result: $JAVAC" >&5
-echo "${ECHO_T}$JAVAC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- fi
+ JAVAC="${withval}"
else
# Extract the first word of ""javac"", so it can be a program name with args.
set dummy "javac"; ac_word=$2
if test "x${withval}" != xno; then
if test "x" != x; then
- if test -f ""; then
- JAVAC=""
- else
- # Extract the first word of """", so it can be a program name with args.
-set dummy ""; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_JAVAC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $JAVAC in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- ;;
-esac
-fi
-JAVAC=$ac_cv_path_JAVAC
-
-if test -n "$JAVAC"; then
- echo "$as_me:$LINENO: result: $JAVAC" >&5
-echo "${ECHO_T}$JAVAC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- fi
+ JAVAC=""
else
# Extract the first word of ""javac"", so it can be a program name with args.
set dummy "javac"; ac_word=$2
if test "x" != x; then
- if test -f ""; then
- JAVAC=""
- else
- # Extract the first word of """", so it can be a program name with args.
-set dummy ""; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_JAVAC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $JAVAC in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- ;;
-esac
-fi
-JAVAC=$ac_cv_path_JAVAC
-
-if test -n "$JAVAC"; then
- echo "$as_me:$LINENO: result: $JAVAC" >&5
-echo "${ECHO_T}$JAVAC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- fi
+ JAVAC=""
else
# Extract the first word of ""javac"", so it can be a program name with args.
set dummy "javac"; ac_word=$2
- ac_config_files="$ac_config_files Makefile doc/Makefile doc/api/Makefile external/Makefile external/sax/Makefile external/w3c_dom/Makefile external/relaxngDatatype/Makefile external/jsr166/Makefile gnu/classpath/Configuration.java gnu/java/security/Configuration.java include/Makefile native/Makefile native/fdlibm/Makefile native/jawt/Makefile native/jni/Makefile native/jni/classpath/Makefile native/jni/java-io/Makefile native/jni/java-lang/Makefile native/jni/java-net/Makefile native/jni/java-nio/Makefile native/jni/java-util/Makefile native/jni/gtk-peer/Makefile native/jni/gconf-peer/Makefile native/jni/qt-peer/Makefile native/jni/xmlj/Makefile native/jni/midi-alsa/Makefile native/jni/midi-dssi/Makefile native/jni/native-lib/Makefile native/plugin/Makefile resource/Makefile resource/META-INF/services/java.util.prefs.PreferencesFactory scripts/Makefile scripts/classpath.spec lib/Makefile lib/gen-classlist.sh lib/copy-vmresources.sh tools/Makefile examples/Makefile examples/Makefile.jawt examples/Makefile.java2d"
+ ac_config_files="$ac_config_files Makefile doc/Makefile doc/api/Makefile external/Makefile external/sax/Makefile external/w3c_dom/Makefile external/relaxngDatatype/Makefile external/jsr166/Makefile gnu/classpath/Configuration.java gnu/java/security/Configuration.java include/Makefile native/Makefile native/fdlibm/Makefile native/jawt/Makefile native/jni/Makefile native/jni/classpath/Makefile native/jni/java-io/Makefile native/jni/java-lang/Makefile native/jni/java-net/Makefile native/jni/java-nio/Makefile native/jni/java-util/Makefile native/jni/gtk-peer/Makefile native/jni/gconf-peer/Makefile native/jni/gstreamer-peer/Makefile native/jni/qt-peer/Makefile native/jni/xmlj/Makefile native/jni/midi-alsa/Makefile native/jni/midi-dssi/Makefile native/jni/native-lib/Makefile native/plugin/Makefile resource/Makefile resource/META-INF/services/java.util.prefs.PreferencesFactory resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader resource/META-INF/services/javax.sound.sampled.spi.MixerProvider scripts/Makefile scripts/classpath.spec lib/Makefile lib/gen-classlist.sh lib/copy-vmresources.sh tools/Makefile examples/Makefile examples/Makefile.jawt examples/Makefile.java2d"
if test "x${COMPILE_WRAPPERS}" = xno
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${CREATE_GSTREAMER_PEER_LIBRARIES_TRUE}" && test -z "${CREATE_GSTREAMER_PEER_LIBRARIES_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"CREATE_GSTREAMER_PEER_LIBRARIES\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"CREATE_GSTREAMER_PEER_LIBRARIES\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${CREATE_XMLJ_LIBRARY_TRUE}" && test -z "${CREATE_XMLJ_LIBRARY_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"CREATE_XMLJ_LIBRARY\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${FOUND_CACAO_TRUE}" && test -z "${FOUND_CACAO_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"FOUND_CACAO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"FOUND_CACAO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
if test -z "${CREATE_JNI_HEADERS_TRUE}" && test -z "${CREATE_JNI_HEADERS_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"CREATE_JNI_HEADERS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${USER_SPECIFIED_JAVAH_TRUE}" && test -z "${USER_SPECIFIED_JAVAH_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"USER_SPECIFIED_JAVAH\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USER_SPECIFIED_JAVAH\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
if test -z "${FOUND_GCJ_TRUE}" && test -z "${FOUND_GCJ_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"FOUND_GCJ\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
} >&5
cat >&5 <<_CSEOF
-This file was extended by GNU Classpath $as_me 0.95, which was
+This file was extended by GNU Classpath $as_me 0.96-pre, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-GNU Classpath config.status 0.95
+GNU Classpath config.status 0.96-pre
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
"native/jni/java-util/Makefile" ) CONFIG_FILES="$CONFIG_FILES native/jni/java-util/Makefile" ;;
"native/jni/gtk-peer/Makefile" ) CONFIG_FILES="$CONFIG_FILES native/jni/gtk-peer/Makefile" ;;
"native/jni/gconf-peer/Makefile" ) CONFIG_FILES="$CONFIG_FILES native/jni/gconf-peer/Makefile" ;;
+ "native/jni/gstreamer-peer/Makefile" ) CONFIG_FILES="$CONFIG_FILES native/jni/gstreamer-peer/Makefile" ;;
"native/jni/qt-peer/Makefile" ) CONFIG_FILES="$CONFIG_FILES native/jni/qt-peer/Makefile" ;;
"native/jni/xmlj/Makefile" ) CONFIG_FILES="$CONFIG_FILES native/jni/xmlj/Makefile" ;;
"native/jni/midi-alsa/Makefile" ) CONFIG_FILES="$CONFIG_FILES native/jni/midi-alsa/Makefile" ;;
"native/plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES native/plugin/Makefile" ;;
"resource/Makefile" ) CONFIG_FILES="$CONFIG_FILES resource/Makefile" ;;
"resource/META-INF/services/java.util.prefs.PreferencesFactory" ) CONFIG_FILES="$CONFIG_FILES resource/META-INF/services/java.util.prefs.PreferencesFactory" ;;
+ "resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader" ) CONFIG_FILES="$CONFIG_FILES resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader" ;;
+ "resource/META-INF/services/javax.sound.sampled.spi.MixerProvider" ) CONFIG_FILES="$CONFIG_FILES resource/META-INF/services/javax.sound.sampled.spi.MixerProvider" ;;
"scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
"scripts/classpath.spec" ) CONFIG_FILES="$CONFIG_FILES scripts/classpath.spec" ;;
"lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
s,@CREATE_CORE_JNI_LIBRARIES_FALSE@,$CREATE_CORE_JNI_LIBRARIES_FALSE,;t t
s,@CREATE_GCONF_PEER_LIBRARIES_TRUE@,$CREATE_GCONF_PEER_LIBRARIES_TRUE,;t t
s,@CREATE_GCONF_PEER_LIBRARIES_FALSE@,$CREATE_GCONF_PEER_LIBRARIES_FALSE,;t t
+s,@CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@,$CREATE_GSTREAMER_PEER_LIBRARIES_TRUE,;t t
+s,@CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@,$CREATE_GSTREAMER_PEER_LIBRARIES_FALSE,;t t
s,@default_toolkit@,$default_toolkit,;t t
s,@CREATE_XMLJ_LIBRARY_TRUE@,$CREATE_XMLJ_LIBRARY_TRUE,;t t
s,@CREATE_XMLJ_LIBRARY_FALSE@,$CREATE_XMLJ_LIBRARY_FALSE,;t t
s,@nativeexeclibdir@,$nativeexeclibdir,;t t
s,@glibjdir@,$glibjdir,;t t
s,@VM_BINARY@,$VM_BINARY,;t t
-s,@FOUND_CACAO_TRUE@,$FOUND_CACAO_TRUE,;t t
-s,@FOUND_CACAO_FALSE@,$FOUND_CACAO_FALSE,;t t
s,@CREATE_JNI_HEADERS_TRUE@,$CREATE_JNI_HEADERS_TRUE,;t t
s,@CREATE_JNI_HEADERS_FALSE@,$CREATE_JNI_HEADERS_FALSE,;t t
s,@CREATE_WRAPPERS_TRUE@,$CREATE_WRAPPERS_TRUE,;t t
s,@GCONF_LIBS@,$GCONF_LIBS,;t t
s,@GDK_CFLAGS@,$GDK_CFLAGS,;t t
s,@GDK_LIBS@,$GDK_LIBS,;t t
+s,@GSTREAMER_CFLAGS@,$GSTREAMER_CFLAGS,;t t
+s,@GSTREAMER_LIBS@,$GSTREAMER_LIBS,;t t
+s,@GSTREAMER_BASE_CFLAGS@,$GSTREAMER_BASE_CFLAGS,;t t
+s,@GSTREAMER_BASE_LIBS@,$GSTREAMER_BASE_LIBS,;t t
+s,@GSTREAMER_PLUGINS_BASE_CFLAGS@,$GSTREAMER_PLUGINS_BASE_CFLAGS,;t t
+s,@GSTREAMER_PLUGINS_BASE_LIBS@,$GSTREAMER_PLUGINS_BASE_LIBS,;t t
+s,@GST_PLUGIN_LDFLAGS@,$GST_PLUGIN_LDFLAGS,;t t
+s,@GSTREAMER_FILE_READER@,$GSTREAMER_FILE_READER,;t t
+s,@GSTREAMER_MIXER_PROVIDER@,$GSTREAMER_MIXER_PROVIDER,;t t
s,@QT_CFLAGS@,$QT_CFLAGS,;t t
s,@QT_LIBS@,$QT_LIBS,;t t
s,@MOC@,$MOC,;t t
s,@GLIB_LIBS@,$GLIB_LIBS,;t t
s,@PLUGIN_DIR@,$PLUGIN_DIR,;t t
s,@USER_JAVAH@,$USER_JAVAH,;t t
-s,@USER_SPECIFIED_JAVAH_TRUE@,$USER_SPECIFIED_JAVAH_TRUE,;t t
-s,@USER_SPECIFIED_JAVAH_FALSE@,$USER_SPECIFIED_JAVAH_FALSE,;t t
s,@CLASSPATH_INCLUDES@,$CLASSPATH_INCLUDES,;t t
s,@GCJ@,$GCJ,;t t
s,@JIKES@,$JIKES,;t t
dnl define([AC_CACHE_LOAD], )dnl
dnl define([AC_CACHE_SAVE], )dnl
-AC_INIT([GNU Classpath],[0.95],[classpath@gnu.org],[classpath])
+AC_INIT([GNU Classpath],[0.96-pre],[classpath@gnu.org],[classpath])
AC_CONFIG_SRCDIR(java/lang/System.java)
dnl GCJ LOCAL
AM_CONDITIONAL(CREATE_GCONF_PEER_LIBRARIES, test "x${COMPILE_GCONF_PEER}" = xyes)
dnl -----------------------------------------------------------
-dnl GTK native peer error checking
+dnl GConf native peer error checking
dnl -----------------------------------------------------------
AC_ARG_ENABLE([gconf-peers],,AC_MSG_ERROR([No --enable-gconf-peers (or --disable-gconf-peers) option; you want --enable-gconf-peer]))
dnl ------------------------------------------------------------
+dnl GStreamer based sound provider backend (disabled by default)
+dnl ------------------------------------------------------------
+AC_ARG_ENABLE([gstreamer-peer],
+ [AS_HELP_STRING(--enable-gstreamer-peer,compile GStreamer native peers (disabled by --disable-jni) [default=no])],
+ [case "${enableval}" in
+ yes) COMPILE_GSTREAMER_PEER=yes ;;
+ no) COMPILE_GSTREAMER_PEER=no ;;
+ *) COMPILE_GSTREAMER_PEER=default ;;
+ esac],
+ [COMPILE_GSTREAMER_PEER=default])
+AM_CONDITIONAL(CREATE_GSTREAMER_PEER_LIBRARIES, test "x${COMPILE_GSTREAMER_PEER}" = xyes)
+
+dnl -----------------------------------------------------------
+dnl GStreamer native peer error checking
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE([gstreamer-peers],,AC_MSG_ERROR([No --enable-gstreamer-peers (or --disable-gstreamer-peers) option; you want --enable-gstreamer-peer]))
+
+dnl ------------------------------------------------------------
dnl Whether to compile with -Werror or not (disabled by default)
dnl ------------------------------------------------------------
AC_ARG_ENABLE([Werror],
])
AC_SUBST(VM_BINARY)
-AM_CONDITIONAL(FOUND_CACAO, test "x`basename $VM_BINARY`" = xcacao)
dnl -----------------------------------------------------------
dnl Regenerate headers at build time (disabled by default)
AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
+ AC_SEARCH_LIBS([inet_pton],[nsl])
AC_CHECK_FUNCS([ftruncate fsync select \
gethostname socket strerror fork pipe execve open close \
lseek fstat read readv write writev htonl memset htons connect \
fi
fi
+ dnl gstreamer-peer
+ if test "x${COMPILE_GSTREAMER_PEER}" = xyes; then
+ GST_MAJORMINOR=0.10
+ GST_REQUIRED=0.10.10
+
+ dnl gstreamer
+ PKG_CHECK_MODULES(GSTREAMER, gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED)
+ AC_SUBST(GSTREAMER_CFLAGS)
+ AC_SUBST(GSTREAMER_LIBS)
+
+ dnl gstreamer-base
+ PKG_CHECK_MODULES(GSTREAMER_BASE,
+ gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED)
+ AC_SUBST(GSTREAMER_BASE_CFLAGS)
+ AC_SUBST(GSTREAMER_BASE_LIBS)
+
+ dnl gstreamer-plugin-base
+ PKG_CHECK_MODULES(GSTREAMER_PLUGINS_BASE,
+ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQUIRED)
+ AC_SUBST(GSTREAMER_PLUGINS_BASE_CFLAGS)
+ AC_SUBST(GSTREAMER_PLUGINS_BASE_LIBS)
+
+ GST_PLUGIN_LDFLAGS='-module -avoid-version -Wno-unused-parameter -no-undefined'
+ AC_SUBST(GST_PLUGIN_LDFLAGS)
+
+ dnl set the gstreamer based file reader, writer and mixer
+ GSTREAMER_FILE_READER=gnu.javax.sound.sampled.gstreamer.io.GstAudioFileReader
+ GSTREAMER_MIXER_PROVIDER=gnu.javax.sound.sampled.gstreamer.GStreamerMixerProvider
+ fi
+ dnl add the gstreamer resources
+ AC_SUBST(GSTREAMER_FILE_READER)
+ AC_SUBST(GSTREAMER_MIXER_PROVIDER)
+
dnl Check for AWT related Qt4
if test "x${COMPILE_QT_PEER}" = xyes; then
PKG_CHECK_MODULES(QT, QtCore QtGui >= 4.1.0, HAVE_QT4="yes", HAVE_QT4="no")
[Define this symbol if you have SO_NOSIGPIPE]) ],
[ AC_MSG_RESULT(no)]
)
+ dnl **********************************************************************
+ dnl Check for MSG_WAITALL
+ dnl **********************************************************************
+ AC_MSG_CHECKING(for MSG_WAITALL)
+ AC_TRY_COMPILE([#include <sys/socket.h>],
+ [ int f = MSG_WAITALL; ],
+ [ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_MSG_WAITALL, 1,
+ [Define this symbol if you have MSG_WAITALL]) ],
+ [ AC_MSG_RESULT(no)]
+ )
dnl Check for plugin support headers and libraries.
if test "x${COMPILE_PLUGIN}" = xyes; then
fi
fi
-CLASSPATH_WITH_JAVAH
+if test "x${REGENERATE_JNI_HEADERS}" = xyes; then
+ CLASSPATH_WITH_JAVAH
+fi
dnl -----------------------------------------------------------
dnl Add the include files for the native abstraction layer.
native/jni/java-util/Makefile
native/jni/gtk-peer/Makefile
native/jni/gconf-peer/Makefile
+native/jni/gstreamer-peer/Makefile
native/jni/qt-peer/Makefile
native/jni/xmlj/Makefile
native/jni/midi-alsa/Makefile
native/plugin/Makefile
resource/Makefile
resource/META-INF/services/java.util.prefs.PreferencesFactory
+resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader
+resource/META-INF/services/javax.sound.sampled.spi.MixerProvider
scripts/Makefile
scripts/classpath.spec
lib/Makefile
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2006-10-15.18
+scriptversion=2005-07-09.11
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am. Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
- for arg
- do
- case $arg in
- -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
- *) set fnord "$@" "$arg" ;;
- esac
- shift # fnord
- shift # $arg
- done
- "$@"
+ "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
;;
-hp2)
- # The "hp" stanza above does not work with aCC (C++) and HP's ia64
- # compilers, which have integrated preprocessors. The correct option
- # to use with these is +Maked; it writes dependencies to a file named
- # 'foo.d', which lands next to the object file, wherever that
- # happens to be.
- # Much of this is similar to the tru64 case; see comments there.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir.libs/$base.d
- "$@" -Wc,+Maked
- else
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir$base.d
- "$@" +Maked
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile" "$tmpdepfile2"
- ;;
-
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
if test "$libtool" = yes; then
# With Tru64 cc, shared objects can also be used to make a
- # static library. This mechanism is used in libtool 1.4 series to
+ # static library. This mecanism is used in libtool 1.4 series to
# handle both shared and static libraries in a single compilation.
# With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
#
# With libtool 1.5 this exception was removed, and libtool now
# generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in $dir.libs/$base.o.d and
+ # compilations output dependencies in in $dir.libs/$base.o.d and
# in $dir$base.o.d. We have to check for both files, because
# one of the two compilations can be disabled. We should prefer
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
+CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@
+CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@
CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
CREATE_GTK_PEER_LIBRARIES_TRUE = @CREATE_GTK_PEER_LIBRARIES_TRUE@
CREATE_JNI_HEADERS_FALSE = @CREATE_JNI_HEADERS_FALSE@
FASTJAR = @FASTJAR@
FGREP = @FGREP@
FIND = @FIND@
-FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
-FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
FOUND_GCJ_FALSE = @FOUND_GCJ_FALSE@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
+GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@
+GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_FILE_READER = @GSTREAMER_FILE_READER@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
+GSTREAMER_MIXER_PROVIDER = @GSTREAMER_MIXER_PROVIDER@
+GSTREAMER_PLUGINS_BASE_CFLAGS = @GSTREAMER_PLUGINS_BASE_CFLAGS@
+GSTREAMER_PLUGINS_BASE_LIBS = @GSTREAMER_PLUGINS_BASE_LIBS@
+GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
USER_JAVAH = @USER_JAVAH@
USER_SPECIFIED_CLASSLIB_FALSE = @USER_SPECIFIED_CLASSLIB_FALSE@
USER_SPECIFIED_CLASSLIB_TRUE = @USER_SPECIFIED_CLASSLIB_TRUE@
-USER_SPECIFIED_JAVAH_FALSE = @USER_SPECIFIED_JAVAH_FALSE@
-USER_SPECIFIED_JAVAH_TRUE = @USER_SPECIFIED_JAVAH_TRUE@
USE_ESCHER_FALSE = @USE_ESCHER_FALSE@
USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
+CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@
+CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@
CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
CREATE_GTK_PEER_LIBRARIES_TRUE = @CREATE_GTK_PEER_LIBRARIES_TRUE@
CREATE_JNI_HEADERS_FALSE = @CREATE_JNI_HEADERS_FALSE@
FASTJAR = @FASTJAR@
FGREP = @FGREP@
FIND = @FIND@
-FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
-FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
FOUND_GCJ_FALSE = @FOUND_GCJ_FALSE@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
+GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@
+GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_FILE_READER = @GSTREAMER_FILE_READER@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
+GSTREAMER_MIXER_PROVIDER = @GSTREAMER_MIXER_PROVIDER@
+GSTREAMER_PLUGINS_BASE_CFLAGS = @GSTREAMER_PLUGINS_BASE_CFLAGS@
+GSTREAMER_PLUGINS_BASE_LIBS = @GSTREAMER_PLUGINS_BASE_LIBS@
+GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
USER_JAVAH = @USER_JAVAH@
USER_SPECIFIED_CLASSLIB_FALSE = @USER_SPECIFIED_CLASSLIB_FALSE@
USER_SPECIFIED_CLASSLIB_TRUE = @USER_SPECIFIED_CLASSLIB_TRUE@
-USER_SPECIFIED_JAVAH_FALSE = @USER_SPECIFIED_JAVAH_FALSE@
-USER_SPECIFIED_JAVAH_TRUE = @USER_SPECIFIED_JAVAH_TRUE@
USE_ESCHER_FALSE = @USE_ESCHER_FALSE@
USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2006-10-04.17}
+\def\texinfoversion{2005-07-05.19}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
-% Software Foundation, Inc.
+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
+% Foundation, Inc.
%
% This texinfo.tex file is free software; you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi
\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi
-% Since the category of space is not known, we have to be careful.
-\chardef\spacecat = 10
-\def\spaceisspace{\catcode`\ =\spacecat}
-
-% sometimes characters are active, so we need control sequences.
+% In some macros, we cannot use the `\? notation---the left quote is
+% in some cases the escape char.
+\chardef\backChar = `\\
\chardef\colonChar = `\:
\chardef\commaChar = `\,
-\chardef\dashChar = `\-
\chardef\dotChar = `\.
\chardef\exclamChar= `\!
-\chardef\lquoteChar= `\`
+\chardef\plusChar = `\+
\chardef\questChar = `\?
-\chardef\rquoteChar= `\'
\chardef\semiChar = `\;
\chardef\underChar = `\_
+\chardef\spaceChar = `\ %
+\chardef\spacecat = 10
+\def\spaceisspace{\catcode\spaceChar=\spacecat}
+
+{% for help with debugging.
+ % example usage: \expandafter\show\activebackslash
+ \catcode`\! = 0 \catcode`\\ = \active
+ !global!def!activebackslash{\}
+}
+
% Ignore a token.
%
\def\gobble#1{}
% before the \shipout runs.
%
\indexdummies % don't expand commands in the output.
- \normalturnoffactive % \ in index entries must not stay \, e.g., if
- % the page break happens to be in the middle of an example.
- % We don't want .vr (or whatever) entries like this:
- % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
- % "\acronym" won't work when it's read back in;
- % it needs to be
- % {\code {{\tt \backslashcurfont }acronym}
\shipout\vbox{%
% Do this early so pdf references go to the beginning of the page.
\ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
\pagebody{#1}%
\ifdim\ht\footlinebox > 0pt
% Only leave this space if the footline is nonempty.
- % (We lessened \vsize for it in \oddfootingyyy.)
+ % (We lessened \vsize for it in \oddfootingxxx.)
% The \baselineskip=24pt in plain's \makefootline has no effect.
- \vskip 24pt
+ \vskip 2\baselineskip
\unvbox\footlinebox
\fi
%
%
\def\parsearg{\parseargusing{}}
\def\parseargusing#1#2{%
- \def\argtorun{#2}%
+ \def\next{#2}%
\begingroup
\obeylines
\spaceisspace
\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
\def\temp{#3}%
\ifx\temp\empty
- % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
+ % We cannot use \next here, as it holds the macro to run;
+ % thus we reuse \temp.
\let\temp\finishparsearg
\else
\let\temp\argcheckspaces
% If a _delimited_ argument is enclosed in braces, they get stripped; so
% to get _exactly_ the rest of the line, we had to prevent such situation.
% We prepended an \empty token at the very beginning and we expand it now,
-% just before passing the control to \argtorun.
+% just before passing the control to \next.
% (Similarily, we have to think about #3 of \argcheckspacesY above: it is
% either the null string, or it ends with \^^M---thus there is no danger
% that a pair of braces would be stripped.
%
% But first, we have to remove the trailing space token.
%
-\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
+\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}}
% \parseargdef\foo{...}
% is roughly equivalent to
% _ active, and distinguish by seeing if the current family is \slfam,
% which is what @var uses.
{
- \catcode`\_ = \active
+ \catcode\underChar = \active
\gdef\mathunderscore{%
- \catcode`\_=\active
+ \catcode\underChar=\active
\def_{\ifnum\fam=\slfam \_\else\sb\fi}%
}
}
\def\minus{$-$}
% @dots{} outputs an ellipsis using the current font.
-% We do .5em per period so that it has the same spacing in the cm
-% typewriter fonts as three actual period characters; on the other hand,
-% in other typewriter fonts three periods are wider than 1.5em. So do
-% whichever is larger.
+% We do .5em per period so that it has the same spacing in a typewriter
+% font as three actual period characters.
%
\def\dots{%
\leavevmode
- \setbox0=\hbox{...}% get width of three periods
- \ifdim\wd0 > 1.5em
- \dimen0 = \wd0
- \else
- \dimen0 = 1.5em
- \fi
- \hbox to \dimen0{%
- \hskip 0pt plus.25fil
- .\hskip 0pt plus1fil
- .\hskip 0pt plus1fil
- .\hskip 0pt plus.5fil
+ \hbox to 1.5em{%
+ \hskip 0pt plus 0.25fil
+ .\hfil.\hfil.%
+ \hskip 0pt plus 0.5fil
}%
}
\fi
\fi
-% PDF uses PostScript string constants for the names of xref targets,
+% PDF uses PostScript string constants for the names of xref targets, to
% for display in the outlines, and in other places. Thus, we have to
% double any backslashes. Otherwise, a name like "\node" will be
% interpreted as a newline (\n), followed by o, d, e. Not good.
% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
% (and related messages, the final outcome is that it is up to the TeX
% user to double the backslashes and otherwise make the string valid, so
-% that's what we do).
+% that's we do).
% double active backslashes.
%
{\catcode`\@=0 \catcode`\\=\active
+ @gdef@activebackslash{@catcode`@\=@active @otherbackslash}
@gdef@activebackslashdouble{%
- @catcode`@\=@active
+ @catcode@backChar=@active
@let\=@doublebackslash}
}
\def\backslashparens#1{%
\xdef#1{#1}% redefine it as its expansion; the definition is simply
% \lastnode when called from \setref -> \pdfmkdest.
- \HyPsdSubst{(}{\realbackslash(}{#1}%
- \HyPsdSubst{)}{\realbackslash)}{#1}%
+ \HyPsdSubst{(}{\backslashlparen}{#1}%
+ \HyPsdSubst{)}{\backslashrparen}{#1}%
+}
+
+{\catcode\exclamChar = 0 \catcode\backChar = \other
+ !gdef!backslashlparen{\(}%
+ !gdef!backslashrparen{\)}%
}
\ifpdf
\input pdfcolor
\pdfcatalog{/PageMode /UseOutlines}%
- % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
\def\dopdfimage#1#2#3{%
- \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
- \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
+ \def\imagewidth{#2}%
+ \def\imageheight{#3}%
% without \immediate, pdftex seg faults when the same image is
% included twice. (Version 3.14159-pre-1.0-unofficial-20010704.)
\ifnum\pdftexversion < 14
\else
\immediate\pdfximage
\fi
- \ifdim \wd0 >0pt width \imagewidth \fi
- \ifdim \wd2 >0pt height \imageheight \fi
+ \ifx\empty\imagewidth\else width \imagewidth \fi
+ \ifx\empty\imageheight\else height \imageheight \fi
\ifnum\pdftexversion<13
#1.pdf%
\else
% now, I guess we'll just let the pdf reader have its way.
\indexnofonts
\setupdatafile
- \catcode`\\=\active \otherbackslash
+ \activebackslash
\input \jobname.toc
\endgroup
}
\else
\let \startlink \pdfstartlink
\fi
- % make a live url in pdf output.
\def\pdfurl#1{%
\begingroup
- % it seems we really need yet another set of dummies; have not
- % tried to figure out what each command should do in the context
- % of @url. for now, just make @/ a no-op, that's the only one
- % people have actually reported a problem with.
- %
- \normalturnoffactive
- \def\@{@}%
- \let\/=\empty
+ \normalturnoffactive\def\@{@}%
\makevalueexpandable
\leavevmode\Red
\startlink attr{/Border [0 0 0]}%
% We don't need math for this font style.
\def\ttsl{\setfontstyle{ttsl}}
-
% Default leading.
\newdimen\textleading \textleading = 13.2pt
}%
}
-
% Set the font macro #1 to the font named #2, adding on the
% specified font prefix (normally `cm').
% #3 is the font's design size, #4 is a scale factor
\def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
-
% Use cm as the default font prefix.
% To specify the font prefix, you must define \fontprefix
% before you read in texinfo.tex.
\def\scshape{csc}
\def\scbshape{csc}
-% Definitions for a main text size of 11pt. This is the default in
-% Texinfo.
-%
-\def\definetextfontsizexi{
% Text fonts (11.2pt, magstep1).
\def\textnominalsize{11pt}
\edef\mainmagstep{\magstephalf}
\font\reducedi=cmmi10
\font\reducedsy=cmsy10
-% reset the current fonts
-\textfonts
-\rm
-} % end of 11pt text font size definitions
-
-
-% Definitions to make the main text be 10pt Computer Modern, with
-% section, chapter, etc., sizes following suit. This is for the GNU
-% Press printing of the Emacs 22 manual. Maybe other manuals in the
-% future. Used with @smallbook, which sets the leading to 12pt.
-%
-\def\definetextfontsizex{%
-% Text fonts (10pt).
-\def\textnominalsize{10pt}
-\edef\mainmagstep{1000}
-\setfont\textrm\rmshape{10}{\mainmagstep}
-\setfont\texttt\ttshape{10}{\mainmagstep}
-\setfont\textbf\bfshape{10}{\mainmagstep}
-\setfont\textit\itshape{10}{\mainmagstep}
-\setfont\textsl\slshape{10}{\mainmagstep}
-\setfont\textsf\sfshape{10}{\mainmagstep}
-\setfont\textsc\scshape{10}{\mainmagstep}
-\setfont\textttsl\ttslshape{10}{\mainmagstep}
-\font\texti=cmmi10 scaled \mainmagstep
-\font\textsy=cmsy10 scaled \mainmagstep
-
-% A few fonts for @defun names and args.
-\setfont\defbf\bfshape{10}{\magstephalf}
-\setfont\deftt\ttshape{10}{\magstephalf}
-\setfont\defttsl\ttslshape{10}{\magstephalf}
-\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
-
-% Fonts for indices, footnotes, small examples (9pt).
-\def\smallnominalsize{9pt}
-\setfont\smallrm\rmshape{9}{1000}
-\setfont\smalltt\ttshape{9}{1000}
-\setfont\smallbf\bfshape{10}{900}
-\setfont\smallit\itshape{9}{1000}
-\setfont\smallsl\slshape{9}{1000}
-\setfont\smallsf\sfshape{9}{1000}
-\setfont\smallsc\scshape{10}{900}
-\setfont\smallttsl\ttslshape{10}{900}
-\font\smalli=cmmi9
-\font\smallsy=cmsy9
-
-% Fonts for small examples (8pt).
-\def\smallernominalsize{8pt}
-\setfont\smallerrm\rmshape{8}{1000}
-\setfont\smallertt\ttshape{8}{1000}
-\setfont\smallerbf\bfshape{10}{800}
-\setfont\smallerit\itshape{8}{1000}
-\setfont\smallersl\slshape{8}{1000}
-\setfont\smallersf\sfshape{8}{1000}
-\setfont\smallersc\scshape{10}{800}
-\setfont\smallerttsl\ttslshape{10}{800}
-\font\smalleri=cmmi8
-\font\smallersy=cmsy8
-
-% Fonts for title page (20.4pt):
-\def\titlenominalsize{20pt}
-\setfont\titlerm\rmbshape{12}{\magstep3}
-\setfont\titleit\itbshape{10}{\magstep4}
-\setfont\titlesl\slbshape{10}{\magstep4}
-\setfont\titlett\ttbshape{12}{\magstep3}
-\setfont\titlettsl\ttslshape{10}{\magstep4}
-\setfont\titlesf\sfbshape{17}{\magstep1}
-\let\titlebf=\titlerm
-\setfont\titlesc\scbshape{10}{\magstep4}
-\font\titlei=cmmi12 scaled \magstep3
-\font\titlesy=cmsy10 scaled \magstep4
-\def\authorrm{\secrm}
-\def\authortt{\sectt}
-
-% Chapter fonts (14.4pt).
-\def\chapnominalsize{14pt}
-\setfont\chaprm\rmbshape{12}{\magstep1}
-\setfont\chapit\itbshape{10}{\magstep2}
-\setfont\chapsl\slbshape{10}{\magstep2}
-\setfont\chaptt\ttbshape{12}{\magstep1}
-\setfont\chapttsl\ttslshape{10}{\magstep2}
-\setfont\chapsf\sfbshape{12}{\magstep1}
-\let\chapbf\chaprm
-\setfont\chapsc\scbshape{10}{\magstep2}
-\font\chapi=cmmi12 scaled \magstep1
-\font\chapsy=cmsy10 scaled \magstep2
-
-% Section fonts (12pt).
-\def\secnominalsize{12pt}
-\setfont\secrm\rmbshape{12}{1000}
-\setfont\secit\itbshape{10}{\magstep1}
-\setfont\secsl\slbshape{10}{\magstep1}
-\setfont\sectt\ttbshape{12}{1000}
-\setfont\secttsl\ttslshape{10}{\magstep1}
-\setfont\secsf\sfbshape{12}{1000}
-\let\secbf\secrm
-\setfont\secsc\scbshape{10}{\magstep1}
-\font\seci=cmmi12
-\font\secsy=cmsy10 scaled \magstep1
-
-% Subsection fonts (10pt).
-\def\ssecnominalsize{10pt}
-\setfont\ssecrm\rmbshape{10}{1000}
-\setfont\ssecit\itbshape{10}{1000}
-\setfont\ssecsl\slbshape{10}{1000}
-\setfont\ssectt\ttbshape{10}{1000}
-\setfont\ssecttsl\ttslshape{10}{1000}
-\setfont\ssecsf\sfbshape{10}{1000}
-\let\ssecbf\ssecrm
-\setfont\ssecsc\scbshape{10}{1000}
-\font\sseci=cmmi10
-\font\ssecsy=cmsy10
-
-% Reduced fonts for @acro in text (9pt).
-\def\reducednominalsize{9pt}
-\setfont\reducedrm\rmshape{9}{1000}
-\setfont\reducedtt\ttshape{9}{1000}
-\setfont\reducedbf\bfshape{10}{900}
-\setfont\reducedit\itshape{9}{1000}
-\setfont\reducedsl\slshape{9}{1000}
-\setfont\reducedsf\sfshape{9}{1000}
-\setfont\reducedsc\scshape{10}{900}
-\setfont\reducedttsl\ttslshape{10}{900}
-\font\reducedi=cmmi9
-\font\reducedsy=cmsy9
-
-% reduce space between paragraphs
-\divide\parskip by 2
-
-% reset the current fonts
-\textfonts
-\rm
-} % end of 10pt text font size definitions
-
-
-% We provide the user-level command
-% @fonttextsize 10
-% (or 11) to redefine the text font size. pt is assumed.
-%
-\def\xword{10}
-\def\xiword{11}
-%
-\parseargdef\fonttextsize{%
- \def\textsizearg{#1}%
- \wlog{doing @fonttextsize \textsizearg}%
- %
- % Set \globaldefs so that documents can use this inside @tex, since
- % makeinfo 4.8 does not support it, but we need it nonetheless.
- %
- \begingroup \globaldefs=1
- \ifx\textsizearg\xword \definetextfontsizex
- \else \ifx\textsizearg\xiword \definetextfontsizexi
- \else
- \errhelp=\EMsimple
- \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'}
- \fi\fi
- \endgroup
-}
-
-
% In order for the font changes to affect most math symbols and letters,
% we have to define the \textfont of the standard families. Since
% texinfo doesn't allow for producing subscripts and superscripts except
% Set up the default fonts, so we can use them for creating boxes.
%
-\definetextfontsizexi
+\textfonts \rm
% Define these so they can be easily changed for other fonts.
\def\angleleft{$\langle$}
% and arrange explicitly to hyphenate at a dash.
% -- rms.
{
- \catcode`\-=\active \catcode`\_=\active
- \catcode`\'=\active \catcode`\`=\active
+ \catcode`\-=\active
+ \catcode`\_=\active
%
\global\def\code{\begingroup
- \catcode\rquoteChar=\active \catcode\lquoteChar=\active
- \let'\codequoteright \let`\codequoteleft
- %
- \catcode\dashChar=\active \catcode\underChar=\active
+ \catcode`\-=\active \catcode`\_=\active
\ifallowcodebreaks
\let-\codedash
\let_\codeunder
}$%
}
-% @textdegree - the normal degrees sign.
-%
-\def\textdegree{$^\circ$}
-
% Laurent Siebenmann reports \Orb undefined with:
% Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38
% so we'll define it if necessary.
%
% Leave some space for the footline. Hopefully ok to assume
% @evenfooting will not be used by itself.
- \global\advance\pageheight by -12pt
- \global\advance\vsize by -12pt
+ \global\advance\pageheight by -\baselineskip
+ \global\advance\vsize by -\baselineskip
}
\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
\def\doignore#1{\begingroup
% Scan in ``verbatim'' mode:
- \obeylines
\catcode`\@ = \other
\catcode`\{ = \other
\catcode`\} = \other
\gdef\dodoignore#1{%
% #1 contains the command name as a string, e.g., `ifinfo'.
%
- % Define a command to find the next `@end #1'.
- \long\def\doignoretext##1^^M@end #1{%
- \doignoretextyyy##1^^M@#1\_STOP_}%
- %
+ % Define a command to find the next `@end #1', which must be on a line
+ % by itself.
+ \long\def\doignoretext##1^^M@end #1{\doignoretextyyy##1^^M@#1\_STOP_}%
% And this command to find another #1 command, at the beginning of a
% line. (Otherwise, we would consider a line `@c @ifset', for
% example, to count as an @ifset for nesting.)
\long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
%
% And now expand that command.
+ \obeylines %
\doignoretext ^^M%
}%
}
}
% Finish off ignored text.
-{ \obeylines%
- % Ignore anything after the last `@end #1'; this matters in verbatim
- % environments, where otherwise the newline after an ignored conditional
- % would result in a blank line in the output.
- \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
-}
+\def\enddoignore{\endgroup\ignorespaces}
% @set VAR sets the variable VAR to an empty value.
\escapechar = `\\ % use backslash in output files.
\def\@{@}% change to @@ when we switch to @ as escape char in index files.
\def\ {\realbackslash\space }%
- %
% Need these in case \tex is in effect and \{ is a \delimiter again.
% But can't use \lbracecmd and \rbracecmd because texindex assumes
% braces and backslashes are used only as delimiters.
\let\{ = \mylbrace
\let\} = \myrbrace
%
- % I don't entirely understand this, but when an index entry is
- % generated from a macro call, the \endinput which \scanmacro inserts
- % causes processing to be prematurely terminated. This is,
- % apparently, because \indexsorttmp is fully expanded, and \endinput
- % is an expandable command. The redefinition below makes \endinput
- % disappear altogether for that purpose -- although logging shows that
- % processing continues to some further point. On the other hand, it
- % seems \endinput does not hurt in the printed index arg, since that
- % is still getting written without apparent harm.
- %
- % Sample source (mac-idx3.tex, reported by Graham Percival to
- % help-texinfo, 22may06):
- % @macro funindex {WORD}
- % @findex xyz
- % @end macro
- % ...
- % @funindex commtest
- %
- % The above is not enough to reproduce the bug, but it gives the flavor.
- %
- % Sample whatsit resulting:
- % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
- %
- % So:
- \let\endinput = \empty
- %
% Do the redefinitions.
\commondummies
}
%
% Do the redefinitions.
\commondummies
- \otherbackslash
}
% Called from \indexdummies and \atdummies.
\definedummyword\point
\definedummyword\print
\definedummyword\result
- \definedummyword\textdegree
%
% We want to disable all macros so that they are not expanded by \write.
\macrolist
% \commondummiesnofonts: common to \commondummies and \indexnofonts.
%
-\def\commondummiesnofonts{%
- % Control letters and accents.
- \definedummyletter\!%
- \definedummyaccent\"%
- \definedummyaccent\'%
- \definedummyletter\*%
- \definedummyaccent\,%
- \definedummyletter\.%
- \definedummyletter\/%
- \definedummyletter\:%
- \definedummyaccent\=%
- \definedummyletter\?%
- \definedummyaccent\^%
- \definedummyaccent\`%
- \definedummyaccent\~%
- \definedummyword\u
- \definedummyword\v
- \definedummyword\H
- \definedummyword\dotaccent
- \definedummyword\ringaccent
- \definedummyword\tieaccent
- \definedummyword\ubaraccent
- \definedummyword\udotaccent
- \definedummyword\dotless
- %
- % Texinfo font commands.
- \definedummyword\b
- \definedummyword\i
- \definedummyword\r
- \definedummyword\sc
- \definedummyword\t
- %
- % Commands that take arguments.
- \definedummyword\acronym
- \definedummyword\cite
- \definedummyword\code
- \definedummyword\command
- \definedummyword\dfn
- \definedummyword\emph
- \definedummyword\env
- \definedummyword\file
- \definedummyword\kbd
- \definedummyword\key
- \definedummyword\math
- \definedummyword\option
- \definedummyword\pxref
- \definedummyword\ref
- \definedummyword\samp
- \definedummyword\strong
- \definedummyword\tie
- \definedummyword\uref
- \definedummyword\url
- \definedummyword\var
- \definedummyword\verb
- \definedummyword\w
- \definedummyword\xref
+% Better have this without active chars.
+{
+ \catcode`\~=\other
+ \gdef\commondummiesnofonts{%
+ % Control letters and accents.
+ \definedummyletter\!%
+ \definedummyaccent\"%
+ \definedummyaccent\'%
+ \definedummyletter\*%
+ \definedummyaccent\,%
+ \definedummyletter\.%
+ \definedummyletter\/%
+ \definedummyletter\:%
+ \definedummyaccent\=%
+ \definedummyletter\?%
+ \definedummyaccent\^%
+ \definedummyaccent\`%
+ \definedummyaccent\~%
+ \definedummyword\u
+ \definedummyword\v
+ \definedummyword\H
+ \definedummyword\dotaccent
+ \definedummyword\ringaccent
+ \definedummyword\tieaccent
+ \definedummyword\ubaraccent
+ \definedummyword\udotaccent
+ \definedummyword\dotless
+ %
+ % Texinfo font commands.
+ \definedummyword\b
+ \definedummyword\i
+ \definedummyword\r
+ \definedummyword\sc
+ \definedummyword\t
+ %
+ % Commands that take arguments.
+ \definedummyword\acronym
+ \definedummyword\cite
+ \definedummyword\code
+ \definedummyword\command
+ \definedummyword\dfn
+ \definedummyword\emph
+ \definedummyword\env
+ \definedummyword\file
+ \definedummyword\kbd
+ \definedummyword\key
+ \definedummyword\math
+ \definedummyword\option
+ \definedummyword\samp
+ \definedummyword\strong
+ \definedummyword\tie
+ \definedummyword\uref
+ \definedummyword\url
+ \definedummyword\var
+ \definedummyword\verb
+ \definedummyword\w
+ }
}
% \indexnofonts is used when outputting the strings to sort the index
\def\point{.}%
\def\print{-|}%
\def\result{=>}%
- \def\textdegree{degrees}%
%
% We need to get rid of all macros, leaving only the arguments (if present).
% Of course this is not nearly correct, but it is the best we can do for now.
\endgroup
}
-% Like plain.tex's \dotfill, except uses up at least 1 em.
+% Like \dotfill except takes at least 1 em.
\def\indexdotfill{\cleaders
- \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
+ \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill}
\def\primary #1{\line{#1\hfil}}
\ifx\temptype\Ynothingkeyword
\setbox0 = \hbox{}%
\def\toctype{unnchap}%
- \gdef\thischapternum{}%
\gdef\thischapter{#1}%
\else\ifx\temptype\Yomitfromtockeyword
\setbox0 = \hbox{}% contents like unnumbered, but no toc entry
\def\toctype{omit}%
- \gdef\thischapternum{}%
\gdef\thischapter{}%
\else\ifx\temptype\Yappendixkeyword
\setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
\def\toctype{app}%
- \xdef\thischapternum{\appendixletter}%
% We don't substitute the actual chapter name into \thischapter
% because we don't want its macros evaluated now. And we don't
% use \thissection because that changes with each section.
\else
\setbox0 = \hbox{#3\enspace}%
\def\toctype{numchap}%
- \xdef\thischapternum{\the\chapno}%
\xdef\thischapter{\putwordChapter{} \the\chapno:
\noexpand\thischaptername}%
\fi\fi\fi
\gdef\thissection{#1}%
\fi\fi\fi
%
- % Write the toc entry (before \donoderef). See comments in \chapmacro.
+ % Write the toc entry (before \donoderef). See comments in \chfplain.
\writetocentry{\toctype\sectionlevel}{#1}{#4}%
%
% Write the node reference (= pdf destination for pdftex).
- % Again, see comments in \chapmacro.
+ % Again, see comments in \chfplain.
\donoderef{#3}%
%
- % Interline glue will be inserted when the vbox is completed.
- % That glue will be a valid breakpoint for the page, since it'll be
- % preceded by a whatsit (usually from the \donoderef, or from the
- % \writetocentry if there was no node). We don't want to allow that
- % break, since then the whatsits could end up on page n while the
- % section is on page n+1, thus toc/etc. are wrong. Debian bug 276000.
- \nobreak
- %
% Output the actual section heading.
\vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
\hangindent=\wd0 % zero if no section number
\edef\temp{%
\write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}%
\temp
- }%
+ }
\fi
\fi
%
{\tentt \global\dimen0 = 3em}% Width of the box.
\dimen2 = .55pt % Thickness of rules
% The text. (`r' is open on the right, `e' somewhat less so on the left.)
-\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
+\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
%
\setbox\errorbox=\hbox to \dimen0{\hfil
\hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
%
\maketwodispenvs {lisp}{example}{%
\nonfillstart
- \tt\quoteexpand
+ \tt
\let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
\gobble % eat return
}
+
% @display/@smalldisplay: same as @lisp except keep current font.
%
\makedispenv {display}{%
\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
%
\def\starttabbox{\setbox0=\hbox\bgroup}
-
-% Allow an option to not replace quotes with a regular directed right
-% quote/apostrophe (char 0x27), but instead use the undirected quote
-% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it
-% the default, but it works for pasting with more pdf viewers (at least
-% evince), the lilypond developers report. xpdf does work with the
-% regular 0x27.
-%
-\def\codequoteright{%
- \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
- '%
- \else
- \char'15
- \fi
-}
-%
-% and a similar option for the left quote char vs. a grave accent.
-% Modern fonts display ASCII 0x60 as a grave accent, so some people like
-% the code environments to do likewise.
-%
-\def\codequoteleft{%
- \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
- `%
- \else
- \char'22
- \fi
-}
-%
\begingroup
\catcode`\^^I=\active
\gdef\tabexpand{%
\wd0=\dimen0 \box0 \starttabbox
}%
}
- \catcode`\'=\active
- \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}%
- %
- \catcode`\`=\active
- \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}%
- %
- \gdef\quoteexpand{\rquoteexpand \lquoteexpand}%
\endgroup
-
-% start the verbatim environment.
\def\setupverbatim{%
\let\nonarrowing = t%
\nonfillstart
\def\par{\leavevmode\egroup\box0\endgraf}%
\catcode`\`=\active
\tabexpand
- \quoteexpand
% Respect line breaks,
% print special symbols as themselves, and
% make each space count
\spaceisspace
%
% Append \endinput to make sure that TeX does not see the ending newline.
+ %
% I've verified that it is necessary both for e-TeX and for ordinary TeX
% --kasal, 29nov03
\scantokens{#1\endinput}%
% {. If so it reads up to the closing }, if not, it reads the whole
% line. Whatever was read is then fed to the next control sequence
% as an argument (by \parsebrace or \parsearg)
-\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
+\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx}
\def\braceorlinexxx{%
\ifx\nchar\bgroup\else
\expandafter\parsearg
- \fi \macnamexxx}
+ \fi \next}
% @alias.
% If the user specified the print name (third arg) to the ref,
% print it instead of our usual "Figure 1.2".
\ifdim\wd0 = 0pt
- \refx{#1-snt}{}%
+ \refx{#1-snt}%
\else
\printedrefname
\fi
% above and below.
OSDN Git Service
