[rtems-graphics-toolkit commit] Zlib detection based on z_gzgets, not gz_gets
Gedare Bloom
gedare at rtems.org
Tue Dec 24 15:24:16 UTC 2013
Module: rtems-graphics-toolkit
Branch: master
Commit: fc62b78ac0a256c993b1e2720276fe6d84c6f08d
Changeset: http://git.rtems.org/rtems-graphics-toolkit/commit/?id=fc62b78ac0a256c993b1e2720276fe6d84c6f08d
Author: Alexandru-Sever Horin <alex.sever.h at gmail.com>
Date: Thu Aug 9 18:09:08 2012 +0300
Zlib detection based on z_gzgets, not gz_gets
---
fltk-1.3.0/configure | 22 +++++++++++-----------
fltk-1.3.0/configure.in | 4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/fltk-1.3.0/configure b/fltk-1.3.0/configure
index 9691c85..a64d0c1 100755
--- a/fltk-1.3.0/configure
+++ b/fltk-1.3.0/configure
@@ -6115,9 +6115,9 @@ fi
syszlib_ok=no
syszinc_ok=no
if test x$enable_localzlib != xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzgets in -lz" >&5
-$as_echo_n "checking for gzgets in -lz... " >&6; }
-if ${ac_cv_lib_z_gzgets+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for z_gzgets in -lz" >&5
+$as_echo_n "checking for z_gzgets in -lz... " >&6; }
+if ${ac_cv_lib_z_z_gzgets+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -6131,27 +6131,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char gzgets ();
+char z_gzgets ();
int
main ()
{
-return gzgets ();
+return z_gzgets ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_z_gzgets=yes
+ ac_cv_lib_z_z_gzgets=yes
else
- ac_cv_lib_z_gzgets=no
+ ac_cv_lib_z_z_gzgets=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzgets" >&5
-$as_echo "$ac_cv_lib_z_gzgets" >&6; }
-if test "x$ac_cv_lib_z_gzgets" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_z_gzgets" >&5
+$as_echo "$ac_cv_lib_z_z_gzgets" >&6; }
+if test "x$ac_cv_lib_z_z_gzgets" = xyes; then :
ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
if test "x$ac_cv_header_zlib_h" = xyes; then :
syszinc_ok=yes
@@ -7262,7 +7262,7 @@ fi
$as_echo "$as_me: WARNING: Ignoring libraries \"$X_PRE_LIBS\" requested by configure." >&2;}
fi
- LIBS="$LIBS -lNX11 -lnano-X -ltiff -lt1 -ljpeg $X_EXTRA_LIBS"
+ LIBS="$LIBS -lX11 -lnano-X -ltiff -lt1 $X_EXTRA_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
CXXFLAGS="$CXXFLAGS $X_CFLAGS"
LDFLAGS="$X_LIBS $LDFLAGS"
diff --git a/fltk-1.3.0/configure.in b/fltk-1.3.0/configure.in
index fd4da79..ee1e0f1 100644
--- a/fltk-1.3.0/configure.in
+++ b/fltk-1.3.0/configure.in
@@ -675,7 +675,7 @@ AC_ARG_ENABLE(localzlib, [ --enable-localzlib use local ZLIB library, defa
syszlib_ok=no
syszinc_ok=no
if test x$enable_localzlib != xyes; then
- AC_CHECK_LIB(z,gzgets,
+ AC_CHECK_LIB(z,z_gzgets,
[AC_CHECK_HEADER(zlib.h,
syszinc_ok=yes)
if test x$syszinc_ok = xyes; then
@@ -923,7 +923,7 @@ case $uname_GUI in
AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by configure.)
fi
- LIBS="$LIBS -lNX11 -lnano-X -ltiff -lt1 -ljpeg $X_EXTRA_LIBS"
+ LIBS="$LIBS -lX11 -lnano-X -ltiff -lt1 $X_EXTRA_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
CXXFLAGS="$CXXFLAGS $X_CFLAGS"
LDFLAGS="$X_LIBS $LDFLAGS"
More information about the vc
mailing list