PATCH: automake 1.5 / autoconf 2.50 fixes

[Ali Akcaagac <ali akcaagac stud fh-wilhelmshaven de>]

oki,

pawel and carlos was playing with that stuff already. i hope i
dont piss you guys off but the attached patch solves ALL issues
also *.gob files are created correctly now. automake 1.5 and
autoconf 2.50 support.. dunno if this still works with earlier
versions but since development goes forward....

nice day... ali

-- 
Name....: Ali Akcaagac
Status..: Student Of Computer & Economic Science
E-Mail..: mailto:ali.akcaagac@stud.fh-wilhelmshaven.de
WWW.....: http://www.fh-wilhelmshaven.de/~akcaagaa
--- balsa/libbalsa/Makefile.am.orig	Sun Oct  7 15:12:49 2001
+++ balsa/libbalsa/Makefile.am	Sun Oct  7 15:13:34 2001
@@ -1,7 +1,7 @@
 noinst_LIBRARIES = libbalsa.a
 
-libbalsa_a_SOURCES = 		\
-	address-book-ldap.c 	\
+libbalsa_a_SOURCES =		\
+	address-book-ldap.c	\
 	address-book-ldap.h	\
 	address-book-vcard.c	\
 	address-book-vcard.h	\
@@ -65,7 +65,7 @@
 	source-viewer.c		\
 	threads.h
 
-INCLUDES=-I${top_srcdir} -I${top_builddir}/libmutt \
+INCLUDES=				\
+	-I${top_srcdir}			\
+	-I${top_builddir}/libmutt	\
 	$(PCRE_CFLAGS)
-
-
--- balsa/libinit_balsa/Makefile.am.orig	Sun Oct  7 15:12:49 2001
+++ balsa/libinit_balsa/Makefile.am	Sun Oct  7 15:14:56 2001
@@ -1,14 +1,24 @@
 noinst_LIBRARIES = libinit_balsa.a
 
-libinit_balsa_a_SOURCES = 		\
-	$(BUILT_SOURCES)		\
-	$(GOB_SOURCES)			\
+libinit_balsa_a_SOURCES =		\
+	$(GOB_SRCLIST)			\
+	balsa-initdruid.gob		\
+	balsa-druid-page.gob		\
+	balsa-druid-page-error.gob	\
+	balsa-druid-page-welcome.gob	\
+	balsa-druid-page-user.gob	\
+	balsa-druid-page-directory.gob	\
+	balsa-druid-page-finish.gob
+
+BUILT_SOURCES =				\
+	$(GOB_SRCLIST)
+
+GOB_SRCLIST =				\
 	helper.c			\
 	helper.h			\
 	init_balsa.c			\
-	init_balsa.h
-
-BUILT_SOURCES =				\
+	init_balsa.h			\
+					\
 	balsa-initdruid.c		\
 	balsa-druid-page.c		\
 	balsa-druid-page-error.c	\
@@ -22,22 +32,14 @@
 	balsa-druid-page-welcome.h	\
 	balsa-druid-page-user.h		\
 	balsa-druid-page-directory.h	\
-	balsa-druid-page-finish.h	
-
-GOB_SOURCES =				\
-	balsa-initdruid.gob		\
-	balsa-druid-page.gob		\
-	balsa-druid-page-error.gob	\
-	balsa-druid-page-welcome.gob	\
-	balsa-druid-page-user.gob	\
-	balsa-druid-page-directory.gob	\
-	balsa-druid-page-finish.gob
+	balsa-druid-page-finish.h
 
-INCLUDES=-I. -I$(top_srcdir) \
-	-I$(top_srcdir)/libmutt \
-	-I$(top_srcdir)/libbalsa \
+INCLUDES=				\
+	-I.				\
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/libmutt		\
+	-I$(top_srcdir)/libbalsa	\
 	-I$(top_srcdir)/src
 
-%.c %.h: %.gob
-	(cd $(srcdir) && gob --no-private-header $<)
-
+%.c %.h %-private.h: %.gob
+	@GOB@ $<
--- balsa/src/Makefile.am.orig	Sun Oct  7 15:12:48 2001
+++ balsa/src/Makefile.am	Sun Oct  7 15:15:41 2001
@@ -1,6 +1,6 @@
 bin_PROGRAMS = balsa
 
-balsa_BASE_SOURCES =	\
+balsa_SOURCES =			\
 	address-book.c		\
 	address-book.h		\
 	address-book-config.c	\
@@ -55,24 +55,20 @@
 	toolbar-factory.c	\
 	toolbar-factory.h
 
-balsa_IDL_SOURCES = # balsa-common.c balsa-skels.c balsa-stubs.c		
-
-balsa_SOURCES = $(balsa_BASE_SOURCES) $(balsa_IDL_SOURCES)
-
-INCLUDES = \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	-I$(top_srcdir) \
+INCLUDES =						\
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+	-I$(top_srcdir)					\
 	-I$(top_srcdir)/libbalsa
 
-balsa_LDADD = \
-	$(top_builddir)/libbalsa/libbalsa.a	\
-	$(top_builddir)/libmutt/imap/libimap.a	\
-	$(top_builddir)/libmutt/libmutt.a	\
-	$(top_builddir)/libinit_balsa/libinit_balsa.a \
-	-lpspell \
-	-lltdl \
-	$(INTLLIBS) \
-	$(PCRE_LIBS) \
+balsa_LDADD =						\
+	$(top_builddir)/libbalsa/libbalsa.a		\
+	$(top_builddir)/libmutt/imap/libimap.a		\
+	$(top_builddir)/libmutt/libmutt.a		\
+	$(top_builddir)/libinit_balsa/libinit_balsa.a	\
+	-lpspell					\
+	-lltdl						\
+	$(INTLLIBS)					\
+	$(PCRE_LIBS)					\
 	$(PTHREAD_LIB)
 
 dist-hook:
@@ -83,11 +79,10 @@
 
 idl_DATA = #../idl/balsa.idl
 
-CORBA_SRCLIST = balsa-common.c balsa-skels.c balsa-stubs.c \
-                balsa.h
+CORBA_SRCLIST = balsa-common.c balsa-skels.c	\
+		balsa-stubs.c balsa.h
 
 BALSA_ORB_SRCLIST = orbit-glue.c 
 
-
 $(CORBA_SRCLIST): $(idl_DATA)
 		$(ORBIT_IDL) $(idl_DATA)
--- balsa/configure.in.orig	Sun Oct  7 15:12:49 2001
+++ balsa/configure.in	Sun Oct  7 15:17:27 2001
@@ -39,8 +39,6 @@
 AC_PROG_CC
 AC_ISC_POSIX
 AC_STDC_HEADERS
-AC_ARG_PROGRAM
-AM_PROG_LEX
 AC_PROG_YACC
 AM_PROG_LIBTOOL
 
@@ -369,11 +367,7 @@
 dnl ##########################################################################
 
 if test x"$BALSA_FROM_CVS" = xyes ; then
-	AC_CHECK_PROG(HAS_GOB, gob, yes, no)
-
-	if test x"$HAS_GOB" = xno ; then
-		AC_MSG_ERROR([As a CVS user, you need to get gob to build Balsa. It is available from Gnome CVS in the module 'gob'])
-	fi
+	GOB_CHECK(0.93.4)
 fi
 
 dnl ##########################################################################
--- balsa/website/Makefile.am.orig	Tue Oct  3 09:14:17 2000
+++ balsa/website/Makefile.am	Sun Oct  7 15:24:17 2001
@@ -35,10 +35,10 @@
 		basefile=`basename $$file`; \
 		$(INSTALL_DATA) $$file $(DESTDIR)$(websitedir)/images/$$basefile; \
 	done
-	# -for file in $(srcdir)/images/*.png; do \
-	# 	basefile=`basename $$file`; \
-	# 	$(INSTALL_DATA) $$file $(DESTDIR)$(websitedir)/images/$$basefile; \
-	# done
+#	-for file in $(srcdir)/images/*.png; do \
+#		basefile=`basename $$file`; \
+#		$(INSTALL_DATA) $$file $(DESTDIR)$(websitedir)/images/$$basefile; \
+#	done
 	$(mkinstalldirs) $(DESTDIR)$(websitedir)/screens
 	-for file in $(srcdir)/screens/*.jpg; do \
 		basefile=`basename $$file`; \