Skip to content

Commit 4983bb5

Browse files
authored
Merge pull request #64 from Daniel-Noethen/fix-without-nghttp2
Fix compilation without nghttp2 support
2 parents abe42df + 3a893cc commit 4983bb5

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

curl/libcurl-build.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,9 @@ buildMac()
200200
if [ $nohttp2 == "1" ]; then
201201
NGHTTP2CFG="--with-nghttp2=${NGHTTP2}/Mac/${ARCH}"
202202
NGHTTP2LIB="-L${NGHTTP2}/Mac/${ARCH}/lib"
203+
else
204+
NGHTTP2CFG="--without-nghttp2"
205+
NGHTTP2LIB=""
203206
fi
204207

205208
TARGET="darwin-i386-cc"
@@ -283,6 +286,9 @@ buildCatalyst()
283286
if [ $nohttp2 == "1" ]; then
284287
NGHTTP2CFG="--with-nghttp2=${NGHTTP2}/Catalyst/${ARCH}"
285288
NGHTTP2LIB="-L${NGHTTP2}/Catalyst/${ARCH}/lib"
289+
else
290+
NGHTTP2CFG="--without-nghttp2"
291+
NGHTTP2LIB=""
286292
fi
287293

288294
export $PLATFORM
@@ -327,6 +333,9 @@ buildIOS()
327333
if [ $nohttp2 == "1" ]; then
328334
NGHTTP2CFG="--with-nghttp2=${NGHTTP2}/${PLATFORMDIR}/${ARCH}"
329335
NGHTTP2LIB="-L${NGHTTP2}/${PLATFORMDIR}/${ARCH}/lib"
336+
else
337+
NGHTTP2CFG="--without-nghttp2"
338+
NGHTTP2LIB=""
330339
fi
331340

332341
export $PLATFORM
@@ -371,6 +380,9 @@ buildIOSsim()
371380
if [ $nohttp2 == "1" ]; then
372381
NGHTTP2CFG="--with-nghttp2=${NGHTTP2}/${PLATFORMDIR}/${ARCH}"
373382
NGHTTP2LIB="-L${NGHTTP2}/${PLATFORMDIR}/${ARCH}/lib"
383+
else
384+
NGHTTP2CFG="--without-nghttp2"
385+
NGHTTP2LIB=""
374386
fi
375387

376388
TARGET="darwin-i386-cc"
@@ -428,6 +440,9 @@ buildTVOS()
428440
if [ $nohttp2 == "1" ]; then
429441
NGHTTP2CFG="--with-nghttp2=${NGHTTP2}/tvOS/${ARCH}"
430442
NGHTTP2LIB="-L${NGHTTP2}/tvOS/${ARCH}/lib"
443+
else
444+
NGHTTP2CFG="--without-nghttp2"
445+
NGHTTP2LIB=""
431446
fi
432447

433448
export $PLATFORM
@@ -473,6 +488,9 @@ buildTVOSsim()
473488
if [ $nohttp2 == "1" ]; then
474489
NGHTTP2CFG="--with-nghttp2=${NGHTTP2}/${PLATFORMDIR}/${ARCH}"
475490
NGHTTP2LIB="-L${NGHTTP2}/${PLATFORMDIR}/${ARCH}/lib"
491+
else
492+
NGHTTP2CFG="--without-nghttp2"
493+
NGHTTP2LIB=""
476494
fi
477495

478496
TARGET="darwin64-${ARCH}-cc"

0 commit comments

Comments
 (0)