Skip to content

Commit

Permalink
* Work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Wielemaker committed Nov 29, 2006
1 parent 764a3d3 commit 08407cd
Show file tree
Hide file tree
Showing 6 changed files with 376 additions and 16 deletions.
3 changes: 3 additions & 0 deletions .cvsignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Makefile
autom4te.cache
config.h
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ ZOBJ= zlib4pl.o
all: $(TARGETS)

zlib4pl.@SO@: $(ZOBJ)
$(LD) $(LDFLAGS) -o $@ $(ZOBJ)
$(LD) $(LDFLAGS) -o $@ $(ZOBJ) $(LIBS)

install: $(TARGETS) $(LIBPL)
mkdir -p $(DESTDIR)$(PLBASE)/lib/$(PLARCH)
Expand Down
2 changes: 2 additions & 0 deletions README
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Experimental interface to zlib, providing on-the-fly compression
in Prolog streams. Very incomplete.
22 changes: 11 additions & 11 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -3933,13 +3933,13 @@ fi
done


echo "$as_me:$LINENO: checking for zlibVersion in -lzlib" >&5
echo $ECHO_N "checking for zlibVersion in -lzlib... $ECHO_C" >&6
if test "${ac_cv_lib_zlib_zlibVersion+set}" = set; then
echo "$as_me:$LINENO: checking for zlibVersion in -lz" >&5
echo $ECHO_N "checking for zlibVersion in -lz... $ECHO_C" >&6
if test "${ac_cv_lib_z_zlibVersion+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lzlib $LIBS"
LIBS="-lz $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
Expand Down Expand Up @@ -3984,25 +3984,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_zlib_zlibVersion=yes
ac_cv_lib_z_zlibVersion=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_cv_lib_zlib_zlibVersion=no
ac_cv_lib_z_zlibVersion=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_zlib_zlibVersion" >&5
echo "${ECHO_T}$ac_cv_lib_zlib_zlibVersion" >&6
if test $ac_cv_lib_zlib_zlibVersion = yes; then
echo "$as_me:$LINENO: result: $ac_cv_lib_z_zlibVersion" >&5
echo "${ECHO_T}$ac_cv_lib_z_zlibVersion" >&6
if test $ac_cv_lib_z_zlibVersion = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZLIB 1
#define HAVE_LIBZ 1
_ACEOF

LIBS="-lzlib $LIBS"
LIBS="-lz $LIBS"

fi

Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ else
fi

AC_CHECK_HEADERS(zlib.h)
AC_CHECK_LIB(zlib, zlibVersion)
AC_CHECK_LIB(z, zlibVersion)
PLTARGETS=zlib

AC_OUTPUT(Makefile)
Expand Down
Loading

0 comments on commit 08407cd

Please sign in to comment.