From: Roy Marples <roy@marples.name>
Date: Sat, 27 Sep 2014 00:12:21 +0000 (+0000)
Subject: We only supply svis(3) so rename the files as such.
X-Git-Tag: v6.4.6~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b0c4877d5a232e9d681073a10dd28c3370ef446;p=thirdparty%2Fdhcpcd.git

We only supply svis(3) so rename the files as such.
---

diff --git a/compat/vis.c b/compat/svis.c
similarity index 99%
rename from compat/vis.c
rename to compat/svis.c
index 8bdd0baa..7bd97ce2 100644
--- a/compat/vis.c
+++ b/compat/svis.c
@@ -66,7 +66,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "vis.h"
+#include "svis.h"
 
 #undef BELL
 #define BELL '\a'
diff --git a/compat/vis.h b/compat/svis.h
similarity index 86%
rename from compat/vis.h
rename to compat/svis.h
index 25c55b52..982d9f29 100644
--- a/compat/vis.h
+++ b/compat/svis.h
@@ -1,5 +1,5 @@
-#ifndef VIS_H
-#define VIS_H
+#ifndef SVIS_H
+#define SVIS_H
 
 #define	VIS_OCTAL	0x0001	/* use octal \ddd format */
 #define	VIS_CSTYLE	0x0002	/* use \[nrft0..] where appropiate */
diff --git a/configure b/configure
index 569bf84e..e18a19a5 100755
--- a/configure
+++ b/configure
@@ -71,7 +71,7 @@ for x do
 	--without-md5) MD5=no;;
 	--without-sha2) SHA2=no;;
 	--without-sha256) SHA2=no;;
-	--without-vis) VIS=no;;
+	--without-svis) SVIS=no;;
 	--without-dev) DEV=no;;
 	--without-udev) UDEV=no;;
 	--serviceexists) SERVICEEXISTS=$var;;
@@ -628,9 +628,9 @@ if [ "$STRLCPY" = no ]; then
 	echo "#include		\"compat/strlcpy.h\"" >>$CONFIG_H
 fi
 
-if [ -z "$VIS" ]; then
-	printf "Testing for vis ... "
-	cat <<EOF >_vis.c
+if [ -z "$SVIS" ]; then
+	printf "Testing for svis ... "
+	cat <<EOF >_svis.c
 #include <vis.h>
 int main(void) {
 	char s[10];
@@ -638,17 +638,17 @@ int main(void) {
 	return 0;
 }
 EOF
-	if $XCC _vis.c -o _vis 2>&3; then
-		VIS=yes
+	if $XCC _svis.c -o _svis 2>&3; then
+		SVIS=yes
 	else
-		VIS=no
+		SVIS=no
 	fi
-	echo "$VIS"
-	rm -f _vis.c _vis
+	echo "$SVIS"
+	rm -f _svis.c _svis
 fi
-if [ "$VIS" = no ]; then
-	echo "COMPAT_SRCS+=	compat/vis.c" >>$CONFIG_MK
-	echo "#include		\"compat/vis.h\"" >>$CONFIG_H
+if [ "$SVIS" = no ]; then
+	echo "COMPAT_SRCS+=	compat/svis.c" >>$CONFIG_MK
+	echo "#include		\"compat/svis.h\"" >>$CONFIG_H
 else
 	echo "#define HAVE_VIS_H" >>$CONFIG_H
 fi