From 4bf2075b4bf5ae8fcbf7f4da7993ab33960f2156 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Fri, 26 Aug 2011 00:15:23 +0200
Subject: [PATCH] don't -I/usr/include/idn

---
 src/Makefile.in | 8 +++++---
 src/version.sh  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index fd04e44..bdb27a1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -84,9 +84,11 @@ SFMT_FLAGS = -fno-strict-aliasing
 #
 MPATH=-DMUD_LIB='"$(MUD_LIB)"' -DBINDIR='"$(BINDIR)"' -DERQ_DIR='"$(ERQ_DIR)"'
 #
-# would be nicer to have this idn include in autoconf but it shouldn't hurt
-# here either.. it makes this compile on OpenSolaris..  --lynX via tg 2010
-CFLAGS=-DPROGNAME='"@PROGNAME@"' @EXTRA_CFLAGS@ $(OPTIMIZE) $(DEBUG) $(WARN) $(MPATH) $(PROFIL) -I/usr/include/idn -I/usr/local/include
+# tg says for OpenSolaris we need -I/usr/include/idn here but since that path
+# may exist when idnkit is installed and cause errors because of its 'wrong'
+# assert.h, we can't include that path here by default. configure should
+# learn when to add this path here, but that's tricky.  --lynX
+CFLAGS=-DPROGNAME='"@PROGNAME@"' @EXTRA_CFLAGS@ $(OPTIMIZE) $(DEBUG) $(WARN) $(MPATH) $(PROFIL) -I/usr/local/include
 #
 LIBS= @PKGLIBS@ @LIBS@ -lm
 #
diff --git a/src/version.sh b/src/version.sh
index d76d070..0687a43 100644
--- a/src/version.sh
+++ b/src/version.sh
@@ -17,7 +17,7 @@ version_longtype="stable"
 # A timestamp, to be used by bumpversion and other scripts.
 # It can be used, for example, to 'touch' this file on every build, thus
 # forcing revision control systems to add it on every checkin automatically.
-version_stamp="Tue May 24 18:47:17 CEST 2011"
+version_stamp="Tue Aug 23 19:19:07 CEST 2011"
 
 # Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x
 version_major=4