Adding new search paths, double check library path, updating version

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for configRElem v0.01.085.
+# Generated by GNU Autoconf 2.69 for configRElem v0.2.876.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -576,8 +576,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='configRElem'
 PACKAGE_TARNAME='configrelem'
-PACKAGE_VERSION='v0.01.085'
-PACKAGE_STRING='configRElem v0.01.085'
+PACKAGE_VERSION='v0.2.876'
+PACKAGE_STRING='configRElem v0.2.876'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -603,7 +603,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -669,7 +668,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -922,15 +920,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1068,7 +1057,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1181,7 +1170,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures configRElem v0.01.085 to adapt to many kinds of systems.
+\`configure' configures configRElem v0.2.876 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1221,7 +1210,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1243,7 +1231,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of configRElem v0.01.085:";;
+     short | recursive ) echo "Configuration of configRElem v0.2.876:";;
    esac
   cat <<\_ACEOF
 
@@ -1316,7 +1304,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configRElem configure v0.01.085
+configRElem configure v0.2.876
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1333,7 +1321,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by configRElem $as_me v0.01.085, which was
+It was created by configRElem $as_me v0.2.876, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -1699,7 +1687,7 @@ if test -n "${UsrPrefix}"; then
 else
   #Checking the common folders
   HIDLOC="/.local"
-  for pr in /usr/local /usr/local/El /usr/local/opt/Elemental /opt/El "$HOME/local" "$HOME/local/El" "$HOME$HIDLOC"; do
+  for pr in /usr/local /usr/local/El /usr/local/Elemental /usr/share /usr/local/share /opt/El "$HOME/local" "$HOME/local/El" "$HOME$HIDLOC" /usr/local/Cellar/elemental /usr/opt/Cellar/elemental; do
     if test -f "${pr}/conf/ElVars"; then
       EL_PREFIX="${pr}"
       echo "Found Elemental in ${pr}"
@@ -1709,7 +1697,7 @@ else
 fi
 
 if test ! -n "${EL_PREFIX}" ; then
-   as_fn_error $? "Elemental not found, please specify the prefix of its installation using the flag --with-ElPrefix=/THE/PREFIX" "$LINENO" 5
+   as_fn_error $? "Elemental not found, please specify the prefix of its installation using the flag --configure-args=--with-ElPrefix=/THE/PREFIX" "$LINENO" 5
 fi
 
 
@@ -2257,7 +2245,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by configRElem $as_me v0.01.085, which was
+This file was extended by configRElem $as_me v0.2.876, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2310,7 +2298,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-configRElem config.status v0.01.085
+configRElem config.status v0.2.876
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(configRElem, v0.01.085)
+AC_INIT(configRElem, v0.2.876)
 AC_ARG_WITH(ElPrefix,
     AC_HELP_STRING(--with-ElPrefix=EL_PREFIX,
         The elemental prefix at the installation),
@@ -15,7 +15,7 @@ if test -n "${UsrPrefix}"; then
 else
   #Checking the common folders
   HIDLOC="/.local"
-  for pr in /usr/local /usr/local/El /usr/local/opt/Elemental /opt/El "$HOME/local" "$HOME/local/El" "$HOME$HIDLOC"; do
+  for pr in /usr/local /usr/local/El /usr/local/Elemental /usr/share /usr/local/share /opt/El "$HOME/local" "$HOME/local/El" "$HOME$HIDLOC" /usr/local/Cellar/elemental /usr/opt/Cellar/elemental; do
     if test -f "${pr}/conf/ElVars"; then
       EL_PREFIX="${pr}"
       echo "Found Elemental in ${pr}"
@@ -25,7 +25,7 @@ else
 fi
 
 if test ! -n "${EL_PREFIX}" ; then
-   AC_MSG_ERROR([Elemental not found, please specify the prefix of its installation using the flag --with-ElPrefix=/THE/PREFIX])
+   AC_MSG_ERROR([Elemental not found, please specify the prefix of its installation using the flag --configure-args=--with-ElPrefix=/THE/PREFIX])
 fi
 
 AC_SUBST(EL_PREFIX)

src/Makevars.in

@@ -1,7 +1,20 @@
 include @EL_PREFIX@/conf/ElVars
 
+#To check if ElVars has the right location
+
+ifneq (,$(wildcard $(EL_LIB)/libEl* ))
+	EL_LIBR=$(EL_LIB)
+else
+	ifneq (,$(wildcard $(EL_LIB)64/libEl* ))
+	  EL_LIBR=$(EL_LIB)64
+  else
+#Go back to the original
+  EL_LIBR=$(EL_LIB)
+  endif
+endif
+
 CC_FLAGS = -std=c99 -O3
-EL_PATH=-L$(EL_LIB) -L$(EL_LIB)/external/pmrrr
+EL_PATH=-L$(EL_LIBR) -L$(EL_LIBR)/external/pmrrr
 LINK_FLAGS = $(EL_LINK_FLAGS)
 
 PKG_CFLAGS = $(CC_FLAGS)  $(R_INC) $(ALL_MPI_FLAGS) $(ALL_MATH_INC)