Author: stefanbidi
Date: Fri Feb 13 03:12:26 2015
New Revision: 38338
URL: http://svn.gna.org/viewcvs/gnustep?rev=38338&view=rev
Log:
* Source/config.h.in,
* configure,
* configure.ac: Correctly handle existence of compatible GCD library.
* Source/GSUnicode.c: Temperarily disable 96-bit long double error.
Modified:
libs/corebase/trunk/ChangeLog
libs/corebase/trunk/Source/GSUnicode.c
libs/corebase/trunk/Source/config.h.in
libs/corebase/trunk/configure
libs/corebase/trunk/configure.ac
Modified: libs/corebase/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/ChangeLog?rev=38338&r1=38337&r2=38338&view=diff
==============================================================================
--- libs/corebase/trunk/ChangeLog (original)
+++ libs/corebase/trunk/ChangeLog Fri Feb 13 03:12:26 2015
@@ -1,3 +1,9 @@
+2014-02-12 Stefan Bidigaray <[email protected]>
+ * Source/config.h.in,
+ * configure,
+ * configure.ac: Correctly handle existence of compatible GCD library.
+ * Source/GSUnicode.c: Temperarily disable 96-bit long double error.
+
2014-01-30 Stefan Bidigaray <[email protected]>
* Source/config.h.in,
* configure,
Modified: libs/corebase/trunk/Source/GSUnicode.c
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/Source/GSUnicode.c?rev=38338&r1=38337&r2=38338&view=diff
==============================================================================
--- libs/corebase/trunk/Source/GSUnicode.c (original)
+++ libs/corebase/trunk/Source/GSUnicode.c Fri Feb 13 03:12:26 2015
@@ -1340,9 +1340,15 @@
#if SIZEOF_LONG_DOUBLE > SIZEOF_DOUBLE
#if SIZEOF_LONG_DOUBLE == 12
-#error 96-bit long double currently not supported!
+/* #error 96-bit long double currently not supported! */
static Boolean
_ldbl_is_inf (long double d)
+{
+ return false;
+}
+
+static Boolean
+_ldbl_is_nan (long double d)
{
return false;
}
Modified: libs/corebase/trunk/Source/config.h.in
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/Source/config.h.in?rev=38338&r1=38337&r2=38338&view=diff
==============================================================================
--- libs/corebase/trunk/Source/config.h.in (original)
+++ libs/corebase/trunk/Source/config.h.in Fri Feb 13 03:12:26 2015
@@ -32,6 +32,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `dispatch' library (-ldispatch). */
+#undef HAVE_LIBDISPATCH
/* Define to 1 if you have the `objc' library (-lobjc). */
#undef HAVE_LIBOBJC
Modified: libs/corebase/trunk/configure
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/configure?rev=38338&r1=38337&r2=38338&view=diff
==============================================================================
--- libs/corebase/trunk/configure (original)
+++ libs/corebase/trunk/configure Fri Feb 13 03:12:26 2015
@@ -688,6 +688,7 @@
ac_subst_files=''
ac_user_opts='
enable_option_checking
+with_gcd
with_objc_bridge
with_zoneinfo_dir
'
@@ -1309,6 +1310,14 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --without-gcd Explicitly compiles without Grand Central Dispatch
+ support. Configure will attempt to find a compatible
+ library, use this option if you do not wish to have
+ the support. The opposite option, --with-gcd, is
+ also supported and should be used if Grand Central
+ Dispatch support is absolutely required. A
+ compatible library will required
+ (http://www.nickhutchinson.me/libdispatch).
--without-objc-bridge Does not compile the Objective-C toll-free bridge
mechanism.
--with-zoneinfo-dir=DIR Directory of the Time zone object files.
@@ -4223,21 +4232,76 @@
#---
# Check for Grand Central Dispatch (libdispatch)
#---
-# WARNING: the check here is broken and needs to be fixed! Commenting it for
now.
-#AC_ARG_WITH([gcd],
-# [AS_HELP_STRING([--without-gcd],
-# [Compiles without Grand Central Dispatch support. This option leads to a
loss of functionality.])],
-# [with_gcd=$enableval], [with_gcd=yes])
-#AS_IF([test "$with_gcd" = "yes"],
-# [LIBS="$LIBS -ldispatch"
-# AC_DEFINE(HAVE_LIBDISPATCH, 1)]
-# [AC_CHECK_HEADER(dispatch/dispatch.h)
-# AS_IF([test "$ac_cv_header_dispatch_dispatch_h" = "no"],
-# [AC_MSG_ERROR([Could not find the Grand Central Dispatch
header. Use --disable-gcd to disable GCD support or install libdispatch.])
-# ])
-# AC_CHECK_LIB(dispatch, dispatch_get_main_queue_eventfd_np)
-# AS_IF([test
"$ac_cv_lib_dispatch_dispatch_get_main_queue_eventfd_np" = "no"],
-# [AC_MSG_ERROR([Compatible libdispatch not found for GCD
support! Use --disable-gcd to disable GCD support.])])])
+
+# Check whether --with-gcd was given.
+if test "${with_gcd+set}" = set; then :
+ withval=$with_gcd; with_gcd=$withval
+else
+ with_gcd=maybe
+fi
+
+if test "$with_gcd" != "no"; then :
+ ac_fn_c_check_header_mongrel "$LINENO" "dispatch/dispatch.h"
"ac_cv_header_dispatch_dispatch_h" "$ac_includes_default"
+if test "x$ac_cv_header_dispatch_dispatch_h" = xyes; then :
+
+fi
+
+
+ if test x"$ac_cv_header_dispatch_dispatch_h" = "xno"; then :
+ if test x"$with_gcd" = "xyes"; then :
+ as_fn_error $? "Could not find the Grand Central Dispatch headers."
"$LINENO" 5
+fi
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for
dispatch_get_main_queue_eventfd_np in -ldispatch" >&5
+$as_echo_n "checking for dispatch_get_main_queue_eventfd_np in -ldispatch... "
>&6; }
+if ${ac_cv_lib_dispatch_dispatch_get_main_queue_eventfd_np+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldispatch $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dispatch_get_main_queue_eventfd_np ();
+int
+main ()
+{
+return dispatch_get_main_queue_eventfd_np ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dispatch_dispatch_get_main_queue_eventfd_np=yes
+else
+ ac_cv_lib_dispatch_dispatch_get_main_queue_eventfd_np=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_dispatch_dispatch_get_main_queue_eventfd_np" >&5
+$as_echo "$ac_cv_lib_dispatch_dispatch_get_main_queue_eventfd_np" >&6; }
+if test "x$ac_cv_lib_dispatch_dispatch_get_main_queue_eventfd_np" = xyes; then
:
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDISPATCH 1
+_ACEOF
+
+ LIBS="-ldispatch $LIBS"
+
+fi
+
+ if test x"$ac_cv_lib_dispatch_dispatch_get_main_queue_eventfd_np"
= "xno" -a x"$with_gcd" = "xyes"; then :
+ as_fn_error $? "Compatible libdispatch not found for GCD support!" "$LINENO"
5
+fi
+fi
+fi
#---
# Check for the Objective-C runtime
@@ -4245,7 +4309,7 @@
# Check whether --with-objc-bridge was given.
if test "${with_objc_bridge+set}" = set; then :
- withval=$with_objc_bridge; with_objc_bridge=$enableval
+ withval=$with_objc_bridge; with_objc_bridge=$withval
else
with_objc_bridge=yes
fi
@@ -4412,7 +4476,7 @@
# Check whether --with-zoneinfo-dir was given.
if test "${with_zoneinfo_dir+set}" = set; then :
- withval=$with_zoneinfo_dir;
+ withval=$with_zoneinfo_dir; with_zoneinfo_dir=$withval
else
with_zoneinfo_dir=no
fi
Modified: libs/corebase/trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/configure.ac?rev=38338&r1=38337&r2=38338&view=diff
==============================================================================
--- libs/corebase/trunk/configure.ac (original)
+++ libs/corebase/trunk/configure.ac Fri Feb 13 03:12:26 2015
@@ -107,21 +107,18 @@
#---
# Check for Grand Central Dispatch (libdispatch)
#---
-# WARNING: the check here is broken and needs to be fixed! Commenting it for
now.
-#AC_ARG_WITH([gcd],
-# [AS_HELP_STRING([--without-gcd],
-# [Compiles without Grand Central Dispatch support. This option leads to a
loss of functionality.])],
-# [with_gcd=$enableval], [with_gcd=yes])
-#AS_IF([test "$with_gcd" = "yes"],
-# [LIBS="$LIBS -ldispatch"
-# AC_DEFINE(HAVE_LIBDISPATCH, 1)]
-# [AC_CHECK_HEADER(dispatch/dispatch.h)
-# AS_IF([test "$ac_cv_header_dispatch_dispatch_h" = "no"],
-# [AC_MSG_ERROR([Could not find the Grand Central Dispatch
header. Use --disable-gcd to disable GCD support or install libdispatch.])
-# ])
-# AC_CHECK_LIB(dispatch, dispatch_get_main_queue_eventfd_np)
-# AS_IF([test
"$ac_cv_lib_dispatch_dispatch_get_main_queue_eventfd_np" = "no"],
-# [AC_MSG_ERROR([Compatible libdispatch not found for GCD
support! Use --disable-gcd to disable GCD support.])])])
+AC_ARG_WITH([gcd],
+ [AS_HELP_STRING([--without-gcd],
+ [Explicitly compiles without Grand Central Dispatch support. Configure
will attempt to find a compatible library, use this option if you do not wish
to have the support. The opposite option, --with-gcd, is also supported and
should be used if Grand Central Dispatch support is absolutely required. A
compatible library will required (http://www.nickhutchinson.me/libdispatch).])],
+ [with_gcd=$withval], [with_gcd=maybe])
+AS_IF([test "$with_gcd" != "no"],
+ [AC_CHECK_HEADER(dispatch/dispatch.h)
+ AS_IF([test x"$ac_cv_header_dispatch_dispatch_h" = "xno"],
+ AS_IF([test x"$with_gcd" = "xyes"],
+ AC_MSG_ERROR([Could not find the Grand Central Dispatch
headers.])),
+ AC_CHECK_LIB(dispatch, dispatch_get_main_queue_eventfd_np)
+ AS_IF([test
x"$ac_cv_lib_dispatch_dispatch_get_main_queue_eventfd_np" = "xno" -a
x"$with_gcd" = "xyes"],
+ AC_MSG_ERROR([Compatible libdispatch not found for GCD
support!])))])
#---
# Check for the Objective-C runtime
@@ -129,7 +126,7 @@
AC_ARG_WITH([objc-bridge],
[AS_HELP_STRING([--without-objc-bridge],
[Does not compile the Objective-C toll-free bridge mechanism.])],
- [with_objc_bridge=$enableval], [with_objc_bridge=yes])
+ [with_objc_bridge=$withval], [with_objc_bridge=yes])
AS_IF([test "$with_objc_bridge" = "yes"],
[AC_PATH_PROG(GNUSTEP_CONFIG, [gnustep-config], [no])
AS_IF([test "$GNUSTEP_CONFIG" != "no"],
@@ -152,7 +149,7 @@
AC_ARG_WITH([zoneinfo-dir],
[AS_HELP_STRING([--with-zoneinfo-dir=DIR],
[Directory of the Time zone object files.])],
- [], [with_zoneinfo_dir=no])
+ [with_zoneinfo_dir=$withval], [with_zoneinfo_dir=no])
AC_MSG_CHECKING([zoneinfo directory])
AS_IF([test "$with_zoneinfo_dir" = "no"],
[AS_IF([test -d "/usr/share/zoneinfo"],
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
