Remove vis/unvis encoding and dhcpcd-decode, this was a mistake.
[dhcpcd-ui] / configure
index 73a761f4b4ba582c629ea27443aad3b404368ad2..f8d7c5dd830b36b0ed628396c7f0afd9214da745 100755 (executable)
--- a/configure
+++ b/configure
@@ -10,7 +10,7 @@ LIBDHCPCD=no
 HOST=
 HOSTCC=
 BUILD=
-WITH_TOOLS=yes
+WITH_DHCPCD_ONLINE=yes
 WITH_GTK=
 WITH_QT=
 WITH_ICONS=
@@ -44,8 +44,8 @@ for x; do
        --includedir) eval INCLUDEDIR="$INCLUDEDIR${INCLUDEDIR:+ }$var";;
        --datadir|--infodir) ;; # ignore autotools
        --disable-maintainer-mode|--disable-dependency-tracking) ;;
-       --with-tools) WITH_TOOLS=${var:-yes};;
-       --without-tools) WITH_TOOLS=no;;
+       --with-dhcpcd-online) WITH_DHCPCD_ONLINE=${var:-yes};;
+       --without-dhcpcd-online) WITH_DHCPCD_ONLINE=no;;
        --with-gtk|--with-gtk+) WITH_GTK=${var:-yes};;
        --without-gtk|--without-gtk+) WITH_GTK=no;;
        --with-qt) WITH_QT=${var:-yes};;
@@ -303,66 +303,6 @@ if [ "$STRLCPY" = no ]; then
            >>$CONFIG_H
 fi
 
-if [ -z "$VIS" ]; then
-       printf "Testing for vis ... "
-       cat <<EOF >_vis.c
-#include <vis.h>
-
-int main(void) {
-       char s[10];
-       xxvis(s, 0, 0, 0);
-       return 0;
-}
-EOF
-       if $XCC _vis.c -o _vis 2>&3; then
-               VIS=yes
-       else
-               VIS=no
-       fi
-       echo "$VIS"
-       rm -f _vis.c _vis
-fi
-if [ "$VIS" = no ]; then
-       echo "VIS_SRC=          vis.c" >>$CONFIG_MK
-       echo "#define vis       dhcpcd_vis" >>$CONFIG_H
-else
-       echo "#define HAVE_VIS_H" >>$CONFIG_H
-fi
-
-if [ -z "$STRNUNVIS" ]; then
-       printf "Testing for strnunvis ... "
-       cat <<EOF >_strnunvis.c
-#include <vis.h>
-#ifdef __FreeBSD__
-#error FreeBSD has broken strnunvis support
-#endif
-#ifdef __NetBSD_Version__
-#  if __NetBSD_Version__ <799000200
-#  error Upgrade NetBSD to 7.99.2 to get a working strnunvis
-#  endif
-#endif
-
-int main(void) {
-       char s[10];
-       strunvis(s, 0, s);
-       return 0;
-}
-EOF
-       if $XCC _strnunvis.c -o _strnunvis 2>&3; then
-               STRNUNVIS=yes
-       else
-               STRNUNVIS=no
-       fi
-       echo "$STRNUNVIS"
-       rm -f _strnunvis.c _strnunvis
-fi
-if [ "$STRNUNVIS" = no ]; then
-       echo "UNVIS_SRC=        unvis.c" >>$CONFIG_MK
-       echo "#define strnunvis dhcpcd_strnunvis" >>$CONFIG_H
-else
-       echo "#define HAVE_STRNUNVIS" >>$CONFIG_H
-fi
-
 if [ -z "$STRVERSCMP" ]; then
        printf "Testing for strverscmp ... "
        cat <<EOF >_strverscmp.c
@@ -474,8 +414,8 @@ if [ "$WITH_ICONS" = yes ]; then
        echo "MKICONS=  icons" >>$CONFIG_MK
 fi
 
-if [ -n "$WITH_TOOLS" -a "$WITH_TOOLS" != no ]; then
-       UI="dhcpcd-decode dhcpcd-online${UI:+ }$UI"
+if [ -n "$WITH_DHCPCD_ONLINE" -a "$WITH_ONLINE" != no ]; then
+       UI="dhcpcd-online${UI:+ }$UI"
 fi
 echo "UI=              ${UI:+libdhcpcd }$UI" >>$CONFIG_MK