From 66cf237c7176fd2c845c512e615639227d3fdc1b Mon Sep 17 00:00:00 2001
From: Love Hornquist Astrand <lha@h5l.org>
Date: Sat, 27 Nov 2010 18:41:00 -0800
Subject: [PATCH] use roken rename to pull in snprintf

---
 base/Makefile.am    | 13 ++++++++--
 base/baselocl.h     |  4 +++-
 base/heimbase.c     |  4 ----
 base/roken_rename.h | 58 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 7 deletions(-)
 create mode 100644 base/roken_rename.h

diff --git a/base/Makefile.am b/base/Makefile.am
index 6df18af6b..91be6872f 100644
--- a/base/Makefile.am
+++ b/base/Makefile.am
@@ -5,6 +5,7 @@ lib_LTLIBRARIES = libheimbase.la
 check_PROGRAMS = test_base
 
 libheimbase_la_LDFLAGS = -version-info 1:0:0
+libheimbase_la_CPPFLAGS = $(ROKEN_RENAME)
 
 if versionscript
 libheimbase_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map
@@ -12,7 +13,7 @@ endif
 
 include_HEADERS	= heimbase.h
 
-libheimbase_la_SOURCES =	\
+dist_libheimbase_la_SOURCES =	\
 	array.c			\
 	baselocl.h		\
 	bool.c			\
@@ -22,6 +23,14 @@ libheimbase_la_SOURCES =	\
 	heimqueue.h		\
 	null.c			\
 	number.c		\
-	string.c		
+	string.c		\
+	roken_rename.h
+
+if do_roken_rename
+nodist_libheimbase_la_SOURCES = snprintf.c
+endif
+
+snprintf.c:
+	$(LN_S) $(top_srcdir)/lib/roken/snprintf.c .
 
 test_base_LDADD = $(LIB_heimbase)
diff --git a/base/baselocl.h b/base/baselocl.h
index 0fa2c7d44..3781ed886 100644
--- a/base/baselocl.h
+++ b/base/baselocl.h
@@ -33,13 +33,15 @@
  * SUCH DAMAGE.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
 
-#include "config.h"
+#include <roken.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/base/heimbase.c b/base/heimbase.c
index fb6a2a678..b51190373 100644
--- a/base/heimbase.c
+++ b/base/heimbase.c
@@ -36,10 +36,6 @@
 #include "baselocl.h"
 #include <syslog.h>
 
-#ifndef HAVE_VASPRINTF
-#include <roken.h>
-#endif
-
 static heim_base_atomic_type tidglobal = HEIM_TID_USER;
 
 struct heim_base {
diff --git a/base/roken_rename.h b/base/roken_rename.h
new file mode 100644
index 000000000..07c009263
--- /dev/null
+++ b/base/roken_rename.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1998 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/* $Id$ */
+
+#ifndef __heimbase_roken_rename_h__
+#define __heimbase_roken_rename_h__
+
+#ifndef HAVE_SNPRINTF
+#define rk_snprintf heimbase_snprintf
+#endif
+#ifndef HAVE_VSNPRINTF
+#define rk_vsnprintf heimbase_vsnprintf
+#endif
+#ifndef HAVE_ASPRINTF
+#define rk_asprintf heimbase_asprintf
+#endif
+#ifndef HAVE_ASNPRINTF
+#define rk_asnprintf heimbase_asnprintf
+#endif
+#ifndef HAVE_VASPRINTF
+#define rk_vasprintf heimbase_vasprintf
+#endif
+#ifndef HAVE_VASNPRINTF
+#define rk_vasnprintf heimbase_vasnprintf
+#endif
+
+#endif /* __heimbase_roken_rename_h__ */