Mercurial > pidgin.yaz

--- a/configure.in	Tue Nov 14 05:21:16 2000 +0000
+++ b/configure.in	Tue Nov 14 10:34:10 2000 +0000
@@ -36,7 +36,7 @@
 AC_SUBST(LIBOBJS)

 dnl This is a bad, bad hack.  I am a bad, bad man.
-CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I../"
+CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I\$(top_srcdir)"

 AC_ARG_ENABLE(distrib,,,enable_distrib=no)
 AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
@@ -49,7 +49,7 @@
 AC_ARG_ENABLE(plugins, [  --disable-plugins       compile with out plugin support],,enable_plugins=yes)
 AC_ARG_ENABLE(perl,    [  --disable-perl          compile without perl scripting],,enable_perl=yes)
 AC_ARG_ENABLE(debug,   [  --enable-debug          compile with debugging support],,enable_debug=no)
-AC_ARG_ENABLE(screensaver,   [  --disable-screensaver     compile without  X screensaver extension],,enable_xss=yes)
+AC_ARG_ENABLE(screensaver,   [  --disable-screensaver   compile without  X screensaver extension],,enable_xss=yes)
 AM_CONDITIONAL(PLUGINS, test "x$enable_plugins" = "xyes")
 AC_ARG_ENABLE(,,,)

@@ -58,7 +58,7 @@
 	AC_DEFINE(DEBUG)
 fi

-CFLAGS="$CFLAGS -I../libfaim -I../libfaim/faim"
+CFLAGS="$CFLAGS -I\$(top_srcdir)/libfaim -I\$(top_srcdir)/libfaim/faim"
 LDADD="$LDADD -L../libfaim -lfaim"

 if test "x$enable_gnome" = "xyes" ; then
--- a/plugins/Makefile.am	Tue Nov 14 05:21:16 2000 +0000
+++ b/plugins/Makefile.am	Tue Nov 14 10:34:10 2000 +0000
@@ -1,7 +1,7 @@
 LDFLAGS += $(LDADD) $(LIBS) -ggdb -shared
 SUFFIXES = .c .so
 .c.so:
-	$(CC) $(CFLAGS) -I../src -DVERSION=\"$(VERSION)\" -fPIC -o $@ $< $(LDFLAGS) $(PLUGIN_LIBS)
+	$(CC) $(CFLAGS) -I\$(top_srcdir)/src -I\$(top_srcdir) -DVERSION=\"$(VERSION)\" -fPIC -o $@ $< $(LDFLAGS) $(PLUGIN_LIBS)

 if PLUGINS

@@ -18,4 +18,4 @@

 EXTRA_DIST = ChangeLog PERL-HOWTO CRAZY HOWTO SIGNALS autorecon.c error.c filectl.c \
 	gaiminc.c iconaway.c lagmeter.c notify.c simple.c spellchk.c \
-	toc_commands.c events.c gaim.pl
+	toc_commands.c events.c gaim.pl irc.c
--- a/plugins/yay/Makefile.am	Tue Nov 14 05:21:16 2000 +0000
+++ b/plugins/yay/Makefile.am	Tue Nov 14 10:34:10 2000 +0000
@@ -1,4 +1,4 @@
-CFLAGS += -I../../src
+CFLAGS += -I\$(top_srcdir)/src
 LIBS = $(GTK_LIBS)

 pkgdir = $(libdir)/gaim
--- a/sounds/Makefile.am	Tue Nov 14 05:21:16 2000 +0000
+++ b/sounds/Makefile.am	Tue Nov 14 10:34:10 2000 +0000
@@ -9,31 +9,14 @@
 clean distclean:
 	rm -f BuddyArrive.h BuddyLeave.h Send.h Receive.h

-BuddyArrive.h: au2h BuddyArrive.au
-	./au2h BuddyArrive.au BuddyArrive.h
-
-BuddyLeave.h: au2h BuddyLeave.au
-	./au2h BuddyLeave.au BuddyLeave.h
+BuddyArrive.h: BuddyArrive.au au2h
+	./au2h $< $@

-Send.h: au2h Send.au
-	./au2h Send.au Send.h
-
-Receive.h: au2h Receive.au
-	./au2h Receive.au Receive.h
+BuddyLeave.h: BuddyLeave.au au2h
+	./au2h $< $@

-#if GNOMEAPPLET
-#gnomedata = `@GNOME_CONFIG@ --datadir`
-#gaimsoundsdir = $(gnomedata)/sounds/gaim
-#gaimsounds_DATA = $(EXTRA_DIST)
-#endif
-#
-#if DISTRIB
-#gaimdistribdir = $(datadir)/sounds/gaim
-#gaimdistrib_DATA = $(EXTRA_DIST)
-#endif
-#
-#if GNOMEBITS
-#bitsdata = `@GNOME_CONFIG@ --datadir`
-#bitssoundsdir = $(bitsdata)/sounds/gaim
-#bitssounds_DATA = $(EXTRA_DIST)
-#endif
+Send.h: Send.au au2h
+	./au2h $< $@
+
+Receive.h: Receive.au au2h
+	./au2h $< $@
--- a/sounds/au2h.c	Tue Nov 14 05:21:16 2000 +0000
+++ b/sounds/au2h.c	Tue Nov 14 10:34:10 2000 +0000
@@ -15,6 +15,8 @@
 	FILE *f;
 	int res,x;
 	char buf[BUF_SIZE];
+	char file[256];
+	int offset = 0, cnt;

 	fd = open(argv[1], O_RDONLY);
 	if (fd < 0) {
@@ -27,7 +29,16 @@
 		exit(1);
 	}
 	argv[1][strlen(argv[1])-3]='\0';
-	fprintf(f, "static unsigned char %s[] = {\n", argv[1]);
+	cnt = strlen(argv[1]);
+	while (offset != cnt) {
+		if (argv[1][cnt - offset] == '/') {
+			offset--;
+			break;
+		}
+		offset++;
+	}
+	sprintf(file, "%s", &argv[1][cnt - offset]);
+	fprintf(f, "static unsigned char %s[] = {\n", file);
 	read(fd, buf, 8); /* id & offset */
 	read(fd, buf, 8); /* len & encoding */
 	read(fd, buf, 8); /* rate & count */