Skip to content

Commit 6898d0a

Browse files
committed
Fix regression in configure script (Issue #411)
1 parent e084e9e commit 6898d0a

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

configure

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6183,7 +6183,10 @@ then :
61836183
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
61846184

61856185
JPEGINC=""
6186-
JPEG="",
6186+
JPEG=""
6187+
6188+
else $as_nop
6189+
61876190
JPEGINC="-I../jpeg"
61886191
JPEG="jpeg"
61896192
NEWLIBS="../jpeg/libjpeg.a $NEWLIBS"
@@ -6270,7 +6273,10 @@ then :
62706273
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
62716274

62726275
ZLIBINC=""
6273-
ZLIB="",
6276+
ZLIB=""
6277+
6278+
else $as_nop
6279+
62746280
ZLIBINC="-I../zlib"
62756281
ZLIB="zlib"
62766282
NEWLIBS="../zlib/libz.a $NEWLIBS"
@@ -6357,7 +6363,10 @@ then :
63576363
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
63586364

63596365
PNGINC=""
6360-
PNG="",
6366+
PNG=""
6367+
6368+
else $as_nop
6369+
63616370
PNGINC="-I../png"
63626371
PNG="png"
63636372
NEWLIBS="../png/libpng.a $NEWLIBS"

configure.ac

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,8 @@ AS_IF([test x$enable_localjpeg = xyes], [
265265
], [
266266
AC_SEARCH_LIBS(jpeg_CreateCompress, turbojpeg jpeg, [
267267
JPEGINC=""
268-
JPEG="",
268+
JPEG=""
269+
], [
269270
JPEGINC="-I../jpeg"
270271
JPEG="jpeg"
271272
NEWLIBS="../jpeg/libjpeg.a $NEWLIBS"
@@ -282,7 +283,8 @@ AS_IF([test x$enable_localzlib = xyes], [
282283
], [
283284
AC_SEARCH_LIBS(gzgets,z, [
284285
ZLIBINC=""
285-
ZLIB="",
286+
ZLIB=""
287+
], [
286288
ZLIBINC="-I../zlib"
287289
ZLIB="zlib"
288290
NEWLIBS="../zlib/libz.a $NEWLIBS"
@@ -299,7 +301,8 @@ AS_IF([test x$enable_localpng = xyes], [
299301
], [
300302
AC_SEARCH_LIBS(png_set_tRNS_to_alpha,png, [
301303
PNGINC=""
302-
PNG="",
304+
PNG=""
305+
], [
303306
PNGINC="-I../png"
304307
PNG="png"
305308
NEWLIBS="../png/libpng.a $NEWLIBS"

0 commit comments

Comments
 (0)