|
Lines 6-13
Link Here
|
| 6 |
|
6 |
|
| 7 |
- client (calls glib-config) |
7 |
- client (calls glib-config) |
| 8 |
- server (calls glib-config) |
8 |
- server (calls glib-config) |
| 9 |
+ client (calls glib12-config) |
9 |
+ client (calls @GLIB_CONFIG@) |
| 10 |
+ server (calls glib12-config) |
10 |
+ server (calls @GLIB_CONFIG@) |
| 11 |
EOF |
11 |
EOF |
| 12 |
|
12 |
|
| 13 |
exit $1 |
13 |
exit $1 |
|
Lines 17-24
Link Here
|
| 17 |
client|server) |
17 |
client|server) |
| 18 |
- the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm" |
18 |
- the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm" |
| 19 |
- the_flags="$the_flags `glib-config --cflags` -I@includedir@" |
19 |
- the_flags="$the_flags `glib-config --cflags` -I@includedir@" |
| 20 |
+ the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib12-config --libs` @LIBS@ -lm" |
20 |
+ the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `@GLIB_CONFIG@ --libs` @LIBS@ -lm" |
| 21 |
+ the_flags="$the_flags `glib12-config --cflags` -I@includedir@" |
21 |
+ the_flags="$the_flags `@GLIB_CONFIG@ --cflags` -I@includedir@" |
| 22 |
;; |
22 |
;; |
| 23 |
|
23 |
|
| 24 |
--use-service=*) |
24 |
--use-service=*) |
|
|
25 |
--- libIDL/libIDL-config.in.orig Fri Apr 16 09:52:20 1999 |
| 26 |
+++ libIDL/libIDL-config.in Wed Oct 13 20:49:40 1999 |
| 27 |
@@ -74,10 +74,10 @@ |
| 28 |
echo $exec_prefix |
| 29 |
fi |
| 30 |
if test "$echo_cflags" = "yes"; then |
| 31 |
- all_flags="$all_flags $includes $cflags `glib-config --cflags`" |
| 32 |
+ all_flags="$all_flags $includes $cflags `@GLIB_CONFIG@ --cflags`" |
| 33 |
fi |
| 34 |
if test "$echo_libs" = "yes"; then |
| 35 |
- all_flags="$all_flags -L@libdir@ -lIDL `glib-config --libs`" |
| 36 |
+ all_flags="$all_flags -L@libdir@ -lIDL `@GLIB_CONFIG@ --libs`" |
| 37 |
fi |
| 38 |
|
| 39 |
# Straight out any possible duplicates, but be careful to |