Rename pkg-config name to elpa_mt-$VERSION for OpenMP case

ELPA_2014.06/Makefile.am

@@ -173,7 +173,7 @@ endif
 
 # pkg-config stuff
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = elpa-@PACKAGE_VERSION@.pc
+pkgconfig_DATA = @PKG_CONFIG_FILE@
 
 # programs
 bin_PROGRAMS = \

ELPA_2014.06/Makefile.in

@@ -136,7 +136,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = elpa-${PACKAGE_VERSION}.pc
+CONFIG_CLEAN_FILES = ${PKG_CONFIG_FILE}
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -693,6 +693,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG_FILE = @PKG_CONFIG_FILE@
 RANLIB = @RANLIB@
 SCALAPACK_FCFLAGS = @SCALAPACK_FCFLAGS@
 SCALAPACK_LDFLAGS = @SCALAPACK_LDFLAGS@
@@ -830,7 +831,7 @@ dist_doc_DATA = README COPYING/COPYING COPYING/gpl.txt COPYING/lgpl.txt
 
 # pkg-config stuff
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = elpa-@PACKAGE_VERSION@.pc
+pkgconfig_DATA = @PKG_CONFIG_FILE@
 elpa1_test_real_SOURCES = test/test_real.F90
 elpa1_test_real_LDADD = $(build_lib)
 elpa2_test_real_SOURCES = test/test_real2.F90
@@ -928,7 +929,7 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-elpa-${PACKAGE_VERSION}.pc: $(top_builddir)/config.status $(srcdir)/elpa.pc.in
+${PKG_CONFIG_FILE}: $(top_builddir)/config.status $(srcdir)/elpa.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)

ELPA_2014.06/configure

@@ -636,6 +636,7 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+PKG_CONFIG_FILE
 with_amd_bulldozer_kernel
 WITH_BLACS
 WITH_MKL
@@ -21704,9 +21705,16 @@ mkdir modules
 # with a space between -l and gfortran. The empty -l is then included
 # into "postdeps_FC" and causes linking errors later on.
 postdeps_FC=$(echo $postdeps_FC | sed 's/-l //g')
-echo "postdeps_FC=$postdeps_FC"
 
-ac_config_files="$ac_config_files Makefile elpa-${PACKAGE_VERSION}.pc:elpa.pc.in"
+if test x"${with_openmp}" = x"yes"; then
+	MT="_mt"
+else
+	MT=""
+fi
+PKG_CONFIG_FILE=elpa${MT}-${PACKAGE_VERSION}.pc
+
+
+ac_config_files="$ac_config_files Makefile ${PKG_CONFIG_FILE}:elpa.pc.in"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -22972,7 +22980,7 @@ do
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "elpa-${PACKAGE_VERSION}.pc") CONFIG_FILES="$CONFIG_FILES elpa-${PACKAGE_VERSION}.pc:elpa.pc.in" ;;
+    "${PKG_CONFIG_FILE}") CONFIG_FILES="$CONFIG_FILES ${PKG_CONFIG_FILE}:elpa.pc.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

ELPA_2014.06/configure.ac

@@ -1236,11 +1236,17 @@ mkdir modules
 # with a space between -l and gfortran. The empty -l is then included
 # into "postdeps_FC" and causes linking errors later on.
 postdeps_FC=$(echo $postdeps_FC | sed 's/-l //g')
-echo "postdeps_FC=$postdeps_FC"
+
+if test x"${with_openmp}" = x"yes"; then
+	MT="_mt"
+else
+	MT=""
+fi
+AC_SUBST([PKG_CONFIG_FILE],[elpa${MT}-${PACKAGE_VERSION}.pc])
 
 AC_CONFIG_FILES([
   Makefile
-  elpa-${PACKAGE_VERSION}.pc:elpa.pc.in
+  ${PKG_CONFIG_FILE}:elpa.pc.in
 ])
 AC_OUTPUT
 grep "^#define" config.h > config-f90.h