[Ayttm-commits] CVS: ayttm ChangeLog,1.347,1.348 configure.in,1.342,1.343

[Colin Leroy <address@hidden>]

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

Modified Files:
        ChangeLog configure.in 
Log Message:
some fixes to aim-oscar


Index: ChangeLog
===================================================================
RCS file: /cvsroot/ayttm/ayttm/ChangeLog,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- ChangeLog   18 Mar 2003 10:47:13 -0000      1.347
+++ ChangeLog   19 Mar 2003 10:38:18 -0000      1.348
@@ -1,3 +1,8 @@
+* Wed Mar 19 2003 10:36 GMT [colin]    0.2.2-49
+- configure.in 
+- modules/aim-oscar
+Some fixes to aim-oscar (at least it compiles and loads)
+
 * Tue Mar 18 2003 09:04 GMT [colin]    0.2.2-48
 - src/status.c src/contact.h
 Better tooltip handling (no tooltip when no info & info stored in 

Index: configure.in
===================================================================
RCS file: /cvsroot/ayttm/ayttm/configure.in,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- configure.in        18 Mar 2003 10:47:13 -0000      1.342
+++ configure.in        19 Mar 2003 10:38:18 -0000      1.343
@@ -1,7 +1,7 @@
 slp# Process this file with autoconf to produce a configure script.
 AC_INIT([src/main.c])
 AM_INIT_AUTOMAKE(ayttm, 0.2.2)
-RELEASE=48
+RELEASE=49
 AM_CONFIG_HEADER(config.h)
 
 dnl AC_DEFINE(UNIX)
@@ -230,9 +230,9 @@
 
 
 ### Begin Optional Service related options 
######################################
-dnl enable_oscar=no
+enable_oscar=no
 
-dnl AC_ARG_ENABLE(oscar, [  --enable-oscar          include oscar service])
+AC_ARG_ENABLE(oscar, [  --enable-oscar          include oscar service])
 AC_ARG_ENABLE(workwizu,  [  --enable-workwizu       include workwizu service])
 AC_ARG_ENABLE(msn, 
 [  --disable-msn           exclude msn service])
@@ -243,9 +243,9 @@
 
 OPTIONAL_PLUG_DIR=""
 DEBUG_LIBMSN=""
-dnl if test $enable_oscar = yes; then
-dnl    OPTIONAL_PLUG_DIR="$OPTIONAL_PLUG_DIR aim-oscar"
-dnl fi
+if test $enable_oscar = yes; then
+       OPTIONAL_PLUG_DIR="$OPTIONAL_PLUG_DIR aim-oscar"
+fi
 if test "$enable_msn" != no; then
        OPTIONAL_PLUG_DIR="$OPTIONAL_PLUG_DIR msn2"
 fi
@@ -324,8 +324,6 @@
 AC_SUBST(OPTIONAL_PLUG_DIR)
 AC_SUBST(DEBUG_LIBMSN)
 
-dnl                 modules/aim-oscar/Makefile
-dnl                 modules/aim-oscar/libfaim/Makefile
 dnl                 modules/icq-toc/Makefile
 dnl                 modules/icq-toc/libtoc/Makefile
 AC_OUTPUT([Makefile ayttm.spec
@@ -337,6 +335,8 @@
                 modules/Makefile
                  modules/aim-toc/Makefile
                  modules/aim-toc/libtoc/Makefile
+                 modules/aim-oscar/Makefile
+                 modules/aim-oscar/libfaim/Makefile
                  modules/icq/Makefile
                  modules/icq/libicq/Makefile
                  modules/importers/Makefile