Mercurial Mercurial > sustaining > oi_151a > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gaim-06-gtk-func-def.diff
author dcarbery
Thu, 30 Nov 2006 14:41:21 +0000
changeset 8666 a73e4fd629f6
parent 8517 b8a1116b8d0f
permissions -rw-r--r--
2006-11-30 Damien Carbery <[email protected]> * gaim.spec: Bump to 2.0.0beta5. * patches/gaim-06-gtk-func-def.diff: Remove upstream chunk. * patches/gaim-09-gtk-file-chooser.diff: Rework one chunk.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8487
6edcb0c11090 New section to help the build find the .a files. Experimental.
dcarbery
parents: 8486
diff changeset 
     1
 
--- gaim-2.0.0beta4/configure.ac.orig	2006-11-02 22:50:02.516349000 +0000
6edcb0c11090 New section to help the build find the .a files. Experimental.
dcarbery
parents: 8486
diff changeset 
     2
 
+++ gaim-2.0.0beta4/configure.ac	2006-11-02 22:50:46.487764000 +0000
6edcb0c11090 New section to help the build find the .a files. Experimental.
dcarbery
parents: 8486
diff changeset 
     3
 
@@ -689,9 +689,9 @@
6edcb0c11090 New section to help the build find the .a files. Experimental.
dcarbery
parents: 8486
diff changeset 
     4
 
 for i in $STATIC_PRPLS ; do
6edcb0c11090 New section to help the build find the .a files. Experimental.
dcarbery
parents: 8486
diff changeset 
     5
 
 	dnl Ugly special case for "libsilcgaim.a":
6edcb0c11090 New section to help the build find the .a files. Experimental.
dcarbery
parents: 8486
diff changeset 
     6
 
 	if test "x$i" = "xsilc"; then
6edcb0c11090 New section to help the build find the .a files. Experimental.
dcarbery
parents: 8486
diff changeset 
     7
 
-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib${i}gaim.a"
6edcb0c11090 New section to help the build find the .a files. Experimental.
dcarbery
parents: 8486
diff changeset 
     8
 
+		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libgaim/protocols/$i/lib${i}gaim.a"
6edcb0c11090 New section to help the build find the .a files. Experimental.
dcarbery
parents: 8486
diff changeset 
     9
 
 	else
6edcb0c11090 New section to help the build find the .a files. Experimental.
dcarbery
parents: 8486
diff changeset 
    10
 
-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib$i.a"
6edcb0c11090 New section to help the build find the .a files. Experimental.
dcarbery
parents: 8486
diff changeset 
    11
 
+		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libgaim/protocols/$i/lib$i.a"
6edcb0c11090 New section to help the build find the .a files. Experimental.
dcarbery
parents: 8486
diff changeset 
    12
 
 	fi
6edcb0c11090 New section to help the build find the .a files. Experimental.
dcarbery
parents: 8486
diff changeset 
    13
 
 	extern_init="$extern_init extern gboolean gaim_init_${i}_plugin();"
6edcb0c11090 New section to help the build find the .a files. Experimental.
dcarbery
parents: 8486
diff changeset 
    14
 
 	load_proto="$load_proto gaim_init_${i}_plugin();"
sustaining/oi_151a/spec-files