* 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 f425d982cb09b20a5f00f1c7bd20f72e16c3d727..633ad3b30fa343a037fe8c8d028a4f819577bd5d 100644 (file)
--- 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
 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 51c85620544e3f9c7da1761508357b3efee884aa..aedc19375f8cdcf70d18cccccbca0ec5efd33d9f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -85,6 +85,8 @@ AM_C_PROTOTYPES
 
 # Checks for library functions.
 AC_FUNC_ALLOCA
 
 # 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)
 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 24b22c75e2f3274e95efba9f91f740d86e34201a..51790f5610f0c17ded435555a160c1dc0eaeff3d 100644 (file)
--- 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 = \
 EXTRA_DIST = malloc.c realloc.c
 
 libbison_a_SOURCES = \

-  error.c error.h \

   getopt.h getopt.c getopt1.c \
   hash.h hash.c \
   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
 
   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 0dbcac37428584bccb6486fc714a64de2adc6f74..2da1fd3798a71b492f1842662dd3f0c08e1ff8a6 100644 (file)
--- 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 */
   if (!res)
     {
       /* Skeleton file name without path */

-      const char *skel_name = strrchr(skeleton_name, '/');
+      const char *skel_name = strrchr (skeleton_name, '/');

       if (!skel_name)
       if (!skel_name)

-        skel_name = strrchr(skeleton_name, '\\');
+        skel_name = strrchr (skeleton_name, '\\');

       if (!skel_name)
         skel_name = skeleton_name;
       else
       if (!skel_name)
         skel_name = skeleton_name;
       else