[Pspp-cvs] pspp src/ui/debugger.c src/ui/ChangeLog src/lib...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/10/11 04:59:34

Modified files:
        src/ui         : debugger.c ChangeLog 
        src/libpspp    : magic.h float-format.h ChangeLog 
        .              : configure.ac acinclude.m4 ChangeLog 

Log message:
        cleanup-misc.patch from patch #6230.
        
        * acinclude.m4: Improve formatting.
        
        * configure.ac: Ditto.  Don't check for headers whose presence is
        never tested.  Don't use AC_C_CONST (we can assume that "const" is
        implemented these days).  Don't pass default sizes to
        AC_CHECK_SIZEOF, since modern Autoconf doesn't need them.  Don't
        define FPREP_IEEE754, since it was not tested for.  Don't use
        AC_FUNC_VPRINTF, since we never tested for it.
        
        * float-format.h (enum float_format): Don't check for
        FPREP_IEEE754 macro any longer.
        
        * magic.h: Ditto.
        
        * src/ui/debugger.c: Use debugger if HAVE_FORK is defined, not
        HAVE_SYS_TYPES_H.  The latter is almost universal, but the former
        is only available where it can be implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/debugger.c?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/ChangeLog?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/magic.h?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/float-format.h?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/ChangeLog?cvsroot=pspp&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/pspp/configure.ac?cvsroot=pspp&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/pspp/acinclude.m4?cvsroot=pspp&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pspp/ChangeLog?cvsroot=pspp&r1=1.86&r2=1.87

Patches:
Index: src/ui/debugger.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/debugger.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/ui/debugger.c   7 Jul 2007 06:14:26 -0000       1.5
+++ src/ui/debugger.c   11 Oct 2007 04:59:33 -0000      1.6
@@ -18,7 +18,7 @@
 
 #include "debugger.h"
 
-#if HAVE_SYS_TYPES_H && HAVE_SYS_WAIT_H
+#if HAVE_FORK && HAVE_EXECLP
 #include <errno.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -61,7 +61,7 @@
   exit (EXIT_FAILURE);
 }
 
-#else /* !(HAVE_SYS_TYPES_H && HAVE_SYS_WAIT_H) */
+#else /* !(HAVE_FORK && HAVE_EXECLP) */
 /* Don't know how to connect to gdb.
    Just return.
  */
@@ -69,4 +69,4 @@
 connect_debugger (void)
 {
 }
-#endif /* !(HAVE_SYS_TYPES_H && HAVE_SYS_WAIT_H) */
+#endif /* !(HAVE_FORK && HAVE_EXECLP) */

Index: src/ui/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/ui/ChangeLog    7 Jun 2007 06:42:05 -0000       1.7
+++ src/ui/ChangeLog    11 Oct 2007 04:59:33 -0000      1.8
@@ -1,3 +1,9 @@
+2007-10-10  Ben Pfaff  <address@hidden>
+
+       * src/ui/debugger.c: Use debugger if HAVE_FORK is defined, not
+       HAVE_SYS_TYPES_H.  The latter is almost universal, but the former
+       is only available where it can be implemented.
+
 2007-06-06  Ben Pfaff  <address@hidden>
 
        Adapt case sources, sinks, and clients of procedure code to the

Index: src/libpspp/magic.h
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/magic.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/libpspp/magic.h 7 Jul 2007 06:14:21 -0000       1.4
+++ src/libpspp/magic.h 11 Oct 2007 04:59:33 -0000      1.5
@@ -22,12 +22,6 @@
 #include <float.h>
 #include <limits.h>
 
-/* Check that the floating-point representation is one that we
-   understand. */
-#ifndef FPREP_IEEE754
-#error Only IEEE-754 floating point currently supported.
-#endif
-
 /* Allows us to specify individual bytes of a double. */
 union cvt_dbl {
   unsigned char cvt_dbl_i[8];

Index: src/libpspp/float-format.h
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/float-format.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/libpspp/float-format.h  7 Jul 2007 06:14:20 -0000       1.5
+++ src/libpspp/float-format.h  11 Oct 2007 04:59:34 -0000      1.6
@@ -43,7 +43,6 @@
     FLOAT_FP,                      /* Neutral intermediate format. */
     FLOAT_HEX,                     /* C99 hexadecimal floating constant. */
 
-#ifdef FPREP_IEEE754
 #ifdef WORDS_BIGENDIAN
     FLOAT_NATIVE_FLOAT = FLOAT_IEEE_SINGLE_BE,
     FLOAT_NATIVE_DOUBLE = FLOAT_IEEE_DOUBLE_BE,
@@ -55,9 +54,6 @@
     FLOAT_NATIVE_32_BIT = FLOAT_IEEE_SINGLE_LE,
     FLOAT_NATIVE_64_BIT = FLOAT_IEEE_DOUBLE_LE
 #endif
-#else
-#error Only IEEE-754 floating point currently supported for PSPP hosts.
-#endif
   };
 
 void float_convert (enum float_format, const void *,

Index: src/libpspp/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/ChangeLog,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- src/libpspp/ChangeLog       17 Sep 2007 04:00:54 -0000      1.78
+++ src/libpspp/ChangeLog       11 Oct 2007 04:59:34 -0000      1.79
@@ -1,3 +1,12 @@
+2007-10-10  Ben Pfaff  <address@hidden>
+
+       We assume IEEE-754 now.
+
+       * float-format.h (enum float_format): Don't check for
+       FPREP_IEEE754 macro any longer.
+
+       * magic.h: Ditto.
+
 2007-09-16  Ben Pfaff  <address@hidden>
 
        * copyleft.c: Add trailing new-lines to lack-of-warranty

Index: configure.ac
===================================================================
RCS file: /cvsroot/pspp/pspp/configure.ac,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- configure.ac        6 Oct 2007 06:58:13 -0000       1.64
+++ configure.ac        11 Oct 2007 04:59:34 -0000      1.65
@@ -34,7 +34,9 @@
 AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
 
 
-AC_ARG_WITH(gui, [  --without-gui         don't build the PSPPIRE gui])
+AC_ARG_WITH(
+  gui, 
+  [AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])])
 
 if test x"$with_gui" != x"no" ; then 
   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8.0,,
@@ -44,7 +46,9 @@
 fi
 AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
 
-AC_ARG_WITH(gui_tools, [  --with-gui-tools          build the gui developer 
tools])
+AC_ARG_WITH(
+  gui_tools,
+  [AS_HELP_STRING([--with-gui-tools], [build the gui developer tools])])
 if test x"$with_gui_tools" = x"yes" ; then 
        PKG_CHECK_MODULES(GLADE_UI, gladeui-1.0)
 fi
@@ -61,36 +65,32 @@
 PSPP_READLINE
 
 dnl Checks for header files.
-AC_CHECK_HEADERS([limits.h memory.h sys/stat.h sys/time.h sys/types.h \
-                  fpu_control.h sys/mman.h sys/wait.h ieeefp.h fenv.h] )
+AC_CHECK_HEADERS([sys/wait.h fpu_control.h ieeefp.h fenv.h])
 
 # For gnulib.
 gl_INIT
 
-AC_C_CONST
 AC_C_INLINE
 
 dnl  Dont use AC_TYPE_OFF_T --- it doesnt generate the HAVE_TYPE macro
 AC_CHECK_TYPES(off_t) 
-AC_CHECK_SIZEOF(float, 0)
-AC_CHECK_SIZEOF(double, 8)
-AC_CHECK_SIZEOF(long double, 0)
-
-AC_DEFINE(FPREP_IEEE754, 1,
-       [Define for machines that have IEEE 754 floating point arithmetic,
-         the most common format today.])
+AC_CHECK_SIZEOF(float)
+AC_CHECK_SIZEOF(double)
+AC_CHECK_SIZEOF(long double)
 
 AC_C_BIGENDIAN
 
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([__setfpucw execl fork isinf isnan finite getpid feholdexcept 
fpsetmask popen round trunc])
+AC_CHECK_FUNCS([__setfpucw fork execl execlp isinf isnan finite getpid 
feholdexcept fpsetmask popen round trunc])
 
 AC_PROG_LN_S
 
 dnl This is needed otherwise --with-included-gettext fails
 AH_BOTTOM([#include <locale.h>])
 
-AC_ARG_ENABLE(debug, [  --enable-debug          Turn on diagnostic features in 
the program])
+AC_ARG_ENABLE(
+  debug, 
+  [AS_HELP_STRING([--enable-debug], 
+                  [Turn on diagnostic features in the program])])
 if test x"$enable_debug" = x"yes"  ; then
   AC_DEFINE(DEBUGGING, 1, [Define to 1 if debugging is enabled.])
 fi

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/pspp/pspp/acinclude.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- acinclude.m4        23 Sep 2007 05:59:01 -0000      1.13
+++ acinclude.m4        11 Oct 2007 04:59:34 -0000      1.14
@@ -37,7 +37,10 @@
 dnl Check that libplot is available.
 AC_DEFUN([PSPP_LIBPLOT],
 [
-  AC_ARG_WITH(libplot, [  --without-libplot         don't compile in support 
of charts (using libplot)])
+  AC_ARG_WITH(
+    libplot, 
+    [AS_HELP_STRING([--without-libplot],
+                    [don't compile in support of charts (using libplot)])])
 
   if test x"$with_libplot" != x"no" ; then 
     # Check whether we can link against libplot without any extra libraries.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/ChangeLog,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- ChangeLog   6 Oct 2007 06:58:13 -0000       1.86
+++ ChangeLog   11 Oct 2007 04:59:34 -0000      1.87
@@ -1,3 +1,14 @@
+2007-10-10  Ben Pfaff  <address@hidden>
+
+       * acinclude.m4: Improve formatting.
+
+       * configure.ac: Ditto.  Don't check for headers whose presence is
+       never tested.  Don't use AC_C_CONST (we can assume that "const" is
+       implemented these days).  Don't pass default sizes to
+       AC_CHECK_SIZEOF, since modern Autoconf doesn't need them.  Don't
+       define FPREP_IEEE754, since it was not tested for.  Don't use
+       AC_FUNC_VPRINTF, since we never tested for it.
+
 2007-10-06 John Darrington <address@hidden>
 
        * configure.ac INSTALL: Change libglade version requirement.