From be9dbed4e1d4a9abe87ea0ed4db001ccb92cf5d7 Mon Sep 17 00:00:00 2001
From: "Bastian M. Wojek" <basti@kth.se>
Date: Sat, 20 Jun 2009 16:43:19 +0000
Subject: [PATCH] Added a MacOSX detail

---
 configure.ac                                   | 13 +++++++++++--
 src/classes/PMusr.pc.in                        |  2 +-
 src/external/TLemRunHeader/TLemRunHeader.pc.in |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index befba6f3..9f11f21b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,9 @@ AC_ARG_WITH([fftw3],
       elif test -r /usr/include/fftw3.h; then
         FFTW3_PREFIX="/usr"
         AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the no just above)])
+      elif test -r /sw/include/fftw3.h; then
+        FFTW3_PREFIX="/sw"
+        AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the no just above)])
       else
         AC_MSG_ERROR(
         [FFTW3 not found. Please call configure with the --with-fftw3 option.
@@ -138,6 +141,9 @@ AC_ARG_WITH([gsl],
       elif test -r /usr/include/gsl/gsl_sf_hyperg.h; then
         GSL_PREFIX="/usr"
         AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the no just above)])
+      elif test -r /sw/include/gsl/gsl_sf_hyperg.h; then
+        GSL_PREFIX="/sw"
+        AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the no just above)])
       else
         AC_MSG_ERROR(
         [GSL not found. Please call configure with the --with-gsl option.
@@ -177,6 +183,9 @@ AC_ARG_WITH([boostinc],
       elif test -r /usr/include/boost/spirit.hpp; then
         BOOST_INCLUDE="/usr/include"
         AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers... (ignore the no just above)])
+      elif test -r /sw/include/boost/spirit.hpp; then
+        BOOST_INCLUDE="/sw/include"
+        AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers... (ignore the no just above)])
       else
         AC_MSG_ERROR(
         [Boost not found. Please call configure with the --with-boostinc option.
@@ -203,8 +212,8 @@ dnl -----------------------------------------------
 
 ROOT_PATH([5.22/00], [], AC_MSG_ERROR([Either ROOT is not installed correctly or the version is too old... please check!]))
 
-ROOT_LIBS="[-L@ROOTLIBDIR@ @ROOTGLIBS@ -lMinuit2 -lMathMore -lXMLParser]"
-ROOT_CFLAGS="[-I@ROOTINCDIR@ @ROOTCFLAGS@]"
+ROOT_LIBS="-L@ROOTLIBDIR@ @ROOTGLIBS@ -lMinuit2 -lMathMore -lXMLParser"
+ROOT_CFLAGS="-I@ROOTINCDIR@ @ROOTCFLAGS@"
 AC_SUBST(ROOT_LIBS)
 AC_SUBST(ROOT_CFLAGS)
 
diff --git a/src/classes/PMusr.pc.in b/src/classes/PMusr.pc.in
index 9ca50a0e..8b852f0d 100644
--- a/src/classes/PMusr.pc.in
+++ b/src/classes/PMusr.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@
 
 Name: PMusr
 Description: C++ shared library providing musr classes
-Version: @VERSION@
+Version: @MUSR_VERSION@
 Libs: -L${libdir} -l@MUSR_LIBRARY_NAME@
 Cflags: -I${includedir}
diff --git a/src/external/TLemRunHeader/TLemRunHeader.pc.in b/src/external/TLemRunHeader/TLemRunHeader.pc.in
index 0e3e8feb..1f2b9567 100644
--- a/src/external/TLemRunHeader/TLemRunHeader.pc.in
+++ b/src/external/TLemRunHeader/TLemRunHeader.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@
 
 Name: TLemRunHeader
 Description: C++ shared library providing the LEM Run Header class
-Version: @VERSION@
+Version: @LEM_VERSION@
 Libs: -L${libdir} -l@LEM_LIBRARY_NAME@
 Cflags: -I${includedir}