configure.ac: check for presence / add libgnugetopt to support

  getopt_long on FreeBSD

algorithm.c, alloc.h: Wrap includes of alloca.h with #ifdef
  HAVE_ALLOCA_H.  Some platforms (FreeBSD for example) have alloca in
  stdlib.h... Autoconf detects this in AC_FUNC_ALLOCA

diff --git a/configure.ac b/configure.ac
index 5015f73aa8291b076dfe77aa665ae766b5125f16..69ac564b509133b0b7e13004cebe6dcd9bd76d54 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,7 @@ AC_CHECK_LIB(gslcblas,main,,AC_MSG_ERROR([You must install libgslcblas]))
 AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,,
        AC_MSG_ERROR([You must install libgsl version 1.4 or later]))
 
+AC_CHECK_LIB(gnugetopt,getopt_long)
 AC_CHECK_FUNC(getopt_long,,
        AC_MSG_ERROR(`This application depends upon getopt_long'))
 

diff --git a/src/algorithm.c b/src/algorithm.c
index 89e813defa12b7ce4b3588ce194a7dc0dfb99e9c..230b1437f214ca6090979679bed2be9747051625 100644 (file)
--- a/src/algorithm.c
+++ b/src/algorithm.c
@@ -511,7 +511,10 @@ lexicographical_compare_3way (const void *array1, size_t count1,
    Engineering a sort function; Jon Bentley and M. Douglas McIlroy;
    Software - Practice and Experience; Vol. 23 (11), 1249-1265, 1993.  */
 
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
+#endif
+
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/alloc.h b/src/alloc.h
index b1b34d0fec11e452f1a2e049ed0caf0383f6b8a0..b44f0f38b51ba8cbe8cc9e23c8c0beceed7b764e 100644 (file)
--- a/src/alloc.h
+++ b/src/alloc.h
@@ -30,7 +30,9 @@ char *xstrdup (const char *s);
 \f
 /* alloca() wrapper functions. */
 #if defined (HAVE_ALLOCA) || defined (C_ALLOCA)
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
+#endif
 #define local_alloc(X) alloca (X)
 #define local_free(P) ((void) 0)
 #else