From a897bb17e74ff73b9ee19ace0ef62466030ab6e6 Mon Sep 17 00:00:00 2001
From: bustico
Date: Thu, 27 Jan 2011 12:26:11 +0000
Subject:  correct OSX Makefile to set correct dylib path on executable at
 install  correct broadcast adress for loopback (not the same beetween
 linux/windows and osx)

---
 debian/changelog   | 10 ++++++++++
 src/Makefile.osx   |  3 +++
 src/ivy.c          |  4 ++++
 tools/Makefile.osx |  2 +-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e2e279e..aeb587d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ivy-c (3.11.8) unstable; urgency=low
+
+  * correct broadcast adress for loopback (not the same beetween linux/windows and osx)
+  * replace cast by use of union to eliminate breaking strict aliasing rules
+  * correct OSX Makefile to set correct dylib path on executable at install
+  * make ivy-c compilable by a c++ compiler
+  * add fixes to remove all gcc warning message
+	
+ -- Alexandre Bustico <bustico@cena.fr>  Mon, 27 Janury 2010 13:43:00 +0100
+
 ivy-c (3.11.7) unstable; urgency=low
 
   * copy string buffer for message ready instead of referencing it since we have no clue if this buffer will remain valid atfer the caller calls init
diff --git a/src/Makefile.osx b/src/Makefile.osx
index 4043935..5755b3b 100644
--- a/src/Makefile.osx
+++ b/src/Makefile.osx
@@ -136,6 +136,9 @@ installbins: tools
 	test -d $(DESTDIR)$(PREFIX)/bin || mkdir -p $(DESTDIR)$(PREFIX)/bin
 	install -m755 $(TOOLS_DIR)/ivyprobe $(DESTDIR)$(PREFIX)/bin
 	install -m755 $(TOOLS_DIR)/ivyperf $(DESTDIR)$(PREFIX)/bin
+	install_name_tool -change libivy.dylib $(DESTDIR)$(PREFIX)/lib/libivy.dylib $(DESTDIR)$(PREFIX)/bin/ivyprobe
+	install_name_tool -change libivy.dylib $(DESTDIR)$(PREFIX)/lib/libivy.dylib $(DESTDIR)$(PREFIX)/bin/ivyperf
+
 
 tools: static-libs 
 	@(cd $(TOOLS_DIR) && $(MAKE) -f Makefile.osx)
diff --git a/src/ivy.c b/src/ivy.c
index 80f9bf6..7964200 100644
--- a/src/ivy.c
+++ b/src/ivy.c
@@ -55,7 +55,11 @@
 #define ARG_START "\002"
 #define ARG_END "\003"
 
+#ifdef __APPLE__
 #define DEFAULT_DOMAIN 127.0.0.1
+#else
+#define DEFAULT_DOMAIN 127.255.255.255
+#endif
 
 /* stringification et concatenation du domaine et du port en 2 temps :
  * Obligatoire puisque la substitution de domain, et de bus n'est pas
diff --git a/tools/Makefile.osx b/tools/Makefile.osx
index c01c3a1..ab3ce10 100644
--- a/tools/Makefile.osx
+++ b/tools/Makefile.osx
@@ -10,7 +10,7 @@ CPP='g++'
 
 PCRELIB = `pcre-config --libs`
 PCREINCL = `pcre-config --cflags`
-EXTRALIB= -L../src
+EXTRALIB= -L../src 
 EXTRAINC=-I../src
 
 .SUFFIXES: .c .o
-- 
cgit v1.1