Wichert Akkerman лет назад: 25
Родитель
Сommit
1016213902
2 измененных файлов с 5 добавлено и 5 удалено
  1. 2 2
      Makefile.conf.in
  2. 3 3
      configure.in

+ 2 - 2
Makefile.conf.in

@@ -62,8 +62,8 @@ NLS_LIBS		= @INTLLIBS@
 
 SSD_LIBS		= @SSD_LIBS@
 
-ZLIB_CFLAGS		= @ZLIBCFLAGS@
-ZLIB_LIBS		= @ZLIBLIBS@
+ZLIB_CFLAGS		= @ZLIB_CFLAGS@
+ZLIB_LIBS		= @ZLIB_LIBS@
 
 ALL_CFLAGS		= $(CFLAGS) $(DEFS) $(NLS_CFLAGS) $(INCLUDE_CFLAGS) $(ZLIB_CFLAGS)
 ALL_CXXFLAGS		= $(ALL_CFLAGS) $(CXXFLAGS)

+ 3 - 3
configure.in

@@ -133,13 +133,13 @@ AC_ARG_WITH(zlib,
 [  --with-zlib             use zlib for decompression of some gzip files],
 	[use_zlib=$withval],
 	[uze_zlib=no])
-if [ "$use_zlib" = "no" ] ; then
+if test "$use_zlib" = "no" ; then
 	ZLIB_CFLAGS=
 	ZLIB_LIBS=
 else
 	ZLIB_CFLAGS=-DUSE_ZLIB
-	if [ "$use_zlib" = "static" ] ; then
-		ZLIB_LIBS=-Wl,-Bstatic -lz -Wl,-Bdynamic
+	if test "$use_zlib" = "static"  ; then
+		ZLIB_LIBS="-Wl,-Bstatic -lz -Wl,-Bdynamic"
 	else
 		ZLIB_LIBS=-lz
 	fi