Fix build system to make import correctly for authentication.

diff --git a/Makefile b/Makefile
index 54519c7e681270739df94a59a62759b0391993b2..9d8257193ba7290ad2a3b402ea5bb6db400c71a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ CPPFLAGS+=    -I./crypt
 SRCS+=         ${DHCPCD_SRCS}
 DHCPCD_DEFS?=  dhcpcd-definitions.conf
 
-OBJS+=         ${SRCS:.c=.o} ${AUTH_SRCS:.c=.o} ${COMPAT_SRCS:.c=.o}
+OBJS+=         ${SRCS:.c=.o} ${CRYPT_SRCS:.c=.o} ${COMPAT_SRCS:.c=.o}
 
 SCRIPT=                ${LIBEXECDIR}/dhcpcd-run-hooks
 HOOKDIR=       ${LIBEXECDIR}/dhcpcd-hooks
@@ -91,8 +91,8 @@ dhcpcd-embedded.c: genembedc ${DHCPCD_DEFS} dhcpcd-embedded.c.in
 
 if-options.c: dhcpcd-embedded.h
 
-.depend: ${SRCS} ${COMPAT_SRCS} ${AUTH_SRCS}
-       ${CC} ${CPPFLAGS} -MM ${SRCS} ${COMPAT_SRCS} ${AUTH_SRCS} > .depend
+.depend: ${SRCS} ${COMPAT_SRCS} ${CRYPT_SRCS}
+       ${CC} ${CPPFLAGS} -MM ${SRCS} ${COMPAT_SRCS} ${CRYPT_SRCS} > .depend
 
 depend: .depend
 
@@ -172,10 +172,10 @@ import: ${SRCS} hooks
                sed -e '/^compat\//d' | \
                sed -e '/^crypt\//d' | \
                sort -u) /tmp/${DISTPREFIX}; \
-       if test -n "${AUTH_SRCS}"; then \
+       if test -n "${CRYPT_SRCS}"; then \
                ${INSTALL} -d /tmp/${DISTPREFIX}/crypt; \
-               cp ${AUTH_SRCS} /tmp/${DISTPREFIX}/crypt; \
-               cp $$(${CC} ${CPPFLAGS} -DDEPGEN -MM ${AUTH_SRCS} | \
+               cp ${CRYPT_SRCS} /tmp/${DISTPREFIX}/crypt; \
+               cp $$(${CC} ${CPPFLAGS} -DDEPGEN -MM ${CRYPT_SRCS} | \
                        sed -e 's/^.*c //g' -e 's/.*\.c$$//g' -e 's/\\//g' | \
                        tr ' ' '\n' | sed -e '/\/\.\.\//d'  | \
                        sort -u) /tmp/${DISTPREFIX}/crypt; \

diff --git a/configure b/configure
index 8f4f23fc826a43c38fe1a333ac324d679dbe85d4..b47f91e13bcbfab13b4a8b4ca4e33842b3f91847 100755 (executable)
--- a/configure
+++ b/configure
@@ -462,10 +462,11 @@ if [ -z "$INET6" -o "$INET6" = yes ]; then
        fi
 fi
 if [ -z "$AUTH" -o "$AUTH" = yes ]; then
-       echo "Enabling Authentiaction"
+       echo "Enabling Authentication"
        echo "CPPFLAGS+=        -DAUTH" >>$CONFIG_MK
-       echo "AUTH_SRCS=        auth.c crypt/hmac_md5.c" >>$CONFIG_MK
-       echo "AUTH_SRCS+=       \${MD5_SRC} \${SHA256_SRC}" >>$CONFIG_MK
+       echo "SRCS+=            auth.c" >>$CONFIG_MK
+       echo "CRYPT_SRCS+=      crypt/hmac_md5.c" >>$CONFIG_MK
+       echo "CRYPT_SRCS+=      \${MD5_SRC} \${SHA256_SRC}" >>$CONFIG_MK
 fi
 
 echo "Using compiler .. $CC"