# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 960398072 0
# Node ID b402a23f35df0b876b4aad64bb249d5255332d99
# Parent  29f95b2b3e38bbd2cb278f865a9df37dc845d76c
[gaim-migrate @ 359]
Let's see if *this* doesn't break everything

committer: Tailor Script <tailor@pidgin.im>

diff -r 29f95b2b3e38 -r b402a23f35df .cvsignore
--- a/.cvsignore	Wed Jun 07 14:04:24 2000 +0000
+++ b/.cvsignore	Wed Jun 07 17:14:32 2000 +0000
@@ -16,3 +16,7 @@
 aclocal.m4
 libtool
 gaim.spec
+config.h.in
+config.h
+stamp-h.in
+stamp-h
diff -r 29f95b2b3e38 -r b402a23f35df acconfig.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/acconfig.h	Wed Jun 07 17:14:32 2000 +0000
@@ -0,0 +1,17 @@
+#undef ENABLE_NLS
+#undef HAVE_CATGETS
+#undef HAVE_GETTEXT
+#undef HAVE_LC_MESSAGES
+#undef HAVE_STPCPY
+#undef HAVE_LIBSM
+#undef USE_APPLET
+#undef USE_OSCAR
+#undef DEBUG
+#undef GAIM_PLUGINS
+#undef NAS_SOUND
+#undef ESD_SOUND
+#undef _REENTRANT
+#undef NEED_GNOMESUPPORT_H
+
+
+
diff -r 29f95b2b3e38 -r b402a23f35df configure.in
--- a/configure.in	Wed Jun 07 14:04:24 2000 +0000
+++ b/configure.in	Wed Jun 07 17:14:32 2000 +0000
@@ -1,6 +1,6 @@
-dn3l Process this file with autoconf to produce a configure script.
+dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
-
+AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([gaim], [0.9.19])
 
 dnl Checks for programs.
@@ -30,7 +30,7 @@
 AC_CHECK_FUNCS(socket strdup strstr atexit)
 
 dnl This is a bad, bad hack.  I am a bad, bad man.
-CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include"
+CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I../"
 
 AC_ARG_ENABLE(debug, [  --enable-debug          compile with debugging support],enable_debug=yes,)
 AC_ARG_ENABLE(gnome, [  --enable-gnome          compile as a GNOME applet],enable_gnome=yes,)
@@ -40,59 +40,61 @@
 AC_ARG_ENABLE(nas,   [  --enable-nas            Enable NAS (Network Audio System) support],enable_nas=yes,)
 AC_ARG_ENABLE(plugins, [  --disable-plugins       compile with out plugin support],enable_plugins=no,enable_plugins=yes)
 
-GAIM_CFLAGS="$CFLAGS -I../"
-GAIM_LIBS="$LIBS"
-GAIM_LDADD="$LDADD"
 LIBFAIM_DO=""
 
 if test "$enable_debug" = yes ; then
-	GAIM_CFLAGS="$GAIM_CFLAGS -Wall -d -g -DDEBUG"
+	CFLAGS="$CFLAGS -Wall -d -g"
+	AC_DEFINE(DEBUG)
 fi
 
 if test "$enable_oscar" = yes ; then
-	GAIM_CFLAGS="$GAIM_CFLAGS -DUSE_OSCAR -I../libfaim/faim"
-        GAIM_LDADD="$GAIM_LDADD -L../libfaim -lfaim"
+	CFLAGS="$CFLAGS -I../libfaim/faim"
+	AC_DEFINE(USE_OSCAR)
+        LDADD="$LDADD -L../libfaim -lfaim"
         LIBFAIM_DO="libfaim.a"
 fi
 
 AM_PATH_GLIB(1.2.0)
 AM_PATH_GTK(1.2.0,,,gthread)
-GAIM_LIBS="$GAIM_LIBS $GTK_LIBS"
+LIBS="$LIBS $GTK_LIBS"
 
 if test "$enable_gnome" = yes ; then
 	GNOME_INIT(applets)
 	GNOME_X_CHECKS
-        GAIM_CFLAGS="$GNOME_INCLUDEDIR $GAIM_CFLAGS -DUSE_APPLET"
-	GAIM_LIBS="$GAIM_LIBS $GNOME_LIBDIR $GNOME_APPLETS_LIBS"
+        CFLAGS="$CFLAGS $GNOME_INCLUDEDIR"
+	AC_DEFINE(USE_APPLET)
+	LIBS="$LIBS $GNOME_LIBDIR $GNOME_APPLETS_LIBS"
 fi
 
-GAIM_CFLAGS="$GAIM_CFLAGS $GTK_CFLAGS"
+CFLAGS="$CFLAGS $GTK_CFLAGS"
 
 if test "$enable_plugins" = yes ; then
-	GAIM_CFLAGS="$GAIM_CFLAGS -DGAIM_PLUGINS"
+	AC_DEFINE(GAIM_PLUGINS)
 fi
 
 if test "$enable_nas" = yes ; then
-	GAIM_CFLAGS="$GAIM_CFLAGS -DNAS_SOUND"
-        GAIM_LIBS="$GAIM_LIBS -laudio"
+	AC_DEFINE(NAS_SOUND)
+        LIBS="$LIBS -laudio"
 fi
 
 if test "$enable_esd" = yes ; then
 	AM_PATH_GESD
         if test "$no_esd" != yes ; then
-        	GAIM_CFLAGS="$GAIM_CFLAGS $ESD_CFLAGS -DESD_SOUND"
-                GAIM_LIBS="$GAIM_LIBS $ESD_LIBS"
+        	CFLAGS="$CFLAGS $ESD_CFLAGS"
+		AC_DEFINE(ESD_SOUND)
+                LDADD="$LDADD $ESD_LIBS"
         fi
 fi
 
 if test "$ac_cv_cygwin" = yes ; then
-	GAIM_LDADD="$GAIM_LDADD -static"
-	GAIM_CFLAGS="$GAIM_CFLAGS -Wall -g -DDEBUG"
+	LDADD="$LDADD -static"
+	CFLAGS="$CFLAGS -Wall -g"
+	AC_DEFINE(DEBUG)
 fi                           
 
-AC_SUBST(GAIM_CFLAGS)
-AC_SUBST(GAIM_LIBS)
-AC_SUBST(GAIM_LDADD)
+AC_SUBST(CFLAGS)
+AC_SUBST(LDADD)
+AC_SUBST(LIBS)
 AC_SUBST(LIBFAIM_DO)
 
 AC_OUTPUT([Makefile
diff -r 29f95b2b3e38 -r b402a23f35df libfaim/Makefile.am
--- a/libfaim/Makefile.am	Wed Jun 07 14:04:24 2000 +0000
+++ b/libfaim/Makefile.am	Wed Jun 07 17:14:32 2000 +0000
@@ -25,5 +25,5 @@
 			aim_txqueue.c		\
 			aim_util.c
 
-CFLAGS += $(GAIM_CFLAGS) -I../src -DAIM_BUILDDATE=\"`date +%Y%m%d`\" -DAIM_BUILDTIME=\"`date +%H%M%S`\"
+CFLAGS += -DAIM_BUILDDATE=\"`date +%Y%m%d`\" -DAIM_BUILDTIME=\"`date +%H%M%S`\"
 
diff -r 29f95b2b3e38 -r b402a23f35df libfaim/aim_meta.c
--- a/libfaim/aim_meta.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/libfaim/aim_meta.c	Wed Jun 07 17:14:32 2000 +0000
@@ -8,7 +8,7 @@
  */
 
 #include <faim/aim.h>
-/* #include <aim_buildcode.h> /* generated by mkbuildinfo.sh */
+/* #include <aim_buildcode.h> generated by mkbuildinfo.sh */
 
 char *aim_getbuilddate(void)
 {
diff -r 29f95b2b3e38 -r b402a23f35df po/.cvsignore
--- a/po/.cvsignore	Wed Jun 07 14:04:24 2000 +0000
+++ b/po/.cvsignore	Wed Jun 07 17:14:32 2000 +0000
@@ -4,3 +4,4 @@
 cat-id-tbl.c
 de.gmo
 stamp-cat-id
+gaim.pot
diff -r 29f95b2b3e38 -r b402a23f35df po/gaim.pot
--- a/po/gaim.pot	Wed Jun 07 14:04:24 2000 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-11 12:22+1000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-msgid "About GAIM v%s"
-msgstr ""
diff -r 29f95b2b3e38 -r b402a23f35df src/Makefile.am
--- a/src/Makefile.am	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/Makefile.am	Wed Jun 07 17:14:32 2000 +0000
@@ -12,9 +12,4 @@
 	server.c sound.c toc.c util.c
 endif
 
-
-CFLAGS += $(GAIM_CFLAGS)
-LIBS += $(GAIM_LIBS)
-LDADD += $(GAIM_LDADD)
-
 EXTRA_DIST = gaim.h proxy.h gnome_applet_mgr.h gtkhtml.h
diff -r 29f95b2b3e38 -r b402a23f35df src/about.c
--- a/src/about.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/about.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -53,7 +56,7 @@
 	if (!about) {
 		about = gtk_window_new(GTK_WINDOW_DIALOG);
 	             
-		g_snprintf(abouttitle, sizeof(abouttitle), "About GAIM v%s", VERSION);
+		g_snprintf(abouttitle, sizeof(abouttitle), _("About GAIM v%s"), VERSION);
 		gtk_window_set_title(GTK_WINDOW(about), abouttitle);
 		gtk_container_border_width(GTK_CONTAINER(about), 2);
 		gtk_widget_set_usize(about, 510, 370);
diff -r 29f95b2b3e38 -r b402a23f35df src/aim.c
--- a/src/aim.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/aim.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #ifdef USE_THEMES
 #include <gnome.h>
 #else
diff -r 29f95b2b3e38 -r b402a23f35df src/away.c
--- a/src/away.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/away.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
   *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #ifdef USE_APPLET
 #include <gnome.h>
 #include <applet-widget.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/browser.c
--- a/src/browser.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/browser.c	Wed Jun 07 17:14:32 2000 +0000
@@ -27,6 +27,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/buddy.c
--- a/src/buddy.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/buddy.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #ifdef USE_APPLET
 #include <gnome.h>
 #include <applet-widget.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/buddy_chat.c
--- a/src/buddy_chat.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/buddy_chat.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <string.h>
 #include <sys/time.h>
 #include <unistd.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/conversation.c
--- a/src/conversation.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/conversation.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/dialogs.c
--- a/src/dialogs.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/dialogs.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/gaim.h
--- a/src/gaim.h	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/gaim.h	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <gtk/gtk.h>
 #include <time.h>
 #include <stdio.h>
@@ -372,7 +375,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 358 $"
+#define REVISION "gaim:$Revision: 359 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
diff -r 29f95b2b3e38 -r b402a23f35df src/gaimrc.c
--- a/src/gaimrc.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/gaimrc.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <string.h>
 #include <sys/time.h>
 
diff -r 29f95b2b3e38 -r b402a23f35df src/gnome_applet_mgr.c
--- a/src/gnome_applet_mgr.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/gnome_applet_mgr.c	Wed Jun 07 17:14:32 2000 +0000
@@ -27,6 +27,9 @@
 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #ifdef USE_APPLET
 #include <string.h>
 #include <gdk_imlib.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/gtkhtml.c
--- a/src/gtkhtml.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/gtkhtml.c	Wed Jun 07 17:14:32 2000 +0000
@@ -20,6 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/html.c
--- a/src/html.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/html.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/network.c
--- a/src/network.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/network.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <netdb.h>
 #include <gtk/gtk.h>
 #include <unistd.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/oscar.c
--- a/src/oscar.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/oscar.c	Wed Jun 07 17:14:32 2000 +0000
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #ifdef USE_OSCAR
 
 #include <netdb.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/plugins.c
--- a/src/plugins.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/plugins.c	Wed Jun 07 17:14:32 2000 +0000
@@ -28,6 +28,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #ifdef GAIM_PLUGINS
 
 #include <string.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/prefs.c
--- a/src/prefs.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/prefs.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <string.h>
 #include <sys/time.h>
 
diff -r 29f95b2b3e38 -r b402a23f35df src/proxy.c
--- a/src/proxy.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/proxy.c	Wed Jun 07 17:14:32 2000 +0000
@@ -23,6 +23,9 @@
 /* it is intended to : 1st handle http proxy, using the CONNECT command
  , 2nd provide an easy way to add socks support */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/rvous.c
--- a/src/rvous.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/rvous.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/server.c
--- a/src/server.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/server.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <time.h>
 #include <stdio.h>
 #include <string.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/sound.c
--- a/src/sound.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/sound.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/toc.c
--- a/src/toc.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/toc.c	Wed Jun 07 17:14:32 2000 +0000
@@ -21,6 +21,9 @@
 
 
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <netdb.h>
 #include <gtk/gtk.h>
 #include <unistd.h>
diff -r 29f95b2b3e38 -r b402a23f35df src/util.c
--- a/src/util.c	Wed Jun 07 14:04:24 2000 +0000
+++ b/src/util.c	Wed Jun 07 17:14:32 2000 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>