Merge pull request #30 from mdjurfeldt/patch-1

Smaller modification of pull request #24 - compiling issues on OSX

autogen.sh

@@ -12,9 +12,16 @@ if test -z "$AUTOMAKE" ; then
  done
 fi
 
+if [ `uname -s` = Darwin ] ; then
+# libtoolize is glibtoolize on OSX
+  LIBTOOLIZE=glibtoolize
+else
+  LIBTOOLIZE=libtoolize
+fi
+
 ./aclocal.sh &&
-echo libtoolize --copy --automake &&
-libtoolize --copy --automake &&
+echo $LIBTOOLIZE --copy --automake &&
+$LIBTOOLIZE --copy --automake &&
 echo autoheader &&
 autoheader &&
 echo autoconf &&

extras/Makefile.am

@@ -3,5 +3,4 @@
 EXTRA_DIST = music_mpirun
 
 install-data-hook:
-	@INSTALL_PROGRAM@ $(srcdir)/music@LAUNCHSTYLE@ $(DESTDIR)$(bindir)/MUSIC
-
+	@INSTALL_PROGRAM@ $(srcdir)/music@LAUNCHSTYLE@ $(DESTDIR)$(bindir)/musicrun

src/Makefile.am

@@ -47,7 +47,7 @@ libmusic_la_SOURCES = \
 libmusic_la_HEADERS = music.hh
 libmusic_la_CXXFLAGS = -I$(top_srcdir) @MPI_CXXFLAGS@
 libmusic_la_LDFLAGS = $(top_builddir)/mpidep/libmpidep.la $(top_builddir)/rudeconfig/librudeconfig.la \
-	-version-info 1:0:0 -export-dynamic -Wl,-z,defs @MPI_LDFLAGS@
+	-version-info 1:0:0 -export-dynamic @MPI_LDFLAGS@
 libmusic_ladir = $(includedir)
 
 libmusic_c_la_SOURCES = \
@@ -58,7 +58,7 @@ libmusic_c_la_HEADERS = music-c.h  music/predict_rank-c.h
 libmusic_c_la_CXXFLAGS = -DBUILDING_MUSIC_LIBRARY @MPI_CXXFLAGS@
 libmusic_c_la_CFLAGS = -DBUILDING_MUSIC_LIBRARY @MPI_CFLAGS@
 libmusic_c_la_LDFLAGS = \
-	-version-info 1:0:0 -export-dynamic -Wl,-z,defs \
+	-version-info 1:0:0 -export-dynamic \
 	$(top_builddir)/src/libmusic.la @MPI_LDFLAGS@
 libmusic_c_ladir = $(includedir)
 libmusic_c_la_DEPENDENCIES = libmusic.la

src/memory.cc

@@ -19,7 +19,11 @@
 #include <iostream>
 
 extern "C" {
+#ifdef __APPLE__
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 }
 
 #include "music/memory.hh"