From 0fb3d920a44476495cd4537d22dc2debd0c4512f Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Wed, 29 Oct 2008 16:03:06 +0100
Subject: [PATCH] configure.ac: clean up; byteswap.h: avoid redefinition errors

---
 byteswap.h   | 3 +++
 configure.ac | 9 ++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/byteswap.h b/byteswap.h
index 991e85b..c7d0cf8 100644
--- a/byteswap.h
+++ b/byteswap.h
@@ -24,6 +24,8 @@
 #include <sys/param.h>
 #endif
 
+#ifndef __bswap_constant_16
+
 /* Swap bytes in 16 bit value.  */
 #define __bswap_constant_16(x) \
      ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8))
@@ -173,3 +175,4 @@ htons (x)
 #endif
 
 #endif
+#endif
diff --git a/configure.ac b/configure.ac
index 30bec5e..f82f4fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(portablexdr, 4.0.11)
+AC_INIT([portablexdr], [4.0.11])
 AM_INIT_AUTOMAKE
 
 AC_CONFIG_HEADERS([config.h])
 
 AC_CANONICAL_HOST
 AC_PROG_CC
-AC_CHECK_PROGS(AR, ar)
+AC_CHECK_PROGS([AR], [ar])
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
@@ -15,10 +15,9 @@ case "$host" in
    MINGW_EXTRA_LDFLAGS="-no-undefined"
    ;;
 esac
-AC_SUBST(MINGW_EXTRA_LDFLAGS)
+AC_SUBST([MINGW_EXTRA_LDFLAGS])
 
 AC_CHECK_HEADERS([arpa/inet.h sys/param.h])
 AC_CHECK_FUNCS([ntohl htonl ntohs htons])
 
-AC_OUTPUT(Makefile)
-
+AC_OUTPUT([Makefile])
-- 
1.8.3.1