From: Roy Marples Date: Tue, 27 Mar 2018 06:23:31 +0000 (+0100) Subject: vanity: space out config.h a bit better X-Git-Tag: v7.0.3~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64eff6e2e82448d8511845f5325be3e6c274553a;p=thirdparty%2Fdhcpcd.git vanity: space out config.h a bit better --- diff --git a/configure b/configure index 5282322c..84aada94 100755 --- a/configure +++ b/configure @@ -266,7 +266,7 @@ for x in SYSCONFDIR SBINDIR LIBDIR LIBEXECDIR DBDIR RUNDIR; do echo "$x=$t $v" >>$CONFIG_MK unset t [ $l -gt 2 ] && t=" " - echo "#define $x$t \"$v\"" >>$CONFIG_H + echo "#define $x$t \"$v\"" >>$CONFIG_H done echo "LIBDIR= $LIBDIR" >>$CONFIG_MK echo "MANDIR= $MANDIR" >>$CONFIG_MK @@ -547,7 +547,7 @@ int main(void) { EOF if $XCC _nl80211.c -o _nl80211 2>&3; then echo "yes" - echo "#define HAVE_NL80211_H" >>$CONFIG_H + echo "#define HAVE_NL80211_H" >>$CONFIG_H else echo "no" echo "DHCPCD_SRCS+= if-linux-wext.c" >>$CONFIG_MK @@ -564,7 +564,7 @@ int main(void) { EOF if $XCC _IN6_ADDR_GEN_MODE_NONE.c -o _IN6_ADDR_GEN_MODE_NONE 2>&3; then echo "yes" - echo "#define HAVE_IN6_ADDR_GEN_MODE_NONE" >>$CONFIG_H + echo "#define HAVE_IN6_ADDR_GEN_MODE_NONE" >>$CONFIG_H else echo "no" fi @@ -580,7 +580,7 @@ int main(void) { EOF if $XCC _ifam_pid.c -o _ifam_pid 2>&3; then echo "yes" - echo "#define HAVE_IFAM_PID" >>$CONFIG_H + echo "#define HAVE_IFAM_PID" >>$CONFIG_H else echo "no" fi @@ -596,7 +596,7 @@ int main(void) { EOF if $XCC _ifam_addrflags.c -o _ifam_addrflags 2>&3; then echo "yes" - echo "#define HAVE_IFAM_ADDRFLAGS" >>$CONFIG_H + echo "#define HAVE_IFAM_ADDRFLAGS" >>$CONFIG_H else echo "no" fi @@ -641,7 +641,7 @@ int main(void) { EOF if $XCC _getifaddrs_addrflags.c -o _getifaddrs_addrflags $LIBSOCKET 2>&3; then echo "yes" - echo "#define HAVE_IFADDRS_ADDRFLAGS" >>$CONFIG_H + echo "#define HAVE_IFADDRS_ADDRFLAGS" >>$CONFIG_H else echo "no" fi @@ -793,7 +793,7 @@ if [ "$PIDFILE_LOCK" = no ]; then echo "COMPAT_SRCS+= compat/pidfile.c" >>$CONFIG_MK echo "#include \"compat/pidfile.h\"" >>$CONFIG_H else - echo "#define HAVE_UTIL_H" >>$CONFIG_H + echo "#define HAVE_UTIL_H" >>$CONFIG_H if [ -n "$LIBUTIL" ]; then echo "LDADD+= $LIBUTIL" >>$CONFIG_MK fi @@ -939,7 +939,7 @@ if [ "$TAILQ_FOREACH_SAFE" = no -o "$TAILQ_CONCAT" = no ]; then fi echo "#include \"compat/queue.h\"">>$CONFIG_H else - echo "#define HAVE_SYS_QUEUE_H" >>$CONFIG_H + echo "#define HAVE_SYS_QUEUE_H" >>$CONFIG_H fi if [ -z "$REALLOCARRAY" ]; then @@ -965,7 +965,7 @@ if [ "$REALLOCARRAY" = no ]; then echo "#include \"compat/reallocarray.h\"">>$CONFIG_H fi # Set this for eloop -echo "#define HAVE_REALLOCARRAY" >>$CONFIG_H +echo "#define HAVE_REALLOCARRAY" >>$CONFIG_H if [ -z "$POLL" ]; then printf "Testing for kqueue1 ... " @@ -1021,7 +1021,7 @@ int main(void) { EOF if $XCC _epoll.c -o _epoll 2>&3; then POLL=epoll - echo "#define HAVE_EPOLL" >>$CONFIG_MK + echo "#define HAVE_EPOLL" >>$CONFIG_MK echo "yes" else echo "no" @@ -1048,23 +1048,23 @@ EOF fi case "$POLL" in kqueue1) - echo "#define HAVE_KQUEUE" >>$CONFIG_H - echo "#define HAVE_KQUEUE1" >>$CONFIG_H + echo "#define HAVE_KQUEUE" >>$CONFIG_H + echo "#define HAVE_KQUEUE1" >>$CONFIG_H ;; kqueue) - echo "#define HAVE_KQUEUE" >>$CONFIG_H + echo "#define HAVE_KQUEUE" >>$CONFIG_H ;; epoll) - echo "#define HAVE_EPOLL" >>$CONFIG_H + echo "#define HAVE_EPOLL" >>$CONFIG_H ;; pollts) - echo "#define HAVE_POLLTS" >>$CONFIG_H + echo "#define HAVE_POLLTS" >>$CONFIG_H ;; ppoll) - echo "#define HAVE_PPOLL" >>$CONFIG_H + echo "#define HAVE_PPOLL" >>$CONFIG_H ;; pselect) - echo "#define HAVE_PSELECT" >>$CONFIG_H + echo "#define HAVE_PSELECT" >>$CONFIG_H ;; *) echo "No suitable polling function is available, not even pselect" >&2 @@ -1111,7 +1111,7 @@ EOF rm -f _fls64.c _fls64 fi if [ "$FLS64" = yes ]; then - echo "#define HAVE_SYS_BITOPS_H" >>$CONFIG_H + echo "#define HAVE_SYS_BITOPS_H" >>$CONFIG_H fi if [ -z "$MD5" ]; then @@ -1149,7 +1149,7 @@ if [ "$MD5" = no ]; then echo "MD5_SRC= compat/crypt/md5.c" >>$CONFIG_MK else echo "MD5_SRC=" >>$CONFIG_MK - echo "#define HAVE_MD5_H" >>$CONFIG_H + echo "#define HAVE_MD5_H" >>$CONFIG_H [ -n "$MD5_LIB" ] && echo "LDADD+= $MD5_LIB" >>$CONFIG_MK fi @@ -1240,12 +1240,12 @@ if [ "$SHA2" = no ]; then echo "SHA256_SRC= compat/crypt/sha256.c" >>$CONFIG_MK else echo "SHA256_SRC=" >>$CONFIG_MK - echo "#define SHA2_H <$SHA2_H>" >>$CONFIG_H + echo "#define SHA2_H <$SHA2_H>" >>$CONFIG_H if [ "$SHA2_RENAMED" = yes ]; then - echo "#define SHA256_CTX SHA2_CTX" >>$CONFIG_H - echo "#define SHA256_Init SHA256Init" >>$CONFIG_H - echo "#define SHA256_Update SHA256Update" >>$CONFIG_H - echo "#define SHA256_Final SHA256Final" >>$CONFIG_H + echo "#define SHA256_CTX SHA2_CTX" >>$CONFIG_H + echo "#define SHA256_Init SHA256Init" >>$CONFIG_H + echo "#define SHA256_Update SHA256Update" >>$CONFIG_H + echo "#define SHA256_Final SHA256Final" >>$CONFIG_H fi [ -n "$SHA2_LIB" ] && echo "LDADD+= $SHA2_LIB" >>$CONFIG_MK fi @@ -1263,7 +1263,7 @@ int main(void) { EOF if $XCC _hmac.c $MD5_LIB -o _hmac 2>&3; then HMAC=yes - echo "#define HAVE_HMAC_H" >>$CONFIG_H + echo "#define HAVE_HMAC_H" >>$CONFIG_H else # Remove this test if NetBSD-8 ships with # hmac in it's own header and not stdlib.h @@ -1287,7 +1287,7 @@ if [ "$HMAC" = no ]; then echo "#include \"compat/crypt/hmac.h\"" >>$CONFIG_H echo "HMAC_SRC= compat/crypt/hmac.c" >>$CONFIG_MK else - # echo "#define HAVE_HMAC_H" >>$CONFIG_H + # echo "#define HAVE_HMAC_H" >>$CONFIG_H echo "HMAC_SRC=" >>$CONFIG_MK fi