Patch to build gnudatalanguage with Debian's antlr instead of the
embedded copy in src/antlr. Patch by Axel Beckert <abe@debian.org>,
15-Feb-2011

Index: gnudatalanguage/src/Makefile.in
===================================================================
--- gnudatalanguage.orig/src/Makefile.in	2010-08-25 15:57:07.000000000 +0200
+++ gnudatalanguage/src/Makefile.in	2011-02-15 22:37:02.635803162 +0100
@@ -47,8 +47,7 @@
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
-@BUILDASLIBRARY_TRUE@libgdl_la_DEPENDENCIES =  \
-@BUILDASLIBRARY_TRUE@	$(top_builddir)/src/antlr/libantlr.la
+@BUILDASLIBRARY_TRUE@libgdl_la_DEPENDENCIES = /usr/lib/libantlr.la
 am__libgdl_la_SOURCES_DIST = allix.hpp allix.cpp prognode.hpp \
 	prognodeexpr.hpp accessdesc.hpp arrayindex.hpp assocdata.cpp \
 	assocdata.hpp basegdl.hpp basic_fun_cl.cpp basic_fun_cl.hpp \
@@ -262,8 +261,7 @@
 @BUILDASLIBRARY_FALSE@am_gdl_OBJECTS = $(am__objects_2) \
 @BUILDASLIBRARY_FALSE@	gdl-gdl.$(OBJEXT) gdl-lapack.$(OBJEXT)
 gdl_OBJECTS = $(am_gdl_OBJECTS)
-@BUILDASLIBRARY_FALSE@gdl_DEPENDENCIES =  \
-@BUILDASLIBRARY_FALSE@	$(top_builddir)/src/antlr/libantlr.a
+@BUILDASLIBRARY_FALSE@gdl_DEPENDENCIES = /usr/lib/libantlr.a
 gdl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(gdl_CXXFLAGS) $(CXXFLAGS) \
 	$(gdl_LDFLAGS) $(LDFLAGS) -o $@
@@ -471,7 +469,7 @@
 
 # set the include path found by configure
 INCLUDES = $(EXT_INCLUDES) $(all_includes)
-SUBDIRS = antlr pro
+SUBDIRS = pro
 cpp_hpp_files = allix.hpp allix.cpp prognode.hpp prognodeexpr.hpp \
 		accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
 		basegdl.hpp basic_fun_cl.cpp basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp \
@@ -526,7 +524,7 @@
 @BUILDASLIBRARY_FALSE@gdl_CXXFLAGS = $(AM_CXXFLAGS)
 # the library search path.
 @BUILDASLIBRARY_FALSE@gdl_LDFLAGS = $(all_libraries)
-@BUILDASLIBRARY_FALSE@gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+@BUILDASLIBRARY_FALSE@gdl_LDADD = /usr/lib/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 
 # build as library (for python module)
 @BUILDASLIBRARY_TRUE@noinst_LTLIBRARIES = libgdl.la
@@ -536,7 +534,7 @@
 # netCDF and HDF define some same symbols
 # hence -z muldefs has to be passed to the linker
 @BUILDASLIBRARY_TRUE@@DARWIN_TRUE@libgdl_la_LDFLAGS = $(all_libraries) -Wl,-m
-@BUILDASLIBRARY_TRUE@libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+@BUILDASLIBRARY_TRUE@libgdl_la_LIBADD = /usr/lib/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 all: all-recursive
 
 .SUFFIXES:
--- gnudatalanguage-0.9.orig/src/Makefile.am
+++ gnudatalanguage-0.9/src/Makefile.am
@@ -1,6 +1,6 @@
 # set the include path found by configure
 INCLUDES = $(EXT_INCLUDES) $(all_includes)
-SUBDIRS = antlr pro
+SUBDIRS = pro
 
 cpp_hpp_files = allix.hpp allix.cpp prognode.hpp prognodeexpr.hpp \
 		accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
@@ -62,7 +62,7 @@ gdl_SOURCES = $(cpp_hpp_files) gdl.cpp l
 gdl_CXXFLAGS = $(AM_CXXFLAGS)
 # the library search path.
 gdl_LDFLAGS = $(all_libraries)
-gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+gdl_LDADD = /usr/lib/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 endif
 
 # build as library (for python module)
@@ -78,6 +78,6 @@ else
 libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
 endif 
 
-libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+libgdl_la_LIBADD = /usr/lib/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 endif
 
--- gnudatalanguage-0.9.orig/configure.in
+++ gnudatalanguage-0.9/configure.in
@@ -1108,7 +1108,7 @@ dnl AC_CHECK_FUNCS(strdup strtod strtol
 dnl perform program name transformation
 dnl AC_ARG_PROGRAM
 
-AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile src/pro/Makefile src/pro/dicom/Makefile testsuite/Makefile doc/Makefile)
+AC_CONFIG_FILES(Makefile src/Makefile src/pro/Makefile src/pro/dicom/Makefile testsuite/Makefile doc/Makefile)
 AC_OUTPUT
 
 dnl == summary table =======================================
