From 7ae6605846ecc70c937fca31b2133082aae055df Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Tue, 19 Aug 2014 14:22:22 +0200
Subject: Use Gnulib forkpty()

---
 libcrystfel/Makefile.am        | 2 +-
 libcrystfel/src/dirax.c        | 8 +-------
 libcrystfel/src/grainspotter.c | 8 +-------
 libcrystfel/src/mosflm.c       | 8 +-------
 libcrystfel/src/utils.c        | 4 ++++
 libcrystfel/src/xds.c          | 7 +------
 6 files changed, 9 insertions(+), 28 deletions(-)

(limited to 'libcrystfel')

diff --git a/libcrystfel/Makefile.am b/libcrystfel/Makefile.am
index 318dcd24..0b7ddbf1 100644
--- a/libcrystfel/Makefile.am
+++ b/libcrystfel/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libcrystfel.la
-libcrystfel_la_LIBADD = ../lib/libgnu.la @LIBCRYSTFEL_LIBS@
+libcrystfel_la_LIBADD = ../lib/libgnu.la @LIBCRYSTFEL_LIBS@ $(PTY_LIB)
 libcrystfel_la_LDFLAGS = -version-info 4:0:0
 
 libcrystfel_la_SOURCES = src/reflist.c src/utils.c src/cell.c src/detector.c \
diff --git a/libcrystfel/src/dirax.c b/libcrystfel/src/dirax.c
index 3ab592b6..dbd43267 100644
--- a/libcrystfel/src/dirax.c
+++ b/libcrystfel/src/dirax.c
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+#include <pty.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/wait.h>
@@ -48,13 +49,6 @@
 #include <sys/time.h>
 #endif
 
-#if HAVE_FORKPTY_LINUX
-#include <pty.h>
-#elif HAVE_FORKPTY_BSD
-#include <util.h>
-#endif
-
-
 #include "image.h"
 #include "dirax.h"
 #include "utils.h"
diff --git a/libcrystfel/src/grainspotter.c b/libcrystfel/src/grainspotter.c
index 1ac31b6a..5a0130f4 100644
--- a/libcrystfel/src/grainspotter.c
+++ b/libcrystfel/src/grainspotter.c
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+#include <pty.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/wait.h>
@@ -48,13 +49,6 @@
 #include <sys/time.h>
 #endif
 
-#if HAVE_FORKPTY_LINUX
-#include <pty.h>
-#elif HAVE_FORKPTY_BSD
-#include <util.h>
-#endif
-
-
 #include "image.h"
 #include "utils.h"
 #include "peaks.h"
diff --git a/libcrystfel/src/mosflm.c b/libcrystfel/src/mosflm.c
index 970e2fbd..a93bbfe4 100644
--- a/libcrystfel/src/mosflm.c
+++ b/libcrystfel/src/mosflm.c
@@ -61,6 +61,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+#include <pty.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -75,13 +76,6 @@
 #include <sys/time.h>
 #endif
 
-#if HAVE_FORKPTY_LINUX
-#include <pty.h>
-#elif HAVE_FORKPTY_BSD
-#include <util.h>
-#endif
-
-
 #include "image.h"
 #include "mosflm.h"
 #include "utils.h"
diff --git a/libcrystfel/src/utils.c b/libcrystfel/src/utils.c
index 4c85bf9d..0972c710 100644
--- a/libcrystfel/src/utils.c
+++ b/libcrystfel/src/utils.c
@@ -26,6 +26,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <libgen.h>
 #include <math.h>
 #include <string.h>
diff --git a/libcrystfel/src/xds.c b/libcrystfel/src/xds.c
index 8242bc96..c29083b5 100644
--- a/libcrystfel/src/xds.c
+++ b/libcrystfel/src/xds.c
@@ -36,6 +36,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+#include <pty.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/wait.h>
@@ -50,12 +51,6 @@
 #include <sys/time.h>
 #endif
 
-#if HAVE_FORKPTY_LINUX
-#include <pty.h>
-#elif HAVE_FORKPTY_BSD
-#include <util.h>
-#endif
-
 #include "cell.h"
 #include "image.h"
 #include "utils.h"
-- 
cgit v1.2.3