diff options
| author | Roy Marples <roy@marples.name> | 2016-04-12 20:14:42 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2016-04-12 20:14:42 +0000 |
| commit | 63df14b4d9092fe99f122b168c7c82f3a82391d0 (patch) | |
| tree | 6541e6bd613ee39ffe2d030cc675cffd233a692d /configure | |
| parent | 87c914b78039e3d24ec32f1edda66faf63606fea (diff) | |
| download | dhcpcd-63df14b4d9092fe99f122b168c7c82f3a82391d0.tar.xz | |
Move embedded test to after setting compiler options to fix a build issue with quotes.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -362,15 +362,6 @@ else echo "CPPFLAGS+= -DNDEBUG" >>$CONFIG_MK fi -if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then - echo "dhcpcd-definitions.conf will be embedded in dhcpcd itself" - echo "DHCPCD_SRCS+= dhcpcd-embedded.c" >>$CONFIG_MK -else - echo "dhcpcd-definitions.conf will be installed to $LIBEXECDIR" - echo "CFLAGS+= -DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK - echo "EMBEDDEDINSTALL= _embeddedinstall" >>$CONFIG_MK -fi - if [ -n "$FORK" -a "$FORK" != yes -a "$FORK" != true ]; then echo "There is no fork" echo "CPPFLAGS+= -DTHERE_IS_NO_FORK" >>$CONFIG_MK @@ -463,6 +454,15 @@ fi [ "$CC" != cc ] && echo "CC= $CC" >>$CONFIG_MK $CC --version | $SED -e '1!d' +if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then + echo "dhcpcd-definitions.conf will be embedded in dhcpcd itself" + echo "DHCPCD_SRCS+= dhcpcd-embedded.c" >>$CONFIG_MK +else + echo "dhcpcd-definitions.conf 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 |
