[patch] patch to make gdl work with kdesdk installed

gdl-0.9_rc4-antlr.patch (text/plain), 1.67 KB, created by Jan Kohnert on 2010-02-25 21:35:33 UTC

diff -U 3 -H -d -r -N -- gdl-0.9rc4.old/configure.in gdl-0.9rc4/configure.in
--- gdl-0.9rc4.old/configure.in	2010-02-25 22:21:16.000000000 +0100
+++ gdl-0.9rc4/configure.in	2010-02-25 22:23:08.000000000 +0100
@@ -989,7 +989,7 @@
 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 =======================================
diff -U 3 -H -d -r -N -- gdl-0.9rc4.old/src/Makefile.am gdl-0.9rc4/src/Makefile.am
--- gdl-0.9rc4.old/src/Makefile.am	2010-02-25 22:21:16.000000000 +0100
+++ gdl-0.9rc4/src/Makefile.am	2010-02-25 22:24:08.000000000 +0100
@@ -1,6 +1,6 @@
 # set the include path found by configure
 INCLUDES = $(EXT_INCLUDES) $(all_includes)
-SUBDIRS = antlr pro
+SUBDIRS = pro
 noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
 
 cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
@@ -56,7 +56,7 @@
 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)
@@ -72,6 +72,6 @@
 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