[SCM] ESO library for automated astronomical data-reduction branch, master, updated. upstream/5.3.1-12-g088eee9

[Ole Streicher]

The following commit has been merged in the master branch:
commit cffbf2c53be1e46a3b2a2a08fba32a9a988cac0b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Dec 7 10:25:07 2011 +0100

    On kfreebsd and hurd, TIOCGWINSZ requires sys/ioctl.h. This patch
    adds a autoconf check for that case.

diff --git a/debian/patches/check_for_TIOCGWINSZ.patch b/debian/patches/check_for_TIOCGWINSZ.patch
new file mode 100644
index 0000000..a86ff9b
--- /dev/null
+++ b/debian/patches/check_for_TIOCGWINSZ.patch
@@ -0,0 +1,27 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: On kfreebsd and hurd, TIOCGWINSZ requires sys/ioctl.h. This patch
+ adds a autoconf check for that case.
+Forwarded: <mailto:cpl-help at eso.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,6 +83,7 @@
+ AC_CHECK_HEADERS([fcntl.h stdlib.h string.h stropts.h sys/ioctl.h termios.h \
+                   sys/times.h sys/time.h omp.h \
+                   termio.h unistd.h])
++AC_HEADER_TIOCGWINSZ
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+--- a/cplcore/cpl_msg.c
++++ b/cplcore/cpl_msg.c
+@@ -46,6 +46,10 @@
+ #  endif
+ #endif
+ 
++#ifdef GWINSZ_IN_SYS_IOCTL
++# include <sys/ioctl.h>
++#endif
++
+ #include <signal.h>
+ 
+ #ifdef HAVE_STROPTS_H
diff --git a/debian/patches/series b/debian/patches/series
index 05e99aa..1463008 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ remove-cfitsio-version-check.patch
 use-std-paths-for-libs.patch
 remove-private-ltdl.patch
 build-cpljava.patch
+check_for_TIOCGWINSZ.patch

-- 
ESO library for automated astronomical data-reduction