Fix regression in configure script (Issue #411)

michaelrsweet · Jan 25, 2021 · 6898d0a · 6898d0a
1 parent e084e9e
commit 6898d0a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/configure b/configure
@@ -6183,7 +6183,10 @@ then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 	JPEGINC=""
-	JPEG="",
+	JPEG=""
+
+else $as_nop
+
 	JPEGINC="-I../jpeg"
 	JPEG="jpeg"
 	NEWLIBS="../jpeg/libjpeg.a $NEWLIBS"
@@ -6270,7 +6273,10 @@ then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 	ZLIBINC=""
-	ZLIB="",
+	ZLIB=""
+
+else $as_nop
+
 	ZLIBINC="-I../zlib"
 	ZLIB="zlib"
 	NEWLIBS="../zlib/libz.a $NEWLIBS"
@@ -6357,7 +6363,10 @@ then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 	PNGINC=""
-	PNG="",
+	PNG=""
+
+else $as_nop
+
 	PNGINC="-I../png"
 	PNG="png"
 	NEWLIBS="../png/libpng.a $NEWLIBS"

diff --git a/configure.ac b/configure.ac
@@ -265,7 +265,8 @@ AS_IF([test x$enable_localjpeg = xyes], [
 ], [
     AC_SEARCH_LIBS(jpeg_CreateCompress, turbojpeg jpeg, [
 	JPEGINC=""
-	JPEG="",
+	JPEG=""
+    ], [
 	JPEGINC="-I../jpeg"
 	JPEG="jpeg"
 	NEWLIBS="../jpeg/libjpeg.a $NEWLIBS"
@@ -282,7 +283,8 @@ AS_IF([test x$enable_localzlib = xyes], [
 ], [
     AC_SEARCH_LIBS(gzgets,z, [
 	ZLIBINC=""
-	ZLIB="",
+	ZLIB=""
+    ], [
 	ZLIBINC="-I../zlib"
 	ZLIB="zlib"
 	NEWLIBS="../zlib/libz.a $NEWLIBS"
@@ -299,7 +301,8 @@ AS_IF([test x$enable_localpng = xyes], [
 ], [
     AC_SEARCH_LIBS(png_set_tRNS_to_alpha,png, [
 	PNGINC=""
-	PNG="",
+	PNG=""
+    ], [
 	PNGINC="-I../png"
 	PNG="png"
 	NEWLIBS="../png/libpng.a $NEWLIBS"