From: Kelley Cook Date: Sat, 10 Apr 2004 17:02:04 +0000 (+0000) Subject: configure.in: Rename file to ... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=11554edce69ef25aedffcef55e5a6c6c0516624a;p=gcc.git configure.in: Rename file to ... 2004-04-10 Kelley Cook * configure.in: Rename file to ... * configure.ac: ...this. * Makefile.in: Regenerate. From-SVN: r80582 --- diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index a55a024a06c..5c009a8b05d 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,3 +1,9 @@ +2004-04-10 Kelley Cook + + * configure.in: Rename file to ... + * configure.ac: ...this. + * Makefile.in: Regenerate. + 2004-04-09 Nathanael Nerode * configure.in: Update to autoconf 2.59; clean up slightly. diff --git a/zlib/Makefile.in b/zlib/Makefile.in index 45418aac1bc..117d1e6b0d2 100644 --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -184,7 +184,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = README ChangeLog Makefile.am Makefile.in acinclude.m4 \ -aclocal.m4 configure configure.in +aclocal.m4 configure configure.ac DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -197,19 +197,19 @@ OBJECTS = $(libz_a_OBJECTS) $(libzgcj_convenience_la_OBJECTS) all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac acinclude.m4 cd $(srcdir) && $(ACLOCAL) config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) mostlyclean-toolexeclibLIBRARIES: diff --git a/zlib/configure.ac b/zlib/configure.ac new file mode 100644 index 00000000000..e716daf9ff6 --- /dev/null +++ b/zlib/configure.ac @@ -0,0 +1,156 @@ +dnl Process this with autoconf to create configure + +AC_PREREQ(2.59) +AC_INIT +AC_CONFIG_SRCDIR([zlib.h]) + +# This works around the fact that libtool configuration may change LD +# for this particular configuration, but some shells, instead of +# keeping the changes in LD private, export them just because LD is +# exported. +ORIGINAL_LD_FOR_MULTILIBS=$LD + +dnl We may get other options which we dont document: +dnl --with-target-subdir, --with-multisrctop, --with-multisubdir + +if test "x[$]{with_target_subdir}" != x && \ + test "[$]{srcdir}" = "."; then + if test "[$]{with_target_subdir}" != "."; then + zlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../" + else + zlib_basedir="[$]{srcdir}/[$]{with_multisrctop}" + fi +else + zlib_basedir="[$]{srcdir}/" +fi +AC_SUBST(zlib_basedir) +AC_CONFIG_AUX_DIR($zlib_basedir..) +if :; then :; else + # This overrides the previous occurrence for automake, but not for + # autoconf, which is exactly what we want. + AC_CONFIG_AUX_DIR(..) +fi + +AC_CANONICAL_SYSTEM + +# This works around an automake problem. +mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" +AC_SUBST(mkinstalldirs) + +AM_INIT_AUTOMAKE(zlib, 1.1.4) + +AM_MAINTAINER_MODE + +dnl We use these options to decide which functions to include. +AC_ARG_WITH(target-subdir, +[ --with-target-subdir=SUBDIR + configuring in a subdirectory]) + +if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then + COMPPATH=. +else + COMPPATH=.. +fi +AC_SUBST(COMPPATH) + +AC_ARG_WITH(cross-host, +[ --with-cross-host=HOST configuring with a cross compiler]) + +dnl Default to --enable-multilib +AC_ARG_ENABLE(multilib, +[ --enable-multilib build many library versions (default)], +[case "${enableval}" in + yes) multilib=yes ;; + no) multilib=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; + esac], [test -z "$with_target_subdir" && multilib=no || multilib=yes])dnl + +AC_ARG_WITH(system-zlib, +[ --with-system-zlib use installed libz]) + +# Make sure we don't test executables when making cross-tools. +GCC_NO_EXECUTABLES + +AC_PROG_CC + +AM_PROG_LIBTOOL + +# Find CPP now so that any conditional tests below won't do it and +# thereby make the resulting definitions conditional. +AC_PROG_CPP + +if test -n "$with_cross_host"; then + # We are being configured with a cross compiler. AC_REPLACE_FUNCS + # may not work correctly, because the compiler may not be able to + # link executables. + + # We assume newlib. This lets us hard-code the functions we know + # we'll have. + AC_DEFINE(HAVE_MEMCPY) + AC_DEFINE(HAVE_STRERROR) + + # We ignore --with-system-zlib in this case. + target_all=libzgcj.la +else + AC_FUNC_MMAP + AC_CHECK_FUNCS(memcpy strerror) + + if test "$with_system_zlib" = yes; then + AC_CHECK_LIB(z, deflate, target_all=, target_all=libzgcj.la) + else + target_all=libzgcj.la + fi +fi + +AC_SUBST(target_all) + +AC_CHECK_HEADERS(unistd.h) + +if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' + toolexeclibdir='$(toolexecdir)/lib' +else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +fi +if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then + multiosdir=/`$CC -print-multi-os-directory` + case $multiosdir in + /.) multiosdir= ;; # Avoid trailing /. + esac +else + multiosdir= +fi +toolexeclibdir=${toolexeclibdir}${multiosdir} +AC_SUBST(toolexecdir) +AC_SUBST(toolexeclibdir) + +AM_CONDITIONAL(TARGET_LIBRARY, test -n "$with_target_subdir") + +if test "${multilib}" = "yes"; then + multilib_arg="--enable-multilib" +else + multilib_arg= +fi + +AC_CONFIG_FILES([Makefile]) + +AC_CONFIG_COMMANDS([default], +[[if test -n "$CONFIG_FILES"; then + LD="${ORIGINAL_LD_FOR_MULTILIBS}" + ac_file=Makefile . ${zlib_basedir}/../config-ml.in +fi]], +[[srcdir=${srcdir} +host=${host} +target=${target} +with_multisubdir=${with_multisubdir} +ac_configure_args="${multilib_arg} ${ac_configure_args}" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +zlib_basedir=${zlib_basedir} +CC="${CC}" +CXX="${CXX}" +ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" +]]) + +AC_OUTPUT diff --git a/zlib/configure.in b/zlib/configure.in deleted file mode 100644 index e716daf9ff6..00000000000 --- a/zlib/configure.in +++ /dev/null @@ -1,156 +0,0 @@ -dnl Process this with autoconf to create configure - -AC_PREREQ(2.59) -AC_INIT -AC_CONFIG_SRCDIR([zlib.h]) - -# This works around the fact that libtool configuration may change LD -# for this particular configuration, but some shells, instead of -# keeping the changes in LD private, export them just because LD is -# exported. -ORIGINAL_LD_FOR_MULTILIBS=$LD - -dnl We may get other options which we dont document: -dnl --with-target-subdir, --with-multisrctop, --with-multisubdir - -if test "x[$]{with_target_subdir}" != x && \ - test "[$]{srcdir}" = "."; then - if test "[$]{with_target_subdir}" != "."; then - zlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../" - else - zlib_basedir="[$]{srcdir}/[$]{with_multisrctop}" - fi -else - zlib_basedir="[$]{srcdir}/" -fi -AC_SUBST(zlib_basedir) -AC_CONFIG_AUX_DIR($zlib_basedir..) -if :; then :; else - # This overrides the previous occurrence for automake, but not for - # autoconf, which is exactly what we want. - AC_CONFIG_AUX_DIR(..) -fi - -AC_CANONICAL_SYSTEM - -# This works around an automake problem. -mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" -AC_SUBST(mkinstalldirs) - -AM_INIT_AUTOMAKE(zlib, 1.1.4) - -AM_MAINTAINER_MODE - -dnl We use these options to decide which functions to include. -AC_ARG_WITH(target-subdir, -[ --with-target-subdir=SUBDIR - configuring in a subdirectory]) - -if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then - COMPPATH=. -else - COMPPATH=.. -fi -AC_SUBST(COMPPATH) - -AC_ARG_WITH(cross-host, -[ --with-cross-host=HOST configuring with a cross compiler]) - -dnl Default to --enable-multilib -AC_ARG_ENABLE(multilib, -[ --enable-multilib build many library versions (default)], -[case "${enableval}" in - yes) multilib=yes ;; - no) multilib=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; - esac], [test -z "$with_target_subdir" && multilib=no || multilib=yes])dnl - -AC_ARG_WITH(system-zlib, -[ --with-system-zlib use installed libz]) - -# Make sure we don't test executables when making cross-tools. -GCC_NO_EXECUTABLES - -AC_PROG_CC - -AM_PROG_LIBTOOL - -# Find CPP now so that any conditional tests below won't do it and -# thereby make the resulting definitions conditional. -AC_PROG_CPP - -if test -n "$with_cross_host"; then - # We are being configured with a cross compiler. AC_REPLACE_FUNCS - # may not work correctly, because the compiler may not be able to - # link executables. - - # We assume newlib. This lets us hard-code the functions we know - # we'll have. - AC_DEFINE(HAVE_MEMCPY) - AC_DEFINE(HAVE_STRERROR) - - # We ignore --with-system-zlib in this case. - target_all=libzgcj.la -else - AC_FUNC_MMAP - AC_CHECK_FUNCS(memcpy strerror) - - if test "$with_system_zlib" = yes; then - AC_CHECK_LIB(z, deflate, target_all=, target_all=libzgcj.la) - else - target_all=libzgcj.la - fi -fi - -AC_SUBST(target_all) - -AC_CHECK_HEADERS(unistd.h) - -if test -n "$with_cross_host" && - test x"$with_cross_host" != x"no"; then - toolexecdir='$(exec_prefix)/$(target_alias)' - toolexeclibdir='$(toolexecdir)/lib' -else - toolexecdir='$(libdir)/gcc-lib/$(target_alias)' - toolexeclibdir='$(libdir)' -fi -if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then - multiosdir=/`$CC -print-multi-os-directory` - case $multiosdir in - /.) multiosdir= ;; # Avoid trailing /. - esac -else - multiosdir= -fi -toolexeclibdir=${toolexeclibdir}${multiosdir} -AC_SUBST(toolexecdir) -AC_SUBST(toolexeclibdir) - -AM_CONDITIONAL(TARGET_LIBRARY, test -n "$with_target_subdir") - -if test "${multilib}" = "yes"; then - multilib_arg="--enable-multilib" -else - multilib_arg= -fi - -AC_CONFIG_FILES([Makefile]) - -AC_CONFIG_COMMANDS([default], -[[if test -n "$CONFIG_FILES"; then - LD="${ORIGINAL_LD_FOR_MULTILIBS}" - ac_file=Makefile . ${zlib_basedir}/../config-ml.in -fi]], -[[srcdir=${srcdir} -host=${host} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${multilib_arg} ${ac_configure_args}" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -zlib_basedir=${zlib_basedir} -CC="${CC}" -CXX="${CXX}" -ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" -]]) - -AC_OUTPUT