Mercurial > hg > dhcpcd
changeset 5361:fabda5ae201c draft
configure: Fix fallout with disabling embedded config
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Mon, 15 Jun 2020 22:04:37 +0100 |
| parents | 1033af2dded0 |
| children | 17f0de2ed2aa |
| files | configure |
| diffstat | 1 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Jun 15 16:28:31 2020 +0100 +++ b/configure Mon Jun 15 22:04:37 2020 +0100 @@ -545,15 +545,6 @@ echo "SRCS+= auth.c" >>$CONFIG_MK fi -if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then - echo "$DHCPCD_DEFS will be embedded in dhcpcd itself" - echo "DHCPCD_SRCS+= dhcpcd-embedded.c" >>$CONFIG_MK -else - echo "$DHCPCD_DEFS will be installed to $LIBEXECDIR" - echo "CPPFLAGS+= -DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK - echo "EMBEDDEDINSTALL= _embeddedinstall" >>$CONFIG_MK -fi - if [ -z "$PRIVSEP" ]; then # privilege separation works fine .... except on Solaris case "$OS" in @@ -665,6 +656,16 @@ rm -f _pledge.c _pledge fi +# This block needs to be after the compiler test due to embedded quotes. +if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then + echo "$DHCPCD_DEFS will be embedded in dhcpcd itself" + echo "DHCPCD_SRCS+= dhcpcd-embedded.c" >>$CONFIG_MK +else + echo "$DHCPCD_DEFS will be installed to $LIBEXECDIR" + echo "CPPFLAGS+= -DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK + echo "EMBEDDEDINSTALL= _embeddedinstall" >>$CONFIG_MK +fi + if [ "$OS" = linux ]; then printf "Testing for nl80211 ... " cat <<EOF >_nl80211.c