From: Luke S. <lsc...@us...> - 2003-05-19 17:27:06
|
Update of /cvsroot/gaim/gaim In directory sc8-pr-cvs1:/tmp/cvs-serv12701 Modified Files: configure.ac configure.in Log Message: Decklin Foster writes: "this makes --enable-static-prpls compile again. i'm so lazy. it's only been what, well over a week since the new plugin api broke this? :) i'm not sure if everything here is "correct" but i'm sure someone can look over it. mainly, because i made _load return TRUE all the time, for the sake of consistency/completeness i changed the other applicable functions to do so as well. my feeling is, the only time these things are going to be called in the static case is from static_proto_init (since there's no plugin UI or whatever) and therefore they always "succeed". oh, yeah, and someone please test it *without* static prpls turned on. like i said, i'm lazy. :)" it works for me with no static prpls. Index: configure.ac =================================================================== RCS file: /cvsroot/gaim/gaim/configure.ac,v retrieving revision 1.126 retrieving revision 1.127 diff -u -d -r1.126 -r1.127 --- configure.ac 18 May 2003 05:00:12 -0000 1.126 +++ configure.ac 19 May 2003 17:27:02 -0000 1.127 @@ -94,8 +94,8 @@ load_proto= for i in $STATIC_PRPLS ; do STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib$i.a" - extern_init="$extern_init extern void ${i}_init(struct prpl *);" - load_proto="$load_proto load_protocol(${i}_init);" + extern_init="$extern_init extern gboolean gaim_init_${i}_plugin();" + load_proto="$load_proto gaim_init_${i}_plugin();" case $i in gg) static_gg=yes ;; irc) static_irc=yes ;; Index: configure.in =================================================================== RCS file: /cvsroot/gaim/gaim/configure.in,v retrieving revision 1.169 retrieving revision 1.170 diff -u -d -r1.169 -r1.170 --- configure.in 18 May 2003 05:45:17 -0000 1.169 +++ configure.in 19 May 2003 17:27:03 -0000 1.170 @@ -84,8 +84,8 @@ load_proto= for i in $STATIC_PRPLS ; do STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib$i.a" - extern_init="$extern_init extern void ${i}_init(struct prpl *);" - load_proto="$load_proto load_protocol(${i}_init, sizeof(struct prpl));" + extern_init="$extern_init extern gboolean gaim_init_${i}_plugin();" + load_proto="$load_proto gaim_init_${i}_plugin();" case $i in gg) static_gg=yes ;; irc) static_irc=yes ;; |