Commit 969dfb17 by Maarten L. Hekkelman

fixed configure

parent dd466d8a
...@@ -625,12 +625,12 @@ ac_includes_default="\ ...@@ -625,12 +625,12 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS ac_subst_vars='LTLIBOBJS
LIBOBJS LIBOBJS
CIFPP_LDFLAGS
CIFPP_CPPFLAGS
LIBBZ2_LDFLAGS LIBBZ2_LDFLAGS
LIBBZ2_CPPFLAGS LIBBZ2_CPPFLAGS
LIBZ_LDFLAGS LIBZ_LDFLAGS
LIBZ_CPPFLAGS LIBZ_CPPFLAGS
CIFPP_LDFLAGS
CIFPP_CPPFLAGS
AX_PACKAGE_REQUIRES_PRIVATE AX_PACKAGE_REQUIRES_PRIVATE
AX_PACKAGE_REQUIRES AX_PACKAGE_REQUIRES
PKG_CONFIG_LIBDIR PKG_CONFIG_LIBDIR
...@@ -748,12 +748,12 @@ PKG_CONFIG_PATH ...@@ -748,12 +748,12 @@ PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR PKG_CONFIG_LIBDIR
CIFPP_CFLAGS CIFPP_CFLAGS
CIFPP_LIBS CIFPP_LIBS
CIFPP_CPPFLAGS
CIFPP_LDFLAGS
LIBZ_CPPFLAGS LIBZ_CPPFLAGS
LIBZ_LDFLAGS LIBZ_LDFLAGS
LIBBZ2_CPPFLAGS LIBBZ2_CPPFLAGS
LIBBZ2_LDFLAGS LIBBZ2_LDFLAGS'
CIFPP_CPPFLAGS
CIFPP_LDFLAGS'
# Initialize some variables set by options. # Initialize some variables set by options.
...@@ -1435,6 +1435,14 @@ Some influential environment variables: ...@@ -1435,6 +1435,14 @@ Some influential environment variables:
C preprocessor flags for CIFPP headers C preprocessor flags for CIFPP headers
CIFPP_LDFLAGS CIFPP_LDFLAGS
linker flags for CIFPP libraries linker flags for CIFPP libraries
LIBZ_CPPFLAGS
C preprocessor flags for LIBZ headers
LIBZ_LDFLAGS
linker flags for LIBZ libraries
LIBBZ2_CPPFLAGS
C preprocessor flags for LIBBZ2 headers
LIBBZ2_LDFLAGS
linker flags for LIBBZ2 libraries
Use these variables to override the choices made by `configure' or to help Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations. it to find libraries and programs with nonstandard names/locations.
...@@ -7182,16 +7190,16 @@ $as_echo "#define HAVE_CIFPP 1" >>confdefs.h ...@@ -7182,16 +7190,16 @@ $as_echo "#define HAVE_CIFPP 1" >>confdefs.h
LIBS="-lcif++ $LIBS" LIBS="-lcif++ $LIBS"
else else
fi as_fn_error $? "libcif++ not found" "$LINENO" 5
fi
fi
fi fi
LIBZ_CPPFLAGS
C preprocessor flags for LIBZ headers
LIBZ_LDFLAGS
linker flags for LIBZ libraries
if ${ax_cv_have_LIBZ+:} false; then : if ${ax_cv_have_LIBZ+:} false; then :
...@@ -7272,11 +7280,7 @@ else ...@@ -7272,11 +7280,7 @@ else
fi fi
LIBBZ2_CPPFLAGS
C preprocessor flags for LIBBZ2 headers
LIBBZ2_LDFLAGS
linker flags for LIBBZ2 libraries
if ${ax_cv_have_LIBBZ2+:} false; then : if ${ax_cv_have_LIBBZ2+:} false; then :
...@@ -7381,14 +7385,12 @@ _ACEOF ...@@ -7381,14 +7385,12 @@ _ACEOF
# Ultrix sh set writes to stderr and can't be redirected directly, # Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars. # and sets the high bit in the cache file unless we assign to the vars.
( (
for ac_var in `(set) 2>&1 | sed -n 's/^\(a-zA-Z_a-zA-Z0-9_*\)=.*/\1/p'`; do for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
eval ac_val=\$$ac_var eval ac_val=\$$ac_var
case $ac_val in #( case $ac_val in #(
*${as_nl}*) *${as_nl}*)
case $ac_var in #( case $ac_var in #(
*_cv_* *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac esac
case $ac_var in #( case $ac_var in #(
......
...@@ -114,10 +114,11 @@ pkg-config.])]) ...@@ -114,10 +114,11 @@ pkg-config.])])
[ [
LIBS="-lcif++ $LIBS" LIBS="-lcif++ $LIBS"
], ],
[AC_MSG_ERROR([libcif++ not found])])
fi fi
]) ])
AX_CHECK_LIBRARY([LIBZ], [zlib.h], [z], AX_CHECK_LIBRARY([LIBZ], [zlib.h], [z],
[ LIBS="$LIBS -lz" ], [ LIBS="$LIBS -lz" ],
[AC_MSG_ERROR([libz not found - compressed files not supported])]) [AC_MSG_ERROR([libz not found - compressed files not supported])])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment