From: Akim Demaille <akim@epita.fr>
Date: Mon, 26 Nov 2001 09:35:38 +0000 (+0000)
Subject: * configure.in: Invoke AC_FUNC_OBSTACK and AC_FUNC_ERROR_AT_LINE.
X-Git-Tag: before-m4-back-end~265
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/5e147124b5cedc2bb71320f6f86707639196d499

* configure.in: Invoke AC_FUNC_OBSTACK and AC_FUNC_ERROR_AT_LINE.
* lib/Makefile.am (libbison_a_SOURCES): Adjust.
---

diff --git a/ChangeLog b/ChangeLog
index f425d982..633ad3b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-26  Akim Demaille  <akim@epita.fr>
+
+	* configure.in: Invoke AC_FUNC_OBSTACK and AC_FUNC_ERROR_AT_LINE.
+	* lib/Makefile.am (libbison_a_SOURCES): Adjust.
+
 2001-11-26  Akim Demaille  <akim@epita.fr>
 
 	* src/conflicts.c (conflicts_print): Don't complain at all when
diff --git a/configure.in b/configure.in
index 51c85620..aedc1937 100644
--- a/configure.in
+++ b/configure.in
@@ -85,6 +85,8 @@ AM_C_PROTOTYPES
 
 # Checks for library functions.
 AC_FUNC_ALLOCA
+AC_FUNC_OBSTACK
+AC_FUNC_ERROR_AT_LINE
 AC_CHECK_FUNCS(mkstemp setlocale)
 AC_CHECK_DECLS([stpcpy, strndup, strnlen, memchr])
 AC_REPLACE_FUNCS(stpcpy strndup strnlen strspn memchr)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 24b22c75..51790f56 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,10 +12,8 @@ INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl
 EXTRA_DIST = malloc.c realloc.c
 
 libbison_a_SOURCES = \
-  error.c error.h \
   getopt.h getopt.c getopt1.c \
   hash.h hash.c \
-  obstack.h obstack.c \
   quote.h quote.c quotearg.h quotearg.c \
   xalloc.h xmalloc.c xstrdup.c
 
diff --git a/src/files.c b/src/files.c
index 0dbcac37..2da1fd37 100644
--- a/src/files.c
+++ b/src/files.c
@@ -211,9 +211,9 @@ skeleton_find (const char *envvar, const char *skeleton_name)
   if (!res)
     {
       /* Skeleton file name without path */
-      const char *skel_name = strrchr(skeleton_name, '/');
+      const char *skel_name = strrchr (skeleton_name, '/');
       if (!skel_name)
-        skel_name = strrchr(skeleton_name, '\\');
+        skel_name = strrchr (skeleton_name, '\\');
       if (!skel_name)
         skel_name = skeleton_name;
       else