[Dune] bugs/problems: duneproject, some Makefile.am in dune-grid, installation

[Klaus Schneider]

Dear DUNE community,

the duneproject script had two small bugs preventing it from running which I 
have resolved, find a patch below. 

In dune-grid, some Makefile.am files had -lcommon in them. This prevents 
the dune-grid module to be built when dune-common is installed somewhere, 
as the library is renamed to dunecommon in the installation. Replacing
-lcommon with $(DUNE_COMMON_LIBS) resolves the problem, as this
variable contains the correct name, find a patch below.

Another problem is that wmlwrap is not found when dune-common is only 
available installed on the system and the source is not available is that the 
wmlwrap script is not found. I think that packages should be compilable 
even if the required DUNE modules are only installed and the source is 
not there. My suggestion is to install the wmlwrap script somewhere in
/usr/lib/dune-common or /usr/bin. Also, available DUNE modules are not 
found if the source is unavailable, i.e. even if all DUNE modules are 
installed e.g. in the /usr hierachy, duneproject claims there are no modules 
available because the dunemodules.inc script does not detect them as 
the dune.modules files are not installed. However I don't have a 
ready-to-use suggestion how to resolve these problems.

Klaus


--- dune-common.orig/bin/duneproject	2006-09-07 10:46:29.000000000 +0200
+++ dune-common/bin/duneproject	2006-09-07 10:45:02.000000000 +0200
@@ -20,7 +20,7 @@
   for i in `echo $searchpath | sed -e 's/:/ /g'`; do
     if test -e "$i/$prog" ; then
 	canonicalpath="$i"
-	break
+	return
     fi
   done
   echo "Error: no canonical path found"
@@ -43,7 +43,7 @@
 
   # Read the modules find part
   canonicalizepath $0
-. $(cd $canonicalpath); pwd)/dunemodules.inc
+. $(cd $canonicalpath; pwd)/dunemodules.inc
 
   if [ "$MODULES" = "" ]; then
     find_modules .


diff -ru dune-grid.orig/grid/common/Makefile.am dune-grid/grid/common/Makefile.am
--- dune-grid.orig/grid/common/Makefile.am	2006-09-07 13:06:33.000000000 +0200
+++ dune-grid/grid/common/Makefile.am	2006-09-07 11:33:32.000000000 +0200
@@ -2,7 +2,7 @@
 
 noinst_LTLIBRARIES = libgridcommon.la
 libgridcommon_la_SOURCES = referenceelements.cc
-libgridcommon_la_LIBADD = quadraturerules/libquadraturerules.la -lcommon
+libgridcommon_la_LIBADD = quadraturerules/libquadraturerules.la $(DUNE_COMMON_LIBS)
 
 commondir = $(includedir)/dune/grid/common
 common_HEADERS = virtualrefinement.cc capabilities.hh \
diff -ru dune-grid.orig/grid/io/file/Makefile.am dune-grid/grid/io/file/Makefile.am
--- dune-grid.orig/grid/io/file/Makefile.am	2006-09-07 13:06:33.000000000 +0200
+++ dune-grid/grid/io/file/Makefile.am	2006-09-07 11:34:15.000000000 +0200
@@ -14,6 +14,6 @@
 endif
 
 libfileio_la_SOURCES =
-libfileio_la_LIBADD = $(AMIRALIB) -lcommon
+libfileio_la_LIBADD = $(AMIRALIB) $(DUNE_COMMON_LIBS)
 
 include $(top_srcdir)/am/global-rules
diff -ru dune-grid.orig/grid/Makefile.am dune-grid/grid/Makefile.am
--- dune-grid.orig/grid/Makefile.am	2006-09-07 13:06:33.000000000 +0200
+++ dune-grid/grid/Makefile.am	2006-09-07 11:35:20.000000000 +0200
@@ -20,7 +20,7 @@
 
 # construct only from sub-libraries
 libgrid_la_SOURCES =
-libgrid_la_LIBADD = $(ONEDLIB) $(UGLIB) $(ALULIB) $(COMMONLIB) -lcommon
+libgrid_la_LIBADD = $(ONEDLIB) $(UGLIB) $(ALULIB) $(COMMONLIB) $(DUNE_COMMON_LIBS)
 
 # These libraries do not need other libraries besides lcommon
 griddir = $(includedir)/dune/grid
diff -ru dune-grid.orig/grid/onedgrid/Makefile.am dune-grid/grid/onedgrid/Makefile.am
--- dune-grid.orig/grid/onedgrid/Makefile.am	2006-09-07 13:06:33.000000000 +0200
+++ dune-grid/grid/onedgrid/Makefile.am	2006-09-07 11:34:47.000000000 +0200
@@ -3,7 +3,7 @@
 noinst_LTLIBRARIES = libonedgrid.la
 
 libonedgrid_la_SOURCES = onedgrid.cc
-libonedgrid_la_LIBADD = -lcommon
+libonedgrid_la_LIBADD = $(DUNE_COMMON_LIBS)
 
 onedgriddir = $(includedir)/dune/grid/onedgrid/
 onedgrid_HEADERS = \
diff -ru dune-grid.orig/grid/uggrid/Makefile.am dune-grid/grid/uggrid/Makefile.am
--- dune-grid.orig/grid/uggrid/Makefile.am	2006-09-07 13:06:33.000000000 +0200
+++ dune-grid/grid/uggrid/Makefile.am	2006-09-07 11:35:49.000000000 +0200
@@ -6,7 +6,7 @@
 
 libuggrid_la_SOURCES  = uggrid.cc uggridentity.cc boundaryextractor.cc boundaryextractor.hh
 libuggrid_la_CXXFLAGS = $(AM_CPPFLAGS) $(UG_CPPFLAGS) 
-libuggrid_la_LIBADD   = $(UG_LDFLAGS) $(UG_LIBS) -lcommon
+libuggrid_la_LIBADD   = $(UG_LDFLAGS) $(UG_LIBS) $(DUNE_COMMON_LIBS)
 
 endif
 

--

Klaus Schneider
Universität Heidelberg
Institut für Umweltphysik
Im Neuenheimer Feld 229
D-69120 Heidelberg
Germany

klaus.schneider at iup.uni-heidelberg.de
Tel.: +49 (0)6221/54-6318
Fax: +49 (0)6221/54-6405
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.dune-project.org/pipermail/dune/attachments/20060907/5b24903c/attachment.sig>