arts 1.0.2 cvs build problem

[Chris Cheney]

Here is a patch that will allow arts to compile with automake 1.6.2 as
well as 1.5.x.

Chris Cheney

-------------- next part --------------
diff -Nru arts-1.0.2/configure.in.in arts-1.0.2.new/configure.in.in
--- arts-1.0.2/configure.in.in	Mon Jun 17 11:25:25 2002
+++ arts-1.0.2.new/configure.in.in	Mon Jun 17 17:05:14 2002
@@ -626,5 +626,5 @@
 dnl Don't remove !
 dnl AC_OUTPUT(artsc/artsdsp)
 dnl AC_OUTPUT(soundserver/artsversion-new.h)
-
+dnl AC_OUTPUT(flow/gsl/gslconfig.h)
 
diff -Nru arts-1.0.2/flow/gsl/Makefile.am arts-1.0.2.new/flow/gsl/Makefile.am
--- arts-1.0.2/flow/gsl/Makefile.am	Fri Mar 22 11:31:43 2002
+++ arts-1.0.2.new/flow/gsl/Makefile.am	Mon Jun 17 17:03:10 2002
@@ -15,7 +15,6 @@
 
 libgsl_la_SOURCES = $(GSL_C_SRC) gslglib.c gslglibhash.cc gslartsthreads.cc
 libgsl_la_LIBADD = $(top_builddir)/mcop/libmcop.la -lm $(LIBPOSIX4)
-libgsl_la_COMPILE_FIRST = gslconfig.h
 libgsl_la_LDFLAGS = -no-undefined
 
 noinst_PROGRAMS = $(GSL_NOINST_PROGS)
diff -Nru arts-1.0.2/flow/gsl/gslconfig.h.in arts-1.0.2.new/flow/gsl/gslconfig.h.in
--- arts-1.0.2/flow/gsl/gslconfig.h.in	Wed Dec 31 18:00:00 1969
+++ arts-1.0.2.new/flow/gsl/gslconfig.h.in	Mon Jun 17 17:12:02 2002
@@ -0,0 +1,7 @@
+#define GSL_SIZEOF_PTH_MUTEX_T		(@GSL_SIZEOF_PTH_MUTEX_T@)
+#define GSL_SIZEOF_PTH_COND_T		(@GSL_SIZEOF_PTH_COND_T@)
+#define GSL_HAVE_MUTEXATTR_SETTYPE	(@GSL_HAVE_MUTEXATTR_SETTYPE@ && \
+					GSL_SIZEOF_PTH_MUTEX_T && \
+					GSL_SIZEOF_PTH_COND_T)
+#define GSL_SIZEOF_STD_INTMAX_T		(@GSL_SIZEOF_STD_INTMAX_T@)
+#define GSL_HAVE_LIBMAD			(@GSL_HAVE_LIBMAD@)
diff -Nru arts-1.0.2/flow/gsl/gslmakefile.inc arts-1.0.2.new/flow/gsl/gslmakefile.inc
--- arts-1.0.2/flow/gsl/gslmakefile.inc	Fri Mar 22 12:33:47 2002
+++ arts-1.0.2.new/flow/gsl/gslmakefile.inc	Mon Jun 17 17:03:51 2002
@@ -46,22 +46,6 @@
 	$(srcdir)/gsl-fftconf.sh 'perl $(srcdir)/gsl-fftgen.pl' \"gslfft.h\" >$@
 MAINTAINERCLEANFILES += gslfft.c
 
-gslconfig.h: $(top_srcdir)/configure Makefile
-	echo "/* Generated data from $< (by make $@) */" > xgen-gch \
-	&& echo >> xgen-gch \
-	&& echo "#define GSL_SIZEOF_PTH_MUTEX_T         (@GSL_SIZEOF_PTH_MUTEX_T@)" >> xgen-gch \
-	&& echo "#define GSL_SIZEOF_PTH_COND_T          (@GSL_SIZEOF_PTH_COND_T@)" >> xgen-gch \
-	&& echo "#define GSL_HAVE_MUTEXATTR_SETTYPE     (@GSL_HAVE_MUTEXATTR_SETTYPE@ && \\" >> xgen-gch \
-	&& echo "                                        GSL_SIZEOF_PTH_MUTEX_T && \\" >> xgen-gch \
-	&& echo "                                        GSL_SIZEOF_PTH_COND_T)" >> xgen-gch \
-	&& echo "#define GSL_SIZEOF_STD_INTMAX_T        (@GSL_SIZEOF_STD_INTMAX_T@)" >> xgen-gch \
-	&& echo "#define GSL_HAVE_LIBMAD                (@GSL_HAVE_LIBMAD@)" >> xgen-gch \
-	&& echo >> xgen-gch \
-	&& echo "/* Generated data ends here */" >> xgen-gch \
-	&& (cmp -s xgen-gch $@ || cp xgen-gch $@) \
-	&& rm -f xgen-gch
-CLEANFILES += gslconfig.h xgen-gch
-
 install-data-local:	gsl-install-data-local
 gsl-install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(gslincludedir)