Merge branch 'develop'

Juniper · Oct 23, 2014 · c8d8b68 · c8d8b68
2 parents 7fd9ee9 + ab5e0b6
commit c8d8b68
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 50 deletions.
diff --git a/configure.ac b/configure.ac
@@ -86,7 +86,6 @@ AC_ARG_WITH(libslax-prefix,
         LIBSLAX_CONFIG_PREFIX=$withval
 )
 
-LIBSLAX_REQUIRED_VERSION=0.16.0
 AC_MSG_CHECKING(for libslax) 
 if test "x$LIBSLAX_CONFIG_PREFIX" != "x"
 then
@@ -103,29 +102,17 @@ dnl
 if ${SLAX_CONFIG} --libs > /dev/null 2>&1
 then
 	LIBSLAX_VERSION=`$SLAX_CONFIG --version`
-	if test VERSION_TO_NUMBER(echo $LIBSLAX_VERSION) -ge VERSION_TO_NUMBER(echo $LIBSLAX_REQUIRED_VERSION)
-	then
-		LIBSLAX_VERSION=`$SLAX_CONFIG --version`
-		LIBSLAX_LIBS="$LIBSLAX_LIBS `$SLAX_CONFIG --libs`"
-		LIBSLAX_CFLAGS="$LIBSLAX_CFLAGS `$SLAX_CONFIG --cflags`"
-		SLAX_EXTDIR="`$SLAX_CONFIG --extdir | head -1`"
-		SLAX_LIBDIR="`$SLAX_CONFIG --libdir | head -1`"
-		SLAX_BINDIR="`$SLAX_CONFIG --bindir | head -1`"
-		SLAX_OXTRADOCDIR="`$SLAX_CONFIG --oxtradoc | head -1`"
-		AC_MSG_RESULT($LIBSLAX_VERSION found)
-	else
-		AC_MSG_ERROR(Version $LIBSLAX_VERSION found. You need at least libslax $LIBSLAX_REQUIRED_VERSION for this version of juise)
-	fi
+	SLAX_BINDIR="`$SLAX_CONFIG --bindir | head -1`"
+	SLAX_OXTRADOCDIR="`$SLAX_CONFIG --oxtradoc | head -1`"
+	AC_MSG_RESULT($LIBSLAX_VERSION found)
 else
-	AC_MSG_NOTICE([Could not find libslax; see https://github.com/Juniper/libslax.])
+	LIBSLAX_VERSION=
+	SLAX_BINDIR=
+	SLAX_OXTRADOCDIR=
+	AC_MSG_RESULT([no])
 fi
 
-AC_SUBST(SLAX_CONFIG)
-AC_SUBST(LIBSLAX_CFLAGS)
-AC_SUBST(LIBSLAX_LIBS)
 AC_SUBST(SLAX_BINDIR)
-AC_SUBST(SLAX_EXTDIR)
-AC_SUBST(SLAX_LIBDIR)
 AC_SUBST(SLAX_OXTRADOCDIR)
 
 AC_MSG_CHECKING([whether to build with warnings])
@@ -175,7 +162,6 @@ AC_ARG_ENABLE([libxo-options],
     [LIBXO_OPTS=$enableval],
     [LIBXO_OPTS=yes])
 AC_MSG_RESULT([$LIBXO_OPTS])
-AC_MSG_RESULT([$LIBXO_OPTS])
 AM_CONDITIONAL([NO_LIBXO_OPTIONS], [test "$LIBXO_OPTS" != "yes"])
 
 

diff --git a/libxo/libxo.3 b/libxo/libxo.3
@@ -144,6 +144,6 @@ and
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/libxo.c b/libxo/libxo.c
@@ -724,7 +724,7 @@ xo_buf_utf8_len (xo_handle_t *xop, const char *buf, int bufsiz)
     int len, i;
 
     len = xo_utf8_to_wc_len(buf);
-    if (len == (wchar_t) -1) {
+    if (len == -1) {
         xo_failure(xop, "invalid UTF-8 data: %02hhx", b);
 	return -1;
     }

diff --git a/libxo/xo_attr.3 b/libxo/xo_attr.3
@@ -72,6 +72,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_create.3 b/libxo/xo_create.3
@@ -80,6 +80,6 @@ and
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_emit.3 b/libxo/xo_emit.3
@@ -66,6 +66,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_err.3 b/libxo/xo_err.3
@@ -79,6 +79,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_finish.3 b/libxo/xo_finish.3
@@ -54,6 +54,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_flush.3 b/libxo/xo_flush.3
@@ -49,6 +49,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_format.5 b/libxo/xo_format.5
@@ -652,6 +652,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_no_setlocale.3 b/libxo/xo_no_setlocale.3
@@ -58,6 +58,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_open_container.3 b/libxo/xo_open_container.3
@@ -211,6 +211,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_open_list.3 b/libxo/xo_open_list.3
@@ -164,6 +164,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_parse_args.3 b/libxo/xo_parse_args.3
@@ -128,6 +128,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_set_allocator.3 b/libxo/xo_set_allocator.3
@@ -68,6 +68,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_set_flags.3 b/libxo/xo_set_flags.3
@@ -123,6 +123,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_set_info.3 b/libxo/xo_set_info.3
@@ -108,6 +108,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_set_options.3 b/libxo/xo_set_options.3
@@ -47,6 +47,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_set_style.3 b/libxo/xo_set_style.3
@@ -67,6 +67,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/libxo/xo_set_writer.3 b/libxo/xo_set_writer.3
@@ -63,6 +63,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/xo/xo.1 b/xo/xo.1
@@ -185,6 +185,6 @@ https://github.com/Juniper/libxo/releases
 .Sh HISTORY
 The
 .Fa libxo
-library was added in FreeBSD 10.1.
+library was added in FreeBSD 11.0.
 .Sh AUTHOR
 Phil Shafer
diff --git a/xo/xo.c b/xo/xo.c
@@ -23,14 +23,6 @@
 #define UNUSED __attribute__ ((__unused__))
 #endif /* UNUSED */
 
-#ifndef HAVE_STREQ
-static inline int
-streq (const char *red, const char *blue)
-{
-    return (red && blue && *red == *blue && strcmp(red + 1, blue + 1) == 0);
-}
-#endif /* HAVE_STREQ */
-
 static int opt_warn;		/* Enable warnings */
 
 static char **save_argv;
@@ -221,7 +213,7 @@ print_help (void)
 "    --xpath               Add XPath data to HTML output\n");
 }
 
-struct opts {
+static struct opts {
     int o_depth;
     int o_help;
     int o_not_first;