gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-02 01:21:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prefer dispatch/dispatch.h over dispatch.h.

Browse source
This commit is contained in:
Frederik Seiffert 2020-11-27 14:25:46 +01:00 • committed by Frederik Seiffert
parent 1b7bf26bea
commit ad43ad9092
2 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

31
configure vendored
View file

@ -12940,21 +12940,6 @@ esac
fi fi
for ac_header in dispatch.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "dispatch.h" "ac_cv_header_dispatch_h" "$ac_includes_default"
if test "x$ac_cv_header_dispatch_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DISPATCH_H 1
_ACEOF
have_dispatch=yes
else
have_dispatch=no
fi
done
if test "$have_dispatch" = "no"; then
for ac_header in dispatch/dispatch.h for ac_header in dispatch/dispatch.h
do : do :
ac_fn_c_check_header_mongrel "$LINENO" "dispatch/dispatch.h" "ac_cv_header_dispatch_dispatch_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "dispatch/dispatch.h" "ac_cv_header_dispatch_dispatch_h" "$ac_includes_default"
@ -12969,6 +12954,7 @@ fi
done done
if test "$have_dispatch" = "yes"; then
# check for private header which includes runloop integration functions in # check for private header which includes runloop integration functions in
# the Swift corelibs libdispatch release # the Swift corelibs libdispatch release
for ac_header in dispatch/private.h for ac_header in dispatch/private.h
@ -12981,6 +12967,21 @@ _ACEOF
fi fi
done
else
for ac_header in dispatch.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "dispatch.h" "ac_cv_header_dispatch_h" "$ac_includes_default"
if test "x$ac_cv_header_dispatch_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DISPATCH_H 1
_ACEOF
have_dispatch=yes
else
have_dispatch=no
fi
done done
fi fi

5
configure.ac
View file

@ -3392,12 +3392,13 @@ if test $enable_libdispatch = yes; then
GS_ADD_LIBRARY_PATH([${dispatch_libdir}]) GS_ADD_LIBRARY_PATH([${dispatch_libdir}])
fi fi
AC_CHECK_HEADERS(dispatch.h, have_dispatch=yes, have_dispatch=no)
if test "$have_dispatch" = "no"; then
AC_CHECK_HEADERS(dispatch/dispatch.h, have_dispatch=yes, have_dispatch=no) AC_CHECK_HEADERS(dispatch/dispatch.h, have_dispatch=yes, have_dispatch=no)
if test "$have_dispatch" = "yes"; then
# check for private header which includes runloop integration functions in # check for private header which includes runloop integration functions in
# the Swift corelibs libdispatch release # the Swift corelibs libdispatch release
AC_CHECK_HEADERS(dispatch/private.h) AC_CHECK_HEADERS(dispatch/private.h)
else
AC_CHECK_HEADERS(dispatch.h, have_dispatch=yes, have_dispatch=no)
fi fi
if test "$have_dispatch" = "yes"; then if test "$have_dispatch" = "yes"; then
AC_CHECK_LIB(dispatch, dispatch_queue_create, have_dispatch=yes, have_dispatch=no) AC_CHECK_LIB(dispatch, dispatch_queue_create, have_dispatch=yes, have_dispatch=no)