1 files changed, 21 insertions, 8 deletions
diff --git a/academic/meep/meep.SlackBuild b/academic/meep/meep.SlackBuild
index 347fb3f9aef2..bb3cb854d2b1 100644
--- a/academic/meep/meep.SlackBuild
+++ b/academic/meep/meep.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=meep
-VERSION=${VERSION:-1.12.0}
+VERSION=${VERSION:-1.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,13 +74,29 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-LOCALCONFIGS=" --without-python --with-mpi "
+# if there is no configure script, try to build one!
+if [ ! -f ./configure ] ; then 
+  ./autogen.sh
+fi
+
+
+LOCALCONFIGS=
+XDBFILE=/etc/sbo_pkg_options.conf
+if [ -f ${XDBFILE} ] ; then 
+  LOCALCONFIGS=${LOCALCONFIGS}" "$(grep "^${PRGNAM}:" ${XDBFILE} | grep -v '^#' | awk -F: '{print$2}') 
+  echo Build options selected by file: LOCALCONFIGS=${LOCALCONFIGS}
+fi
+if [  -n "${SBOPTIONS_MEEP}" ] ; then
+  LOCALCONFIGS=${LOCALCONFIGS}" "${SBOPTIONS_MEEP}
+  echo Build options selected by environment: LOCALCONFIGS=${LOCALCONFIGS}
+fi
 
-# check for the Atlas replacement for blas; if the libraries are found,
+  
+# check for the Atlas replacement for blas; if the libraries are found, 
 #  add the configure option accordingly
 
-if [ -f /usr/lib${LIBDIRSUFFIX}/libatlas.a ] ; then
-  if [ -f /usr/lib${LIBIRSUFFIX}/libatlas.so ] ; then
+if [ -f /usr/lib/libatlas.a ] ; then
+  if [ -f /usr/lib/libatlas.so ] ; then
     echo "NOTICE: libatlas was found, configure --with-blas=atlas"
     LOCALCONFIGS=${LOCALCONFIGS}" --with-blas=atlas"
   fi
@@ -94,7 +110,6 @@ CPPFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  --disable-static \
   $LOCALCONFIGS
 
 make
@@ -115,11 +130,9 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-###sbolint off
 if [ -f $CWD/doinst.sh ] ; then 
   cat $CWD/doinst.sh > $PKG/install/doinst.sh
 fi
-###sbolint on
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}