]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Move embedded test to after setting compiler options to fix a build issue with quotes.
authorRoy Marples <roy@marples.name>
Tue, 12 Apr 2016 20:14:42 +0000 (20:14 +0000)
committerRoy Marples <roy@marples.name>
Tue, 12 Apr 2016 20:14:42 +0000 (20:14 +0000)
configure

index 215a9c5a5458f5364f106dbfc9e12b022672ee42..60548c2df96a2dc3cf10fd700abcc3b4f2a00f3f 100755 (executable)
--- a/configure
+++ b/configure
@@ -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