Skip to content

R
riscv-gcc-1
Commit c09f797a by Michael Koch Committed by Michael Koch
Options

cvsignore: Ignore autom4te.cache 

2003-12-18  Michael Koch  <konqueror@gmx.de>

	* libltdl/.cvsignore: Ignore autom4te.cache
	* libltdl/Makefile.in: Regenerated.
	* libltdl/aclocal.m4: Regenerated.
	* libltdl/acconfig.h: Removed (obsolete).
	* libltdl/config-h.in: Regenerated.
	* libltdl/configure.ac: Added AM_MAINTAINER_MODE.
	* libltdl/configure: Regenerated.

From-SVN: r74800
parent d20db242
Showing with 62 additions and 38 deletions
libjava/ChangeLog
2003-12-18 Michael Koch <konqueror@gmx.de> 2003-12-18 Michael Koch <konqueror@gmx.de>
* libltdl/.cvsignore: Ignore autom4te.cache
* libltdl/Makefile.in: Regenerated.
* libltdl/aclocal.m4: Regenerated.
* libltdl/acconfig.h: Removed (obsolete).
* libltdl/config-h.in: Regenerated.
* libltdl/configure.ac: Added AM_MAINTAINER_MODE.
* libltdl/configure: Regenerated.
2003-12-18 Michael Koch <konqueror@gmx.de>
* mauve-libgcj: Removed the disabling of java.text.ACIAttribute and * mauve-libgcj: Removed the disabling of java.text.ACIAttribute and
java.text.CollationElementIterator tests as they compile again. java.text.CollationElementIterator tests as they compile again.
* testsuite/libjava.mauve/xfails: Added failing * testsuite/libjava.mauve/xfails: Added failing
......
libjava/libltdl/.cvsignore
...@@ -8,3 +8,4 @@ libtool ...@@ -8,3 +8,4 @@ libtool
*.lo *.lo
*.la *.la
stamp-h stamp-h
autom4te.cache
libjava/libltdl/Makefile.in
...@@ -83,6 +83,9 @@ LIBTOOL = @LIBTOOL@ ...@@ -83,6 +83,9 @@ LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
...@@ -190,9 +193,9 @@ HEADERS = $(include_HEADERS) $(noinst_HEADERS) ...@@ -190,9 +193,9 @@ HEADERS = $(include_HEADERS) $(noinst_HEADERS)
DIST_COMMON = README $(include_HEADERS) $(noinst_HEADERS) \ DIST_COMMON = README $(include_HEADERS) $(noinst_HEADERS) \
$(srcdir)/Makefile.in $(srcdir)/configure COPYING.LIB ChangeLog \ $(srcdir)/Makefile.in $(srcdir)/configure COPYING.LIB ChangeLog \
Makefile.am acconfig.h acinclude.m4 aclocal.m4 config-h.in \ Makefile.am acinclude.m4 aclocal.m4 config-h.in config.guess \
config.guess config.sub configure configure.ac install-sh \ config.sub configure configure.ac install-sh ltmain.sh missing \
ltmain.sh missing mkinstalldirs mkinstalldirs
SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES) SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES)
all: config.h all: config.h
...@@ -203,18 +206,18 @@ all: config.h ...@@ -203,18 +206,18 @@ all: config.h
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.lineno
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile $(AUTOMAKE) --foreign Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF) cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): configure.ac acinclude.m4 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac acinclude.m4
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1 config.h: stamp-h1
...@@ -227,7 +230,7 @@ stamp-h1: $(srcdir)/config-h.in $(top_builddir)/config.status ...@@ -227,7 +230,7 @@ stamp-h1: $(srcdir)/config-h.in $(top_builddir)/config.status
@rm -f stamp-h1 @rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(top_srcdir)/acconfig.h $(srcdir)/config-h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOHEADER) cd $(top_srcdir) && $(AUTOHEADER)
touch $(srcdir)/config-h.in touch $(srcdir)/config-h.in
......
libjava/libltdl/acconfig.h deleted 100644 → 0
/* Some of these are defined here, not in configure.in, because
they're AC_DEFINEd in two different places, which causes two
defines to appear. Some C compilers might now appreciate it... */
/* Define if you have the libdl library or equivalent. */
#undef HAVE_LIBDL
/* Define if you have the GNU dld library. */
#undef HAVE_DLD
/* Define if you have the shl_load function. */
#undef HAVE_SHL_LOAD
/* Define if you are using the Boehm GC. */
#undef HAVE_BOEHM_GC
libjava/libltdl/aclocal.m4
...@@ -7112,3 +7112,42 @@ AC_PREREQ([2.52]) ...@@ -7112,3 +7112,42 @@ AC_PREREQ([2.52])
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# Add --enable-maintainer-mode option to configure.
# From Jim Meyering
# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 2
AC_DEFUN([AM_MAINTAINER_MODE],
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode is disabled by default
AC_ARG_ENABLE(maintainer-mode,
[ --enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer],
USE_MAINTAINER_MODE=$enableval,
USE_MAINTAINER_MODE=no)
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
MAINT=$MAINTAINER_MODE_TRUE
AC_SUBST(MAINT)dnl
]
)
AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
libjava/libltdl/config-h.in
/* config-h.in. Generated from configure.ac by autoheader. */ /* config-h.in. Generated from configure.ac by autoheader. */
/* Some of these are defined here, not in configure.in, because
they're AC_DEFINEd in two different places, which causes two
defines to appear. Some C compilers might now appreciate it... */
/* Define if you have the libdl library or equivalent. */
#undef HAVE_LIBDL
/* Define if you have the GNU dld library. */
#undef HAVE_DLD
/* Define if you have the shl_load function. */
#undef HAVE_SHL_LOAD
/* Define if you are using the Boehm GC. */
#undef HAVE_BOEHM_GC
/* Define to 1 if you have the `argz_append' function. */ /* Define to 1 if you have the `argz_append' function. */
#undef HAVE_ARGZ_APPEND #undef HAVE_ARGZ_APPEND
......
libjava/libltdl/configure.ac
...@@ -52,6 +52,7 @@ fi ...@@ -52,6 +52,7 @@ fi
## ------------------------ ## ## ------------------------ ##
AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION, -) AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION, -)
AM_CONFIG_HEADER([config.h:config-h.in]) AM_CONFIG_HEADER([config.h:config-h.in])
AM_MAINTAINER_MODE
## ------------------ ## ## ------------------ ##
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment