From 852eea901588c9e49b8d52e502ea9e04bfe8e949 Mon Sep 17 00:00:00 2001
From: "Bastian M. Wojek" <basti@kth.se>
Date: Mon, 4 Jan 2010 20:07:35 +0000
Subject: [PATCH] Fixing part of the cygwin-installation. The shared BMWlibs
 cannot be built at the moment since libcuba is built static only. I am still
 thinking about including the C-part of Cuba into the BMWlibs if T.Hahn would
 not add shared library support to it.

---
 configure.ac                               | 4 ++--
 src/external/BMWIntegrator/BMWIntegrator.h | 1 +
 src/external/Makefile.am                   | 4 ++--
 src/musrgui/musrgui.pro                    | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 92c7a07b..5dbde2c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -478,8 +478,8 @@ dnl -----------------------------------------------
 dnl Specify the files that are going to be created by configure
 dnl -----------------------------------------------
 
-AM_CONDITIONAL([BMW_OPT], [test "${BUILD_BMW_LIBS}" -eq 1])
-AM_CONDITIONAL([AS_OPT], [test "${BUILD_AS_LIBS}" -eq 1])
+AM_CONDITIONAL([BUILD_BMWLIBS], [test "${BUILD_BMW_LIBS}" -eq 1])
+AM_CONDITIONAL([BUILD_ASLIBS], [test "${BUILD_AS_LIBS}" -eq 1])
 
 AC_CONFIG_FILES([Makefile \
                  src/Makefile \
diff --git a/src/external/BMWIntegrator/BMWIntegrator.h b/src/external/BMWIntegrator/BMWIntegrator.h
index 92db3f1e..3fec935e 100644
--- a/src/external/BMWIntegrator/BMWIntegrator.h
+++ b/src/external/BMWIntegrator/BMWIntegrator.h
@@ -36,6 +36,7 @@
 #include "Math/GSLMCIntegrator.h"
 #include "TMath.h"
 
+#include <cmath>
 #include <vector>
 
 using namespace std;
diff --git a/src/external/Makefile.am b/src/external/Makefile.am
index 0542056d..cb3603f3 100644
--- a/src/external/Makefile.am
+++ b/src/external/Makefile.am
@@ -1,8 +1,8 @@
-if AS_OPT
+if BUILD_ASLIBS
   ASDIRS = Nonlocal
 endif
 
-if BMW_OPT
+if BUILD_BMWLIBS
   BMWDIRS = TFitPofB-lib \
             libLFRelaxation \
             libGapIntegrals \
diff --git a/src/musrgui/musrgui.pro b/src/musrgui/musrgui.pro
index 1dd2dae2..e2c41fa6 100644
--- a/src/musrgui/musrgui.pro
+++ b/src/musrgui/musrgui.pro
@@ -5,7 +5,6 @@ macx:target.path = /Applications
 
 exists( /usr/bin/cygwin1.dll ) {
       QMAKE_LFLAGS_SHAPP = -Wl,--enable-auto-import
-      TARGET = musrgui.exe
 }
 
 INSTALLS += target