author | dcarbery |
Fri, 24 Nov 2006 16:37:59 +0000 | |
branch | 217update |
changeset 19096 | d542fc2c823e |
parent 8495 | 239f39f5032f |
permissions | -rw-r--r-- |
8495
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
1 |
diff -uNr libglade-java-2.12.7.orig/doc/examples/runExample.sh.in libgtk-java-2.12.7/doc/examples/runExample.sh.in |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
2 |
--- libglade-java-2.12.7.orig/doc/examples/runExample.sh.in 2006-11-03 17:10:20.000000000 +0100 |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
3 |
+++ libglade-java-2.12.7/doc/examples/runExample.sh.in 2006-11-03 17:14:10.000000000 +0100 |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
4 |
@@ -3,18 +3,10 @@ |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
5 |
# A small script to help run example apps |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
6 |
# |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
7 |
|
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
8 |
-prefix=@prefix@ |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
9 |
-exec_prefix=@exec_prefix@ |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
10 |
-libdir=@libdir@ |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
11 |
-classpath=@INSTALLED_CLASSPATH@ |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
12 |
- |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
13 |
-GLADE_LIB=$libdir |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
14 |
-GLADE_JAR=$classpath |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
15 |
- |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
16 |
-GTK_JAR=@GTKJAR@ |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
17 |
- |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
18 |
# You should not need to modify anything below here |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
19 |
|
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
20 |
+JARS="gtk2-java gnome2-java glib-java glade-java" |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
21 |
+ |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
22 |
error_message () |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
23 |
{ |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
24 |
echo |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
25 |
@@ -29,8 +21,28 @@ |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
26 |
exit 1; |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
27 |
} |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
28 |
|
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
29 |
-NEED_LIB="$GLADE_LIB" |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
30 |
-NEED_JAR="$GTK_JAR $GLADE_JAR" |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
31 |
+for JAR in $JARS; do |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
32 |
+ CHECK=`pkg-config --variable classpath $JAR` |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
33 |
+ if ! test -n "$CHECK"; then |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
34 |
+ echo "Package $JAR was not found in the pkg-config search path." |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
35 |
+ echo "Perhaps you should add the directory containing '$JAR.pc'" |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
36 |
+ echo "to the PKG_CONFIG_PATH environment variable" |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
37 |
+ echo "No package '$JAR' found" |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
38 |
+ exit 1 |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
39 |
+ fi |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
40 |
+ NEED_JAR="$NEED_JAR $CHECK"; |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
41 |
+done; |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
42 |
+ |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
43 |
+JGLADE_LIBDIR=`pkg-config --variable libdir glade-java` |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
44 |
+if ! test -n "$JGLADE_LIBDIR"; then |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
45 |
+ echo "Library requirements for glade-java not met;" |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
46 |
+ echo "consider adjusting the PKG_CONFIG_PATH environment" |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
47 |
+ echo "variable if your libraries are in a nonstandard prefix" |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
48 |
+ echo "so pkg-config can find them." |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
49 |
+ exit 1 |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
50 |
+fi |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
51 |
+ |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
52 |
+NEED_LIB="$JGLADE_LIBDIR" |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
53 |
|
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
54 |
echo "Java-Gnome Example Application Launcher" |
239f39f5032f
- Added local patch for runExample.sh.in also submitted upstream
migi
parents:
diff
changeset
|
55 |
echo |