From b36f594450a401300d9f83ea365009cd146ae24f Mon Sep 17 00:00:00 2001
From: Joe Hunkeler <jhunkeler@gmail.com>
Date: Sun, 4 Oct 2015 14:09:21 -0400
Subject: Fix compatibility issues

---
 sextractor/sextractor-generic.ini | 28 +++++++++++++++++++++++-----
 sextractor/sextractor.ini         | 21 +++++++++++++++++++--
 2 files changed, 42 insertions(+), 7 deletions(-)

(limited to 'sextractor')

diff --git a/sextractor/sextractor-generic.ini b/sextractor/sextractor-generic.ini
index b85bf8f..66fb558 100644
--- a/sextractor/sextractor-generic.ini
+++ b/sextractor/sextractor-generic.ini
@@ -17,23 +17,41 @@ number : 0
 
 [requirements]
 build :
-    #gcc >=4.6 [darwin]
+    #gcc >=4.6 [osx]
     fftw
     pkgconfig
-    atlas-generic
+    atlas-generic [osx]
     
 run :
     fftw
-    atlas-generic
+    atlas-generic [osx]
     #none
 
 [cbc_build]
 linux :
+    ATLAS=/usr
+    LIBDIR=lib
+    case $$(uname) in
+        Linux)
+            if [[ $$(uname -m) == *x86_64* ]]; then
+                LIBDIR=lib64/atlas
+            else
+                LIBDIR=lib/atlas
+            fi
+        ;;
+        Darwin)
+            ATLAS=/usr/local/atlas
+        ;;
+        *)
+        ;;
+    esac
+
     ./configure --prefix=$$PREFIX \
     --with-fftw-libdir=$$PREFIX/lib \
     --with-fftw-incdir=$$PREFIX/include \
-    --with-atlas-libdir=$$PREFIX/lib \
-    --with-atlas-incdir=$$PREFIX/include
+    --with-atlas-libdir="$$ATLAS/$$LIBDIR" \
+    --with-atlas-incdir="$$ATLAS/include"
+
     make -j $${CPU_COUNT}
     make install
 windows :
diff --git a/sextractor/sextractor.ini b/sextractor/sextractor.ini
index 30918e3..647d3e5 100644
--- a/sextractor/sextractor.ini
+++ b/sextractor/sextractor.ini
@@ -26,11 +26,28 @@ run :
 
 [cbc_build]
 linux :
+    ATLAS=/usr
+    LIBDIR=lib
+    case $$(uname) in
+        Linux)
+            if [[ $$(uname -m) == *x86_64* ]]; then
+                LIBDIR=lib64/atlas
+            else
+                LIBDIR=lib/atlas
+            fi
+        ;;
+        Darwin)
+            ATLAS=/usr/local/atlas
+        ;;
+        *)
+        ;;
+    esac
+    
     ./configure --prefix=$$PREFIX \
     --with-fftw-libdir=$$PREFIX/lib \
     --with-fftw-incdir=$$PREFIX/include \
-    --with-atlas-libdir='/usr/local/atlas/lib' \
-    --with-atlas-incdir='/usr/local/atlas/include'
+    --with-atlas-libdir="$$ATLAS/$$LIBDIR" \
+    --with-atlas-incdir="$$ATLAS/include"
     make -j $${CPU_COUNT}
     make install
 windows :
-- 
cgit