From 68b071ec2e675b564489b0ff25e3040ac61e9209 Mon Sep 17 00:00:00 2001
From: Zaher Salman <zaher.salman@psi.ch>
Date: Thu, 19 Feb 2015 17:08:16 +0100
Subject: [PATCH 1/2] Fixed compilation problem with fftw3 and added fake
 automake files to musredit and musrgui.

---
 configure.ac             |  2 ++
 src/Makefile.am          |  8 +++++---
 src/include/PMusr.h      |  6 ++++++
 src/musredit/Makefile.am | 26 ++++++++++++++++++++++++++
 src/musrgui/Makefile.am  | 26 ++++++++++++++++++++++++++
 5 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 src/musredit/Makefile.am
 create mode 100644 src/musrgui/Makefile.am

diff --git a/configure.ac b/configure.ac
index 0c219f42..1b82b9a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1167,6 +1167,8 @@ AC_CONFIG_FILES([Makefile \
                  src/external/libPhotoMeissner/Makefile \
                  src/external/libPhotoMeissner/classes/Makefile \
                  src/external/libBNMR/Makefile \
+                 src/musredit/Makefile \
+                 src/musrgui/Makefile \
                  src/musredit/musredit_startup.xml \
                  src/musrgui/musrgui_startup.xml])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 3d0d9c75..733f3445 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,15 +22,17 @@ SUBDIRS = external/MusrRoot \
           external/mud \
           $(PNEXUSDIRS) \
           classes \
-          external
+          external \
+          musredit \
+          musrgui 
 
 if BUILD_MUSRGUI
-SUBDIRS += $(EDITORDIR)
+#SUBDIRS += $(EDITORDIR)
 EXTRA_DIST = $(EDITORDIR)/Makefile
 endif
 
 if BUILD_MUSREDIT
-SUBDIRS += $(EDITORDIR)
+#SUBDIRS += $(EDITORDIR)
 EXTRA_DIST = $(EDITORDIR)/Makefile
 endif
 
diff --git a/src/include/PMusr.h b/src/include/PMusr.h
index f083b13b..8a501d59 100644
--- a/src/include/PMusr.h
+++ b/src/include/PMusr.h
@@ -36,6 +36,12 @@ using namespace std;
 
 #include <TString.h>
 
+// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
+#ifdef __CINT__
+typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
+#endif
+#include "fftw3.h"
+
 #define PMUSR_SUCCESS                   0
 #define PMUSR_WRONG_STARTUP_SYNTAX     -1
 #define PMUSR_MSR_FILE_NOT_FOUND       -2
diff --git a/src/musredit/Makefile.am b/src/musredit/Makefile.am
new file mode 100644
index 00000000..683b38d9
--- /dev/null
+++ b/src/musredit/Makefile.am
@@ -0,0 +1,26 @@
+## Process this file with automake to create Makefile.in
+
+h_sources = 
+
+h_linkdef = 
+
+dict_h_sources = 
+
+cpp_sources = 
+
+dict_cpp_sources = 
+
+include_HEADERS = $(h_sources)
+noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
+
+AM_CPPFLAGS = -I$(top_srcdir)/src/include $(PMUSR_CFLAGS) -I$(ROOTINCDIR)
+AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
+
+BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
+AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
+CLEANFILES = *Dict.cpp *Dict.h *~ core
+
+%Dict.cpp %Dict.h: %.h %LinkDef.h
+	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+
+
diff --git a/src/musrgui/Makefile.am b/src/musrgui/Makefile.am
new file mode 100644
index 00000000..683b38d9
--- /dev/null
+++ b/src/musrgui/Makefile.am
@@ -0,0 +1,26 @@
+## Process this file with automake to create Makefile.in
+
+h_sources = 
+
+h_linkdef = 
+
+dict_h_sources = 
+
+cpp_sources = 
+
+dict_cpp_sources = 
+
+include_HEADERS = $(h_sources)
+noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
+
+AM_CPPFLAGS = -I$(top_srcdir)/src/include $(PMUSR_CFLAGS) -I$(ROOTINCDIR)
+AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
+
+BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
+AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
+CLEANFILES = *Dict.cpp *Dict.h *~ core
+
+%Dict.cpp %Dict.h: %.h %LinkDef.h
+	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+
+

From 7351e101330eacd920413e3b17e91ab6ac29d498 Mon Sep 17 00:00:00 2001
From: Zaher Salman <zaher.salman@psi.ch>
Date: Thu, 19 Feb 2015 17:20:01 +0100
Subject: [PATCH 2/2] Fixed compilation problem with fftw3 and added fake
 automake files to musredit and musrgui.

---
 src/musredit/Makefile.am | 23 +----------------------
 src/musrgui/Makefile.am  | 23 +----------------------
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/src/musredit/Makefile.am b/src/musredit/Makefile.am
index 683b38d9..2f509505 100644
--- a/src/musredit/Makefile.am
+++ b/src/musredit/Makefile.am
@@ -1,26 +1,5 @@
 ## Process this file with automake to create Makefile.in
 
-h_sources = 
-
-h_linkdef = 
-
-dict_h_sources = 
-
-cpp_sources = 
-
-dict_cpp_sources = 
-
-include_HEADERS = $(h_sources)
-noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
-
-AM_CPPFLAGS = -I$(top_srcdir)/src/include $(PMUSR_CFLAGS) -I$(ROOTINCDIR)
-AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
-
-BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
-AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
-CLEANFILES = *Dict.cpp *Dict.h *~ core
-
-%Dict.cpp %Dict.h: %.h %LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+CLEANFILES = *~ core
 
 
diff --git a/src/musrgui/Makefile.am b/src/musrgui/Makefile.am
index 683b38d9..2f509505 100644
--- a/src/musrgui/Makefile.am
+++ b/src/musrgui/Makefile.am
@@ -1,26 +1,5 @@
 ## Process this file with automake to create Makefile.in
 
-h_sources = 
-
-h_linkdef = 
-
-dict_h_sources = 
-
-cpp_sources = 
-
-dict_cpp_sources = 
-
-include_HEADERS = $(h_sources)
-noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
-
-AM_CPPFLAGS = -I$(top_srcdir)/src/include $(PMUSR_CFLAGS) -I$(ROOTINCDIR)
-AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
-
-BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
-AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
-CLEANFILES = *Dict.cpp *Dict.h *~ core
-
-%Dict.cpp %Dict.h: %.h %LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+CLEANFILES = *~ core