[Ayttm-commits] CVS: ayttm ChangeLog,1.410,1.411 configure.in,1.405,1.406 makeebdll,1.2,1.3 mingw,1.2,1.3

[Edward L. Haletky <address@hidden>]

Update of /cvsroot/ayttm/ayttm
In directory subversions:/tmp/cvs-serv9044

Modified Files:
        ChangeLog configure.in makeebdll mingw 
Log Message:


Updated to allow building and fixed icq namespace issues.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/ayttm/ayttm/ChangeLog,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- ChangeLog   24 Mar 2003 23:46:38 -0000      1.410
+++ ChangeLog   25 Mar 2003 02:13:30 -0000      1.411
@@ -1,3 +1,20 @@
+* Mon Mar 24 2003 02:16 GMT [edward]   0.2.3-pre7
+- makeebdll
+  mingw
+  src/tcp_utils.h
+  modules/yahoo2/libyahoo2/libyahoo2.c
+  modules/yahoo2/libyahoo2/yahoo_httplib.c
+  modules/utility/rainbow.c
+  modules/utility/notes.c
+  modules/utility/autotrans.c
+  modules/icq-toc/libtoc/libtoc.c
+  modules/aim-toc/aim-toc.c
+Ifdefs to link MINGW32 port also icq-toc libtoc made calls to toc_ instead of
+icqtoc_ routines. Most of these are related to snprintf to g_snprintf mapping.
+However it looks like proxy.o makes a callback to src/tcp_utils.c which I 
+think breaks a barrier somewhere. We need to rethink this, but in this case
+it breaks the building of aim and icq.
+
 * Mon Mar 24 2003 23:46 GMT [colin]    0.2.3-pre6
 - modules/irc/irc.c
 Show errors to users, not stderr

Index: configure.in
===================================================================
RCS file: /cvsroot/ayttm/ayttm/configure.in,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- configure.in        24 Mar 2003 23:46:38 -0000      1.405
+++ configure.in        25 Mar 2003 02:13:30 -0000      1.406
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT([src/main.c])
 AM_INIT_AUTOMAKE(ayttm, 0.2.3)
-RELEASE=pre6
+RELEASE=pre7
 AM_CONFIG_HEADER(config.h)
 
 if test "x$host_alias" = "xmingw32"; then

Index: makeebdll
===================================================================
RCS file: /cvsroot/ayttm/ayttm/makeebdll,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- makeebdll   16 Jan 2003 13:10:59 -0000      1.2
+++ makeebdll   25 Mar 2003 02:13:30 -0000      1.3
@@ -1,7 +1,7 @@
 #!/bin/sh
-dlltool --export-all --output-def ayttm.def src/*.o
+dlltool --export-all --output-def ayttm.def src/*.o src/gtk/*.o
 dlltool --dllname ayttm.exe --def ayttm.def --output-lib libayttm.a
 dlltool --dllname ayttm.exe --output-exp ayttm.exp --def ayttm.def
-gcc -mno-cygwin -fnative-struct -I/target/include -I/usr/include/mingw 
-I/usr/include/w32api -I/target/include/glib -I/target/include/glib-2.0 
-I/usr/local/include -I/opt/include -I../ -I/usr/include/w32api -I/usr/include 
-D_REENTRANT -Wall -g -I.. -I./libproxy -o ayttm.exe -Wl,--base-file,ayttm.base 
ayttm.exp src/*.o /target/lib/intl.lib /target/lib/iconv.lib 
/target/lib/dirent.lib libltdl/ltdl.o  -L/target/lib -lgdk -lgtk -lglib-2.0 
-L./libproxy -lproxy -lwinmm -lws2_32 -lwst -lmsvcrt40
+gcc -mno-cygwin -fnative-struct -I/target/include -I/usr/include/mingw 
-I/usr/include/w32api -I/target/include/glib -I/target/include/glib-2.0 
-I/usr/local/include -I/opt/include -I../ -I/usr/include/w32api -I/usr/include 
-D_REENTRANT -Wall -g -I.. -I./libproxy -o ayttm.exe -Wl,--base-file,ayttm.base 
ayttm.exp src/*.o src/gtk/*.o /target/lib/intl.lib /target/lib/iconv.lib 
/target/lib/dirent.lib libltdl/ltdl.o  -L/target/lib -lgdk -lgtk -lglib-2.0 
-L./libproxy -lproxy -lwinmm -lws2_32 -lwst -lmsvcrt40
 dlltool --dllname ayttm.exe --base-file ayttm.base --output-exp ayttm.exp 
--def ayttm.def
-gcc -mno-cygwin -fnative-struct -I/target/include -I/usr/include/mingw 
-I/usr/include/w32api -I/target/include/glib -I/target/include/glib-2.0 
-I/usr/local/include -I/opt/include -I../ -I/usr/include/w32api -I/usr/include 
-D_REENTRANT -Wall -g -I.. -I./libproxy -o ayttm.exe ayttm.exp src/*.o 
/target/lib/intl.lib /target/lib/iconv.lib /target/lib/dirent.lib 
libltdl/ltdl.o  -L/target/lib -lgdk -lgtk -lglib-2.0 -L./libproxy -lproxy 
-lwinmm -lws2_32 -lwst -lmsvcrt40
+gcc -mno-cygwin -fnative-struct -I/target/include -I/usr/include/mingw 
-I/usr/include/w32api -I/target/include/glib -I/target/include/glib-2.0 
-I/usr/local/include -I/opt/include -I../ -I/usr/include/w32api -I/usr/include 
-D_REENTRANT -Wall -g -I.. -I./libproxy -o ayttm.exe ayttm.exp src/*.o 
src/gtk/*.o /target/lib/intl.lib /target/lib/iconv.lib /target/lib/dirent.lib 
libltdl/ltdl.o  -L/target/lib -lgdk -lgtk -lglib-2.0 -L./libproxy -lproxy 
-lwinmm -lws2_32 -lwst -lmsvcrt40

Index: mingw
===================================================================
RCS file: /cvsroot/ayttm/ayttm/mingw,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mingw       16 Jan 2003 13:10:59 -0000      1.2
+++ mingw       25 Mar 2003 02:13:30 -0000      1.3
@@ -31,23 +31,26 @@
        #
        # rebuild all plugins as DLLs.
        cd modules/importers
-        for x in import_gaim import_gnomeicu importicq importlicq smileysc 
msn_smileys yahoo_smileys
+       # msn_smiles yahoo_smiles
+        for x in import_gaim import_gnomeicu importicq importlicq smileysc 
giles_smiles
        do
                 ../../makedll $x gcc
                cp $x.dll /cygdrive/c/.ayttm/modules
        done
         cd ../utility
-        for x in middle rainbow autotrans
+        for x in middle rainbow autotrans notes
         do
                 ../../makedll $x gcc
                 cp $x.dll /cygdrive/c/.ayttm/modules
         done
-       cd ../aim-toc
-        ../../makedll aim-toc gcc libtoc/libtoc.o
-       cp aim-toc.dll /cygdrive/c/.ayttm/modules
-        cd ../icq
-        ../../makedll icq gcc libicq/*.o
-        cp icq.dll /cygdrive/c/.ayttm/modules
+       # needs some work; libproxy needs the __IN_PLUGIN__ for this to
+       # work properly... For all of them actually.
+       # cd ../aim-toc
+        # ../../makedll aim-toc gcc libtoc/libtoc.o
+       # cp aim-toc.dll /cygdrive/c/.ayttm/modules
+        # cd ../icq-toc
+        # ../../makedll icq-toc gcc libtoc/libtoc.o
+        # cp icq-toc.dll /cygdrive/c/.ayttm/modules
         cd ../yahoo2
         ../../makedll yahoo gcc libyahoo2/*.o
         cp yahoo.dll /cygdrive/c/.ayttm/modules