curl: Fix detection of headers with dependencies

Restore the check_include_file_concat functionality broken
in upstream curl.  The <net/if.h> header on older OS X versions
depends on <sys/socket.h> begin included first, for example.
Merge topic 'update-curl' into next

67c05f98 curl: Fix detection of headers with dependencies