Description: Add option --with-flavor=<flavor-name> to configure
 so that '_<flavor-name>' is appended to each built library, .e.g.
 libhdf5_<flavor-name>.so.
 This we can avoid library name collisions when installing both serial
 and $mpi flavors of the libraries:
 * serial is built with no flavor name
 * $mpi parallel versions use --with-flavor=$mpi
Author: Gilles Filippini <pini@debian.org>
Index: hdf5/configure.ac
===================================================================
--- hdf5.orig/configure.ac
+++ hdf5/configure.ac
@@ -3507,6 +3507,24 @@ fi
 ##
 AM_CONDITIONAL([HAVE_SHARED_CONDITIONAL], [test "X$enable_shared" = "Xyes"])
 
+## ----------------------------------------------------------------------
+## Option to use a flavor name
+##
+AC_ARG_WITH([flavor],
+  [AS_HELP_STRING([--with-flavor=<flavor_name>],
+    [append specified flavor name to the hdf5 libraries"'" names])],
+    [],
+    [with_flavor=""])
+if test -n "$with_flavor"; then
+  FLAVOR_NAME="$with_flavor"
+  FLAVOR="_$FLAVOR_NAME"
+else
+  FLAVOR_NAME="(none)"
+  FLAVOR=
+fi
+AC_SUBST([FLAVOR_NAME])
+AC_SUBST([FLAVOR])
+
 AC_CONFIG_FILES([src/libhdf5.settings
                  Makefile
                  src/Makefile
Index: hdf5/src/libhdf5.settings.in
===================================================================
--- hdf5.orig/src/libhdf5.settings.in
+++ hdf5/src/libhdf5.settings.in
@@ -10,6 +10,7 @@ General Information:
               Uname information: @UNAME_INFO@
                        Byte sex: @BYTESEX@
              Installation point: @prefix@
+		    Flavor name: @FLAVOR_NAME@
 
 Compiling Options:
 ------------------
Index: hdf5/src/Makefile.am
===================================================================
--- hdf5.orig/src/Makefile.am
+++ hdf5/src/Makefile.am
@@ -29,10 +29,10 @@ include $(top_srcdir)/config/lt_vers.am
 noinst_PROGRAMS = H5detect H5make_libsettings
 
 # Our main target, the HDF5 library
-lib_LTLIBRARIES=libhdf5.la
+lib_LTLIBRARIES=libhdf5@FLAVOR@.la
 
 # Add libtool numbers to the HDF5 library (from config/lt_vers.am)
-libhdf5_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
+libhdf5@FLAVOR@_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
 
 # H5Tinit.c and H5lib_settings.c are generated files and should be cleaned.
 MOSTLYCLEANFILES=H5Tinit.c H5lib_settings.c
@@ -40,7 +40,7 @@ MOSTLYCLEANFILES=H5Tinit.c H5lib_setting
 DISTCLEANFILES=H5pubconf.h
 
 # library sources
-libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
+libhdf5@FLAVOR@_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
         H5A.c H5Abtree2.c H5Adense.c H5Adeprec.c H5Aint.c H5Atest.c \
         H5AC.c H5AClog.c \
         H5B.c H5Bcache.c H5Bdbg.c \
@@ -115,12 +115,12 @@ libhdf5_la_SOURCES= H5.c H5checksum.c H5
 
 # Only compile parallel sources if necessary
 if BUILD_PARALLEL_CONDITIONAL
-    libhdf5_la_SOURCES += H5ACmpio.c H5Cmpio.c H5Dmpio.c H5Fmpi.c H5FDmpi.c H5FDmpio.c H5Smpio.c
+    libhdf5@FLAVOR@_la_SOURCES += H5ACmpio.c H5Cmpio.c H5Dmpio.c H5Fmpi.c H5FDmpi.c H5FDmpio.c H5Smpio.c
 endif
 
 # Only compile the direct VFD if necessary
 if DIRECT_VFD_CONDITIONAL
-    libhdf5_la_SOURCES += H5FDdirect.c
+    libhdf5@FLAVOR@_la_SOURCES += H5FDdirect.c
 endif
 
 # Public headers
@@ -139,7 +139,9 @@ include_HEADERS = hdf5.h H5api_adpt.h H5
 
 # install libhdf5.settings in lib directory
 settingsdir=$(libdir)
-settings_DATA=libhdf5.settings
+libhdf5@FLAVOR@.settings: libhdf5.settings
+	ln -s $< $@
+settings_DATA=libhdf5@FLAVOR@.settings
 
 # Number format detection
 # The LD_LIBRARY_PATH setting is a kludge.
@@ -188,7 +190,7 @@ $(top_srcdir)/src/H5overflow.h: $(top_sr
 # without HDF5 macros.
 .PHONY: trace
 
-trace: $(libhdf5_la_SOURCES)
+trace: $(libhdf5@FLAVOR@_la_SOURCES)
 	@for dep in $? dummy; do                                          \
 	 if test $$dep != "dummy" -a -n "$(PERL)"; then                      \
 	  case "$$dep" in                                                 \
Index: hdf5/test/testlibinfo.sh.in
===================================================================
--- hdf5.orig/test/testlibinfo.sh.in
+++ hdf5/test/testlibinfo.sh.in
@@ -79,7 +79,7 @@ fi
 # built too.
 if [ -n $Shared_Lib ]; then
    h5libdir=../src/.libs
-   shlib=$(grep dlname ../src/libhdf5.la | sed -e "s/dlname='//" -e "s/'//")
+   shlib=$(grep dlname ../src/libhdf5@FLAVOR@.la | sed -e "s/dlname='//" -e "s/'//")
 else
    h5libdir=../src
 fi 
@@ -98,9 +98,9 @@ fi
 
 # Though rare, libhdf5.a may not have been built.
 if [ x-$Static_Lib = x-yes ]; then
-    CHECK_LIBINFO ${h5libdir}/libhdf5.a
+    CHECK_LIBINFO ${h5libdir}/libhdf5@FLAVOR@.a
 else
-    SKIP ${h5libdir}/libhdf5.a
+    SKIP ${h5libdir}/libhdf5@FLAVOR@.a
 fi
 
 # Check if executables has the lib information only if shared lib is not
Index: hdf5/tools/misc/h5cc.in
===================================================================
--- hdf5.orig/tools/misc/h5cc.in
+++ hdf5/tools/misc/h5cc.in
@@ -29,6 +29,7 @@
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 libdir="@libdir@"
+libdevdir="@libdir@/hdf5/@FLAVOR_NAME@"
 includedir="@includedir@"
 HL="@HL@"
 
@@ -172,7 +173,7 @@ usage() {
 # libhdf5.settings file reside in the lib directory.
 showconfigure()
 {
-  cat ${libdir}/libhdf5.settings
+  cat ${libdir}/libhdf5@FLAVOR@.settings
   status=$?
 }
 
@@ -333,7 +334,7 @@ if test "x$do_link" = "xyes"; then
   else
    libraries=" $libraries  -lhdf5 "
   fi
-  link_args="$link_args -L${libdir}"
+  link_args="$link_args -L${libdevdir}"
 
   case "$kind" in
     gcc|linux*)
@@ -352,7 +353,7 @@ if test "x$do_link" = "xyes"; then
   esac
 
   if test -n "$flag"; then
-    shared_link="${flag}${libdir}"
+    shared_link="${flag}${libdevdir}"
   fi
 
   if test "x$USE_SHARED_LIB" != "xyes"; then
@@ -362,10 +363,10 @@ if test "x$do_link" = "xyes"; then
     for lib in $libraries; do
       case "$lib" in
         -lhdf5)
-          new_libraries="$new_libraries ${libdir}/libhdf5.a"
+          new_libraries="$new_libraries ${libdevdir}/libhdf5.a"
           ;;
         -lhdf5_hl)
-          new_libraries="$new_libraries ${libdir}/libhdf5_hl.a"
+          new_libraries="$new_libraries ${libdevdir}/libhdf5_hl.a"
           ;;
         *)
           new_libraries="$new_libraries $lib"
@@ -394,7 +395,7 @@ if test "x$do_link" = "xyes"; then
   # paths and libraries from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in 
   # from the hdf5 build. The order of the flags is intended to give precedence
   # to the user's flags.
-  $SHOW $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args $shared_link
+  $SHOW $CLINKER -I$includedir $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args $shared_link
   status=$?
 fi
 
Index: hdf5/c++/src/h5c++.in
===================================================================
--- hdf5.orig/c++/src/h5c++.in
+++ hdf5/c++/src/h5c++.in
@@ -27,6 +27,7 @@
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 libdir="@libdir@"
+libdevdir="@libdir@/hdf5/@FLAVOR_NAME@"
 includedir="@includedir@"
 HL="@HL@"
 
@@ -161,7 +162,7 @@ usage() {
 # libhdf5.settings file reside in the lib directory.
 showconfigure()
 {
-  cat ${libdir}/libhdf5.settings
+  cat ${libdir}/libhdf5@FLAVOR@.settings
   status=$?
 }
 
@@ -319,7 +320,7 @@ if test "x$do_link" = "xyes"; then
   else
    libraries=" $libraries -lhdf5_cpp -lhdf5 "
   fi
-  link_args="$link_args -L${libdir}"
+  link_args="$link_args -L${libdevdir}"
 
   case "$kind" in
     gcc|linux*)
@@ -338,7 +339,7 @@ if test "x$do_link" = "xyes"; then
   esac
 
   if test -n "$flag"; then
-    shared_link="${flag}${libdir}"
+    shared_link="${flag}${libdevdir}"
   fi
 
   if test "x$USE_SHARED_LIB" != "xyes"; then
@@ -348,16 +349,16 @@ if test "x$do_link" = "xyes"; then
     for lib in $libraries; do
       case "$lib" in
         -lhdf5)
-          new_libraries="$new_libraries ${libdir}/libhdf5.a"
+          new_libraries="$new_libraries ${libdevdir}/libhdf5.a"
           ;;
         -lhdf5_hl)
-          new_libraries="$new_libraries ${libdir}/libhdf5_hl.a"
+          new_libraries="$new_libraries ${libdevdir}/libhdf5_hl.a"
           ;;
         -lhdf5_cpp)
-          new_libraries="$new_libraries ${libdir}/libhdf5_cpp.a"
+          new_libraries="$new_libraries ${libdevdir}/libhdf5_cpp.a"
           ;;
         -lhdf5_hl_cpp)
-          new_libraries="$new_libraries ${libdir}/libhdf5_hl_cpp.a"
+          new_libraries="$new_libraries ${libdevdir}/libhdf5_hl_cpp.a"
           ;;
         *)
           new_libraries="$new_libraries $lib"
@@ -387,7 +388,7 @@ if test "x$do_link" = "xyes"; then
   # from the hdf5 build. The order of the flags is intended to give precedence
   # to the user's flags.
 
-  $SHOW $CXXLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args $shared_link
+  $SHOW $CXXLINKER -I$includedir $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args $shared_link
 
   status=$?
 fi
Index: hdf5/fortran/src/h5fc.in
===================================================================
--- hdf5.orig/fortran/src/h5fc.in
+++ hdf5/fortran/src/h5fc.in
@@ -27,6 +27,7 @@
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 libdir="@libdir@"
+libdevdir="@libdir@/hdf5/@FLAVOR_NAME@"
 includedir="@includedir@"
 HL="@HL@"
 
@@ -156,7 +157,7 @@ usage() {
 # libhdf5.settings file reside in the lib directory.
 showconfigure()
 {
-  cat ${libdir}/libhdf5.settings
+  cat ${libdir}/libhdf5@FLAVOR@.settings
   status=$?
 }
 
@@ -306,7 +307,7 @@ if test "x$do_link" = "xyes"; then
   else
    libraries=" $libraries -lhdf5_fortran -lhdf5 "
   fi
-  link_args="$link_args -L${libdir}"
+  link_args="$link_args -L${libdevdir}"
 
   case "$host_os" in
     linux*)               flag="-Wl,-rpath -Wl," ;;
@@ -318,7 +319,7 @@ if test "x$do_link" = "xyes"; then
   esac
 
   if test -n "$flag"; then
-    shared_link="${flag}${libdir}"
+    shared_link="${flag}${libdevdir}"
   fi
 
   if test "x$USE_SHARED_LIB" != "xyes"; then
@@ -328,16 +329,16 @@ if test "x$do_link" = "xyes"; then
     for lib in $libraries; do
       case "$lib" in
         -lhdf5)
-          new_libraries="$new_libraries ${libdir}/libhdf5.a"
+          new_libraries="$new_libraries ${libdevdir}/libhdf5.a"
           ;;
         -lhdf5_hl)
-          new_libraries="$new_libraries ${libdir}/libhdf5_hl.a"
+          new_libraries="$new_libraries ${libdevdir}/libhdf5_hl.a"
           ;;
         -lhdf5_fortran)
-          new_libraries="$new_libraries ${libdir}/libhdf5_fortran.a"
+          new_libraries="$new_libraries ${libdevdir}/libhdf5_fortran.a"
           ;;
         -lhdf5hl_fortran)
-          new_libraries="$new_libraries ${libdir}/libhdf5hl_fortran.a"
+          new_libraries="$new_libraries ${libdevdir}/libhdf5hl_fortran.a"
           ;;
         *)
           new_libraries="$new_libraries $lib"
Index: hdf5/fortran/src/Makefile.am
===================================================================
--- hdf5.orig/fortran/src/Makefile.am
+++ hdf5/fortran/src/Makefile.am
@@ -29,10 +29,10 @@ AM_FCFLAGS+=-I$(top_srcdir)/src -I$(top_
 AM_FCLIBS=$(LIBHDF5)
 
 # This is our main target, the fortran library
-lib_LTLIBRARIES=libhdf5_fortran.la
+lib_LTLIBRARIES=libhdf5@FLAVOR@_fortran.la
 
 # Add libtool numbers to the HDF5 Fortran library (from config/lt_vers.am)
-libhdf5_fortran_la_LDFLAGS= -version-info $(LT_F_VERS_INTERFACE):$(LT_F_VERS_REVISION):$(LT_F_VERS_AGE) $(AM_LDFLAGS)
+libhdf5@FLAVOR@_fortran_la_LDFLAGS= -version-info $(LT_F_VERS_INTERFACE):$(LT_F_VERS_REVISION):$(LT_F_VERS_AGE) $(AM_LDFLAGS)
 
 # Some Fortran compilers can't build shared libraries, so sometimes we
 # want to build a shared C library and a static Fortran library.  If so,
@@ -43,7 +43,7 @@ else
 endif
 
 # Source files for the library.
-libhdf5_fortran_la_SOURCES=H5f90global.F90 \
+libhdf5@FLAVOR@_fortran_la_SOURCES=H5f90global.f90 \
           H5fortran_types.F90 H5_ff.F90 H5Aff.F90 H5Dff.F90 H5Eff.F90    \
           H5Fff.F90 H5Gff.F90 H5Iff.F90 H5Lff.F90 H5Off.F90 H5Pff.F90 H5Rff.F90 H5Sff.F90    \
           H5Tff.F90 H5Zff.F90 H5_gen.F90 H5fortkit.F90 \
@@ -51,7 +51,7 @@ libhdf5_fortran_la_SOURCES=H5f90global.F
           H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c HDF5.F90
 
 # HDF5 Fortran library depends on HDF5 Library. 
-libhdf5_fortran_la_LIBADD=$(LIBHDF5)
+libhdf5@FLAVOR@_fortran_la_LIBADD=$(LIBHDF5)
 
 # h5fc is generated during configure.
 # Remove it only when distclean.
Index: hdf5/hl/fortran/src/Makefile.am
===================================================================
--- hdf5.orig/hl/fortran/src/Makefile.am
+++ hdf5/hl/fortran/src/Makefile.am
@@ -27,10 +27,10 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top
 AM_FCFLAGS+=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
 
 # Our main target, the high-level fortran library
-lib_LTLIBRARIES=libhdf5hl_fortran.la
+lib_LTLIBRARIES=libhdf5@FLAVOR@hl_fortran.la
 
 # Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am)
-libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_HL_F_VERS_INTERFACE):$(LT_HL_F_VERS_REVISION):$(LT_HL_F_VERS_AGE) $(AM_LDFLAGS)
+libhdf5@FLAVOR@hl_fortran_la_LDFLAGS= -version-info $(LT_HL_F_VERS_INTERFACE):$(LT_HL_F_VERS_REVISION):$(LT_HL_F_VERS_AGE) $(AM_LDFLAGS)
 
 # Some Fortran compilers can't build shared libraries, so sometimes we
 # want to build a shared C library and a static Fortran library.  If so,
@@ -46,11 +46,11 @@ endif
 #endif
 
 # List sources to include in the HDF5 HL Fortran library.
-libhdf5hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \
+libhdf5@FLAVOR@hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \
 	H5DSff.F90 H5LTff.F90 H5TBff.F90 H5IMff.F90 H5LTff_gen.F90 H5TBff_gen.F90
 
 # HDF5 HL Fortran library depends on HDF5 Library.
-libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
+libhdf5@FLAVOR@hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
 
 # Fortran module files can have different extensions and different names
 # (e.g., different capitalizations) on different platforms.  Write rules
Index: hdf5/hl/src/Makefile.am
===================================================================
--- hdf5.orig/hl/src/Makefile.am
+++ hdf5/hl/src/Makefile.am
@@ -25,16 +25,16 @@ include $(top_srcdir)/config/lt_vers.am
 AM_CPPFLAGS+=-I$(top_srcdir)/src
 
 # This library is our main target.
-lib_LTLIBRARIES=libhdf5_hl.la
+lib_LTLIBRARIES=libhdf5@FLAVOR@_hl.la
 
 # Add libtool numbers to the HDF5 hl library (from config/lt_vers.am)
-libhdf5_hl_la_LDFLAGS= -version-info $(LT_HL_VERS_INTERFACE):$(LT_HL_VERS_REVISION):$(LT_HL_VERS_AGE) $(AM_LDFLAGS)
+libhdf5@FLAVOR@_hl_la_LDFLAGS= -version-info $(LT_HL_VERS_INTERFACE):$(LT_HL_VERS_REVISION):$(LT_HL_VERS_AGE) $(AM_LDFLAGS)
 
 # List sources to include in the HDF5 HL Library.
-libhdf5_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c H5LD.c
+libhdf5@FLAVOR@_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c H5LD.c
 
 # HDF5 HL library depends on HDF5 Library.
-libhdf5_hl_la_LIBADD=$(LIBHDF5)
+libhdf5@FLAVOR@_hl_la_LIBADD=$(LIBHDF5)
 
 # Public header files (to be installed)
 include_HEADERS=hdf5_hl.h H5DOpublic.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h H5LDpublic.h
Index: hdf5/config/commence.am
===================================================================
--- hdf5.orig/config/commence.am
+++ hdf5/config/commence.am
@@ -32,15 +32,15 @@ CP=cp
 RUNEXEC=$(RUNSERIAL)
 
 # Libraries to link to while building
-LIBHDF5=$(top_builddir)/src/libhdf5.la
+LIBHDF5=$(top_builddir)/src/libhdf5@FLAVOR@.la
 LIBH5TEST=$(top_builddir)/test/libh5test.la
-LIBH5F=$(top_builddir)/fortran/src/libhdf5_fortran.la
+LIBH5F=$(top_builddir)/fortran/src/libhdf5@FLAVOR@_fortran.la
 LIBH5FTEST=$(top_builddir)/fortran/test/libh5test_fortran.la
 LIBH5CPP=$(top_builddir)/c++/src/libhdf5_cpp.la
 LIBH5JNI=$(top_builddir)/java/src/jni/libhdf5_java.la
 LIBH5TOOLS=$(top_builddir)/tools/lib/libh5tools.la
-LIBH5_HL=$(top_builddir)/hl/src/libhdf5_hl.la
-LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
+LIBH5_HL=$(top_builddir)/hl/src/libhdf5@FLAVOR@_hl.la
+LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5@FLAVOR@hl_fortran.la
 LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 
 # Install directories that automake doesn't know about