9181N/Adiff -uNr libgnome-java-2.12.6.orig/doc/examples/runExample.sh.in libgnome-java-2.12.6/doc/examples/runExample.sh.in

9181N/A--- libgnome-java-2.12.6.orig/doc/examples/runExample.sh.in 2006-10-26 14:52:02.183551000 +0100

9181N/A+++ libgnome-java-2.12.6/doc/examples/runExample.sh.in 2006-10-26 15:55:31.961544000 +0100

9181N/A@@ -3,14 +3,6 @@

9181N/A # A small script to help run example apps

9181N/A #

9181N/A

9181N/A-prefix=@prefix@

9181N/A-exec_prefix=@exec_prefix@

9181N/A-libdir=@libdir@

9181N/A-classpath=@INSTALLED_CLASSPATH@

9181N/A-

9181N/A-GNOMEJAVA_LIB=$libdir

9181N/A-GNOMEJAVA_JAR=$classpath

9181N/A-

9181N/A # You should not need to modify anything below here

9181N/A

9181N/A error_message ()

9181N/A@@ -30,8 +22,8 @@

9181N/A echo "Java-Gnome Example Application Launcher"

9181N/A echo

9181N/A

9181N/A-GLIBJAVA_JAR=`pkg-config --variable classpath glib-java`

9181N/A-if ! test -n "$GLIBJAVA_JAR"; then

9181N/A+JGLIB_JAR=`pkg-config --variable classpath glib-java`

9181N/A+if ! test -n "$JGLIB_JAR"; then

9181N/A echo "Package glib-java was not found in the pkg-config search path."

9181N/A echo "Perhaps you should add the directory containing 'glib-java.pc'"

9181N/A echo "to the PKG_CONFIG_PATH environment variable"

9181N/A@@ -39,35 +31,36 @@

9181N/A exit 1

9181N/A fi

9181N/A

9181N/A-GLIBJAVA_LIB=`pkg-config --variable libdir glib-java`

9181N/A-if ! test -n "$GLIBJAVA_LIB"; then

9181N/A- echo "Library requirements (libglibjni >= 0.2) not met;"

9181N/A- echo "consider adjusting the PKG_CONFIG_PATH environment"

9181N/A- echo "variable if your libraries are in a nonstandard prefix"

9181N/A- echo "so pkg-config can find them."

9181N/A+JGTK_JAR=`pkg-config --variable classpath gtk2-java`

9181N/A+if ! test -n "$JGTK_JAR"; then

9181N/A+ echo "Package gtk2-java was not found in the pkg-config search path."

9181N/A+ echo "Perhaps you should add the directory containing 'gtk2-java.pc'"

9181N/A+ echo "to the PKG_CONFIG_PATH environment variable"

9181N/A+ echo "No package 'gtk2-java' found"

9181N/A exit 1

9181N/A fi

9181N/A

9181N/A-GTKJAVA_JAR=`pkg-config --variable classpath gtk2-java`

9181N/A-if ! test -n "$GTKJAVA_JAR"; then

9181N/A- echo "Package gtk2-java was not found in the pkg-config search path."

9181N/A- echo "Perhaps you should add the directory containing 'gtk2-java.pc'"

9181N/A+JGNOME_JAR=`pkg-config --variable classpath gnome2-java`

9181N/A+if ! test -n "$JGNOME_JAR"; then

9181N/A+ echo "Package gnome2-java was not found in the pkg-config search path."

9181N/A+ echo "Perhaps you should add the directory containing 'gnome2-java.pc'"

9181N/A echo "to the PKG_CONFIG_PATH environment variable"

9181N/A echo "No package 'gtk2-java' found"

9181N/A exit 1

9181N/A fi

9181N/A

9181N/A-GTKJAVA_LIB=`pkg-config --variable libdir gtk2-java`

9181N/A-if ! test -n "$GTKJAVA_LIB"; then

9181N/A- echo "Library requirements (libgtkjava2.4) not met;"

9181N/A+JGNOME_LIBDIR=`pkg-config --variable libdir gnome2-java`

9181N/A+if ! test -n "$JGNOME_LIBDIR"; then

9181N/A+ echo "Library requirements for gnome2-java not met;"

9181N/A echo "consider adjusting the PKG_CONFIG_PATH environment"

9181N/A echo "variable if your libraries are in a nonstandard prefix"

9181N/A echo "so pkg-config can find them."

9181N/A exit 1

9181N/A fi

9181N/A

9181N/A-NEED_LIB="$GLIBJAVA_LIB $GTKJAVA_LIB $GNOMEJAVA_LIB"

9181N/A-NEED_JAR="$GLIBJAVA_JAR $GTKJAVA_JAR $GNOMEJAVA_JAR"

9181N/A+

9181N/A+NEED_LIB="$JGNOME_LIBDIR"

9181N/A+NEED_JAR="$JGLIB_JAR $JGTK_JAR $JGNOME_JAR"

9181N/A

9181N/A echo "Checking for jvm and compiler availability..."

9181N/A