gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-06 14:40:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use AC_SEARCH_LIBS instead of AC_CHECK_LIB for sframe

Browse source 
Make it optional, this library is not available on Enterprise linux
This commit is contained in:
Frederik Carlier 2024-04-20 15:23:02 +00:00
parent 1d33c2095f
commit e0af8f8035
No known key found for this signature in database
GPG key ID: 11638A1220ED91C7
3 changed files with 35 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Headers/GNUstepBase/config.h.in
View file

@ -412,6 +412,9 @@
/* Define to 1 if you have the `z' library (-lz). */ /* Define to 1 if you have the `z' library (-lz). */
#undef HAVE_LIBZ #undef HAVE_LIBZ
/* Define to 1 if you have the `zstd' library (-lzstd). */
#undef HAVE_LIBZSTD
/* Define to 1 if you have the <limits.h> header file. */ /* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H #undef HAVE_LIMITS_H

49
configure vendored
View file

@ -9505,13 +9505,12 @@ _ACEOF
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sframe_decode in -lsframe" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sframe" >&5
$as_echo_n "checking for sframe_decode in -lsframe... " >&6; } $as_echo_n "checking for library containing sframe... " >&6; }
if ${ac_cv_lib_sframe_sframe_decode+:} false; then : if ${ac_cv_search_sframe+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_func_search_save_LIBS=$LIBS
LIBS="-lsframe $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@ -9521,32 +9520,44 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
#endif #endif
char sframe_decode (); char sframe ();
int int
main () main ()
{ {
return sframe_decode (); return sframe ();
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : for ac_lib in '' sframe_decode; do
ac_cv_lib_sframe_sframe_decode=yes if test -z "$ac_lib"; then
ac_res="none required"
else else
ac_cv_lib_sframe_sframe_decode=no ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_sframe=$ac_res
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext
LIBS=$ac_check_lib_save_LIBS if ${ac_cv_search_sframe+:} false; then :
break
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sframe_sframe_decode" >&5 done
$as_echo "$ac_cv_lib_sframe_sframe_decode" >&6; } if ${ac_cv_search_sframe+:} false; then :
if test "x$ac_cv_lib_sframe_sframe_decode" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSFRAME 1
_ACEOF
LIBS="-lsframe $LIBS" else
ac_cv_search_sframe=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sframe" >&5
$as_echo "$ac_cv_search_sframe" >&6; }
ac_res=$ac_cv_search_sframe
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi fi

2
configure.ac
View file

@ -2454,7 +2454,7 @@ AC_CHECK_LIB(intl, libintl_fprintf)
AC_CHECK_LIB(zstd, ZSTD_compress) AC_CHECK_LIB(zstd, ZSTD_compress)
AC_CHECK_LIB(iberty, dyn_string_append) AC_CHECK_LIB(iberty, dyn_string_append)
AC_CHECK_LIB(z, gzseek) AC_CHECK_LIB(z, gzseek)
AC_CHECK_LIB(sframe, sframe_decode) AC_SEARCH_LIBS(sframe, sframe_decode)
AC_CHECK_LIB(bfd, bfd_openr) AC_CHECK_LIB(bfd, bfd_openr)
AC_TRY_COMPILE([ AC_TRY_COMPILE([