Attachment 6236 Details for Bug 14315 – file.diff

[patch] file.diff

file.diff (text/plain), 1.63 KB, created by ade on 1999-10-14 03:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ade

Created: 1999-10-14 03:00:01 UTC

Size: 1.63 KB

patch

obsolete

>Index: patches/patch-ad
>===================================================================
>RCS file: /home/ncvs/ports/devel/ORBit/patches/patch-ad,v
>retrieving revision 1.2
>diff -u -r1.2 patch-ad
>--- patch-ad	1999/03/09 01:08:51	1.2
>+++ patch-ad	1999/10/14 01:50:20
>@@ -6,8 +6,8 @@
>  
> -    client		(calls glib-config)
> -    server		(calls glib-config)
>-+    client		(calls glib12-config)
>-+    server		(calls glib12-config)
>++    client		(calls @GLIB_CONFIG@)
>++    server		(calls @GLIB_CONFIG@)
>  EOF
>  
>      exit $1
>@@ -17,8 +17,23 @@
>      client|server)
> -	the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm"
> -	the_flags="$the_flags `glib-config --cflags` -I@includedir@"
>-+	the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib12-config --libs` @LIBS@ -lm"
>-+	the_flags="$the_flags `glib12-config --cflags` -I@includedir@"
>++	the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `@GLIB_CONFIG@ --libs` @LIBS@ -lm"
>++	the_flags="$the_flags `@GLIB_CONFIG@ --cflags` -I@includedir@"
>  	;;
>  
>     --use-service=*)
>+--- libIDL/libIDL-config.in.orig	Fri Apr 16 09:52:20 1999
>++++ libIDL/libIDL-config.in	Wed Oct 13 20:49:40 1999
>+@@ -74,10 +74,10 @@
>+ 	echo $exec_prefix
>+ fi
>+ if test "$echo_cflags" = "yes"; then
>+-	all_flags="$all_flags $includes $cflags `glib-config --cflags`"
>++	all_flags="$all_flags $includes $cflags `@GLIB_CONFIG@ --cflags`"
>+ fi
>+ if test "$echo_libs" = "yes"; then
>+-	all_flags="$all_flags -L@libdir@ -lIDL `glib-config --libs`"
>++	all_flags="$all_flags -L@libdir@ -lIDL `@GLIB_CONFIG@ --libs`"
>+ fi
>+ 
>+ # Straight out any possible duplicates, but be careful to
>cvs diff: Diffing pkg

Actions: View | Diff

Attachments on bug 14315: 6236