Author: stefanbidi
Date: Fri Jan 30 22:38:31 2015
New Revision: 38311

URL: http://svn.gna.org/viewcvs/gnustep?rev=38311&view=rev
Log:
* Source/config.h.in,
* configure,
* configure.ac: Disable check for GCD as it is broken.

Modified:
    libs/corebase/trunk/ChangeLog
    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=38311&r1=38310&r2=38311&view=diff
==============================================================================
--- libs/corebase/trunk/ChangeLog       (original)
+++ libs/corebase/trunk/ChangeLog       Fri Jan 30 22:38:31 2015
@@ -1,3 +1,8 @@
+2014-01-30 Stefan Bidigaray <[email protected]>
+       * Source/config.h.in,
+       * configure,
+       * configure.ac: Disable check for GCD as it is broken.
+
 2014-12-09 Stefan Bidigaray <[email protected]>
        * Headers/CoreFoundation/GSCharUtilities.h: Fixed function case.
        * Source/CFString.c: Use new whitespace function.

Modified: libs/corebase/trunk/Source/config.h.in
URL: 
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/Source/config.h.in?rev=38311&r1=38310&r2=38311&view=diff
==============================================================================
--- libs/corebase/trunk/Source/config.h.in      (original)
+++ libs/corebase/trunk/Source/config.h.in      Fri Jan 30 22:38:31 2015
@@ -32,9 +32,6 @@
 
 /* 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=38311&r1=38310&r2=38311&view=diff
==============================================================================
--- libs/corebase/trunk/configure       (original)
+++ libs/corebase/trunk/configure       Fri Jan 30 22:38:31 2015
@@ -688,7 +688,6 @@
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-with_gcd
 with_objc_bridge
 with_zoneinfo_dir
 '
@@ -1310,8 +1309,6 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --without-gcd           Compiles without Grand Central Dispatch support.
-                          This option leads to a loss of functionality.
   --without-objc-bridge   Does not compile the Objective-C toll-free bridge
                           mechanism.
   --with-zoneinfo-dir=DIR Directory of the Time zone object files.
@@ -4226,77 +4223,21 @@
 #---
 # Check for Grand Central Dispatch (libdispatch)
 #---
-
-# Check whether --with-gcd was given.
-if test "${with_gcd+set}" = set; then :
-  withval=$with_gcd; with_gcd=$enableval
-else
-  with_gcd=yes
-fi
-
-if test "$with_gcd" = "yes"; then :
-  LIBS="$LIBS -ldispatch"
-            $as_echo "#define HAVE_LIBDISPATCH 1" >>confdefs.h
-
-            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 "$ac_cv_header_dispatch_dispatch_h" = "no"; then :
-  as_fn_error $? "Could not find the Grand Central Dispatch header. Use 
--disable-gcd to disable GCD support or install libdispatch." "$LINENO" 5
-
-fi
-            { $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 "$ac_cv_lib_dispatch_dispatch_get_main_queue_eventfd_np" = 
"no"; then :
-  as_fn_error $? "Compatible libdispatch not found for GCD support! Use 
--disable-gcd to disable GCD support." "$LINENO" 5
-fi
-fi
+# 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 for the Objective-C runtime

Modified: libs/corebase/trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/configure.ac?rev=38311&r1=38310&r2=38311&view=diff
==============================================================================
--- libs/corebase/trunk/configure.ac    (original)
+++ libs/corebase/trunk/configure.ac    Fri Jan 30 22:38:31 2015
@@ -107,20 +107,21 @@
 #---
 # Check for Grand Central Dispatch (libdispatch)
 #---
-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.])])])
+# 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 for the Objective-C runtime


_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs

Reply via email to