Changeset fc62b78 in rtems-graphics-toolkit


Ignore:
Timestamp:
Aug 9, 2012, 3:09:08 PM (7 years ago)
Author:
Alexandru-Sever Horin <alex.sever.h@…>
Branches:
master
Children:
4d56a50
Parents:
1ddc1ad
git-author:
Alexandru-Sever Horin <alex.sever.h@…> (08/09/12 15:09:08)
git-committer:
Alexandru-Sever Horin <alex.sever.h@…> (09/11/12 07:26:45)
Message:

Zlib detection based on z_gzgets, not gz_gets

Location:
fltk-1.3.0
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • fltk-1.3.0/configure

    r1ddc1ad rfc62b78  
    61166116syszinc_ok=no
    61176117if test x$enable_localzlib != xyes; then
    6118     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzgets in -lz" >&5
    6119 $as_echo_n "checking for gzgets in -lz... " >&6; }
    6120 if ${ac_cv_lib_z_gzgets+:} false; then :
     6118    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for z_gzgets in -lz" >&5
     6119$as_echo_n "checking for z_gzgets in -lz... " >&6; }
     6120if ${ac_cv_lib_z_z_gzgets+:} false; then :
    61216121  $as_echo_n "(cached) " >&6
    61226122else
     
    61326132extern "C"
    61336133#endif
    6134 char gzgets ();
     6134char z_gzgets ();
    61356135int
    61366136main ()
    61376137{
    6138 return gzgets ();
     6138return z_gzgets ();
    61396139  ;
    61406140  return 0;
     
    61426142_ACEOF
    61436143if ac_fn_c_try_link "$LINENO"; then :
    6144   ac_cv_lib_z_gzgets=yes
    6145 else
    6146   ac_cv_lib_z_gzgets=no
     6144  ac_cv_lib_z_z_gzgets=yes
     6145else
     6146  ac_cv_lib_z_z_gzgets=no
    61476147fi
    61486148rm -f core conftest.err conftest.$ac_objext \
     
    61506150LIBS=$ac_check_lib_save_LIBS
    61516151fi
    6152 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzgets" >&5
    6153 $as_echo "$ac_cv_lib_z_gzgets" >&6; }
    6154 if test "x$ac_cv_lib_z_gzgets" = xyes; then :
     6152{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_z_gzgets" >&5
     6153$as_echo "$ac_cv_lib_z_z_gzgets" >&6; }
     6154if test "x$ac_cv_lib_z_z_gzgets" = xyes; then :
    61556155  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
    61566156if test "x$ac_cv_header_zlib_h" = xyes; then :
     
    72637263        fi
    72647264
    7265         LIBS="$LIBS -lNX11 -lnano-X -ltiff -lt1 -ljpeg $X_EXTRA_LIBS"
     7265        LIBS="$LIBS -lX11 -lnano-X -ltiff -lt1 $X_EXTRA_LIBS"
    72667266        CFLAGS="$CFLAGS $X_CFLAGS"
    72677267        CXXFLAGS="$CXXFLAGS $X_CFLAGS"
  • fltk-1.3.0/configure.in

    r1ddc1ad rfc62b78  
    676676syszinc_ok=no
    677677if test x$enable_localzlib != xyes; then
    678     AC_CHECK_LIB(z,gzgets,
     678    AC_CHECK_LIB(z,z_gzgets,
    679679        [AC_CHECK_HEADER(zlib.h,
    680680                syszinc_ok=yes)
     
    924924        fi
    925925
    926         LIBS="$LIBS -lNX11 -lnano-X -ltiff -lt1 -ljpeg $X_EXTRA_LIBS"
     926        LIBS="$LIBS -lX11 -lnano-X -ltiff -lt1 $X_EXTRA_LIBS"
    927927        CFLAGS="$CFLAGS $X_CFLAGS"
    928928        CXXFLAGS="$CXXFLAGS $X_CFLAGS"
Note: See TracChangeset for help on using the changeset viewer.