X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=README.Git;h=46bc0818eb00e5b5a613828e52e7ca0eb702691b;hb=b542e82bedca874f5bba32efef8cb6f300ca0eb5;hp=652ddf249adb2ce96034cb96d71421093b40953d;hpb=f00c8490080474d40395906cb42d32b3b0c69db8;p=pspp

diff --git a/README.Git b/README.Git
index 652ddf249a..46bc0818eb 100644
--- a/README.Git
+++ b/README.Git
@@ -21,7 +21,9 @@ following:
 
 	* libtool 1.5.22 (or later).
 
-	* Texinfo 4.7 or later, to build the documentation.
+	* Texinfo 5.2 or later, to build the documentation.
+
+	* Gimp --  2.8.2 is known to work
 
 After you install PSPP's prerequisites, you must obtain a copy of
 Gnulib, then bootstrap the tree, as described in the sections below.
@@ -34,12 +36,14 @@ This version of PSPP should work with the Gnulib commit shown below.
 Gnulib does not maintain a stable API or ABI, so it is possible that
 PSPP will not work with older or newer versions of Gnulib.
 
-	commit ebc6ce40ac3f349d69766e3b94db034a0245f3d7
-	Author: John Darrington <john@darrington.wattle.id.au>
-	Date:   Wed Jun 20 23:30:48 2012 +0200
+	commit 418a494eaac2dbec290de5991059bc9b33dc7df1
+	Author: John E. Malmberg <wb8tyw@gmail.com>
+	Date:   Sat Jul 15 23:11:44 2017 +0200
 
-	    tmpfile, clean-temp: Fix invocation of GetVersionEx.
+	    sys_socket: Add support for OpenVMS.
 
+	    * lib/sys_socket.in.h [__VMS]: Define CMSG_SPACE, CMSG_LEN.
+	    * doc/posix-headers/sys_socket.texi: Mention OpenVMS issues.
 
 To clone Gnulib into a directory named "gnulib" using Git, and then
 check out this particular commit, run these commands:
@@ -75,3 +79,58 @@ Once PSPP is built, you may run its self-tests with:
 	make check
 or for a more thorough test:
 	make distcheck
+
+Glade UI Design
+---------------
+
+The ui files in src/ui/gui may be viewed (maybe changed) with Glade. For this
+you need
+
+	* libgladeui 2.0 or later
+
+Then you need to run
+
+        configure --with-gui-tools
+	make
+	make install
+
+psppire uses some self defined widgets. To use glade these widgets have
+to be announced to glade such that you can view the interface.
+The install process will install the psppire glade library, icons and
+psppire.xml files in the appropiate system locations. You cannot override
+this with --prefix. After that you can run "glade" and open the ui files.
+
+Building from git on Mac OS
+---------------------------
+
+You can build on MacOS in the macports environment. After installing all
+required packages to resolve library dependencies and autotools e.t.c, you
+run make -f Smake as described above.
+
+The macports system provides the libraries and header files in a separate
+location from the MacOS system libraries. The typical locations are
+
+Libraries: /opt/local/lib
+Headers:   /opt/local/include
+
+pspp under macports will be linked against the macports libraries. The configure
+script has to be informed about the library and header locations. Assume the following
+directory structure for an out of tree build:
+
+~/mypspp
+  |----pspp    (This is the pspp git directory)
+  |----install (The install location containing also ui files for psppire)
+  |----build   (The build directory)
+  |----gnulib  (The gnulib directory as described above)
+
+Then you can build with the following commands:
+
+    cd ~/mypspp/pspp
+    make -f Smake
+    cd ../build
+    ../pspp/configure --prefix=/Users/USER/mypspp/install \
+                  LDFLAGS=-L/opt/local/lib \
+		  CPPFLAGS=-I/opt/local/include
+    make
+    make install
+    ../install/bin/psppire (If everything worked, you should see psppire...)