[Guile-commits] 428/437: Further lightning integration work

[Andy Wingo]

wingo pushed a commit to branch lightning
in repository guile.

commit 8316707594371dfca2ebc4c899043c50d8e46dd7
Author: Andy Wingo <address@hidden>
Date:   Sat Jun 30 12:07:00 2018 +0200

    Further lightning integration work
    
    * libguile/lightning/configure.ac: Start trimming down for inclusion in
      configure.ac.  Remove check for getopt things; we don't include bits
      of lightning that use getopt. Remove check for stdint, as we will have
      it.
    * libguile/lightning/include/lightning.h: Unconditionally include
      stdint.h.
---
 libguile/lightning/configure.ac        | 33 ++-------------------------------
 libguile/lightning/include/lightning.h |  6 ++----
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/libguile/lightning/configure.ac b/libguile/lightning/configure.ac
index 7e1afd5..9e5c84f 100644
--- a/libguile/lightning/configure.ac
+++ b/libguile/lightning/configure.ac
@@ -1,31 +1,4 @@
-dnl
-dnl Copyright 2000, 2001, 2002, 2012-2018 Free Software Foundation, Inc.
-dnl
-dnl This file is part of GNU lightning.
-dnl
-dnl GNU lightning is free software; you can redistribute it and/or modify it
-dnl under the terms of the GNU Lesser General Public License as published
-dnl by the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl 
-dnl GNU lightning is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-dnl or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-dnl License for more details.
-dnl
-
-AC_PREREQ(2.57)
-AC_INIT([GNU lightning], 2.1.2, address@hidden, lightning)
-AC_CANONICAL_TARGET
-AC_CONFIG_SRCDIR([Makefile.am])
-AM_INIT_AUTOMAKE([dist-bzip2])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AC_CONFIG_HEADERS(config.h)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+LIGHTNING_CFLAGS=
 
 case "$target_cpu" in
     ia64)
@@ -59,9 +32,7 @@ case "$target_cpu" in
     *)                                         ;;
 esac
 
-AC_CHECK_FUNCS(mremap ffsl getopt_long_only isnan isinf,,)
-
-AC_CHECK_HEADERS([getopt.h stdint.h],,,)
+AC_CHECK_FUNCS(mremap ffsl isnan isinf,,)
 
 AC_ARG_ENABLE(disassembler,
              AS_HELP_STRING([--enable-disassembler],
diff --git a/libguile/lightning/include/lightning.h 
b/libguile/lightning/include/lightning.h
index 55657c8..6b4790a 100644
--- a/libguile/lightning/include/lightning.h
+++ b/libguile/lightning/include/lightning.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2012-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -26,9 +26,7 @@
 
 #include <unistd.h>
 #include <stdlib.h>
-#if HAVE_STDINT_H
-#  include <stdint.h>
-#endif
+#include <stdint.h>
 #include <string.h>
 
 #if defined(__hpux) && defined(__hppa__)