octave: configure.ac comparison

comparison configure.ac @ 21398:7e8a410e6124

break generated file dependence on Makefile (bug #46063) * build-aux/mk-mxarray-h.in.sh, build-aux/mk-version-h.in.sh, build-aux/subst-config-vals.in.sh, build-aux/subst-cross-config-vals.in.sh, build-aux/subst-default-vals.in.sh, build-aux/subst-f77-isnan-macro.in.sh, build-aux/subst-script-vals.in.sh: New files with commands extracted from build-aux/common.mk. * build-aux/common.mk (ADDRESS_SANITIZER_OPTIONS, do_subst_config_vals, do_subst_cross_config_vals, do_subst_default_vals, do_subst_script_vals): Eliminate macros that are now in script files. (FONTCONFIG_CPPFLAGS, FT2_CPPFLAGS, LIBEXT): Move definition to configure.ac, use AC_SUBST to put values in subst-config-vals.sh and build-aux/subst-cross-config-vals.sh. (startupfiledir, localstartupfiledir): Move definition to configure.ac, use AC_SUBST to put values in subst-default-vals.sh. (ALL_FFLAGS): Delete unused macro. (simple-filter-rule): New macro. * build-aux/mk-default-qt-settings.in.sh: Rename and adapt from libgui/mk-default-qt-settings.in. * build-aux/mk-f77-def.in.sh: Rename and adapt from liboctave/cruft/mkf77def.in. * Makefile.am (EXTRA_DIST): Include new files in the list. * acinclude.m4 (OCTAVE_CONFIG_MOVE_IF_CHANGE_FILES): Assume file names have the suffix .sh and are generated from .in.sh. * Makefile.am (run-octave): Depend on build-aux/subst-script-vals.sh instead of Makefile. (octave-config.h): Use move-if-change rule. * configure.ac: Use ${X} instead of $(X) for variables in OCTAVE_SET_DEFAULT args. (SHARED_LIBS, STATIC_LIBS): AC_SUBST them. Protect timestamp of oct-conf-post.h with a move-if-change rule. * etc/module.mk (etc/icons/octave.appdata.xml, etc/icons/octave.desktop): Don't depend on Makefile. * libgui/module.mk (libgui/default-qt-settings): Depend on build-aux/mk-default-qt-settings.sh instead of Makefile. * build-env.h, build-env.cc (ALL_CFLAGS, ALL_CXXFLAGS, ALL_FFLAGS, ALL_LDFLAGS, LIBFLAGS): Delete variables. * libinterp/corefcn/module.mk ($(OPT_HANDLERS), $(COREFCN_FT2_DF), libinterp/corefcn/defaults.h, libinterp/corefcn/graphics.h, libinterp/corefcn/graphics-props.cc, libinterp/corefcn/oct-errno.cc, libinterp/corefcn/mxarray.h, libinterp/corefcn/oct-tex-lexer.ll): Depend on timestamp file to ensure destination directory exists. (libinterp/corefcn/graphics.h, libinterp/corefcn/graphics-props.cc, libinterp/corefcn/oct-errno.cc, libinterp/corefcn/oct-tex-lexer.ll, libinterp/corefcn/oct-tex-symbols.cc): Use mv instead of move-if-change. (libinterp/corefcn/mxarray.h): Use script to substitute values. Depend on libinterp/corefcn/mxarray.in.h instead of Makefile * libinterp/corefcn/toplev.cc (octave_config_info): Don't include ALL_CFLAGS, ALL_CXXFLAGS, ALL_FFLAGS, ALL_LDFLAGS, of LIBFLAGS in the list. * libinterp/module.mk ($(SRC_DEF_FILES)): Don't depend on Makefile. (libinterp/build-env.cc, libinterp/build-env-features.cc, libinterp/builtins.cc, libinterp/builtin-defun-decls.h, libinterp/dldfcn/PKG_ADD, libinterp/.DOCSTRINGS): Depend on timestamp file to ensure destination directory exists. (libinterp/build-env.cc): Depend on build-aux/subst-config-vals.sh instead of Makefile. (libinterp/version.h): Use script to substitute values. Depend on build-aux/mk-version-h.sh instead of libinterp/version.in.h. * liboctave/cruft/module.mk (liboctave/cruft/cruft.def): Depend on timestamp file to ensure destination directory exists. (liboctave_DISTCLEANFILES): Remove liboctave/cruft/mkf77def from the list. (liboctave_EXTRA_DIST): Don't add liboctave/cruft/mkf77def.in to the list. * liboctave/cruft/ranlib/module.mk (liboctave/cruft/ranlib/ranlib.def): Depend on timestamp file to ensure destination directory exists. * liboctave/cruft/slatec-fn/module.mk (liboctave/cruft/slatec-fn/erfc.f, liboctave/cruft/slatec-fn/derfc.f): Depend on timestamp file to ensure destination directory exists. Use script to substitute values. Depend on build-aux/subst-f77-isnan-macro.sh instead of Makefile. (do-subst-isnan-macro): Delete macro. * scripts/module.mk (GEN_FCN_FILES_TEMPLATE): Use simple-filter-rule to execute build-aux/subst-config-vals.sh. Depend on build-aux/subst-config-vals.sh instead of Makefile. (scripts/.DOCSTRINGS): Don't depend on Makefile. Do depend on timestamp file to ensure destination directory exists. * src/module.mk (src/$(host_triplet)-mkoctfile.cc, src/$(host_triplet)-octave-config.cc): Depend on build-aux/subst-cross-config-vals.sh instead of Makefile. (src/octave-config.cc, src/mkoctfile.cc, src/main.cc): Depend on build-aux/subst-default-vals.sh instead of Makefile.

author	John W. Eaton <jwe@octave.org>
date	Fri, 04 Mar 2016 12:51:00 -0500
parents	df859661e31e
children	1aa293d58df0

comparison

equal deleted inserted replaced

-:df859661e31e
+:7e8a410e6124
 ### Set default file locations
 ## Where to install and expect libraries like liboctave.a, liboctinterp.a,
 ## and other architecture-dependent data.
-OCTAVE_SET_DEFAULT([octlibdir], '$(libdir)/octave/$(version)')
+OCTAVE_SET_DEFAULT([octlibdir], '${libdir}/octave/${version}')
 ## Where to put executables to be run by Octave rather than
 ## the user.  This path usually includes the Octave version
 ## and configuration name, so that multiple configurations
 ## for multiple versions of Octave may be installed at once.
 OCTAVE_SET_DEFAULT([archlibdir],
-'$(libexecdir)/octave/$(version)/exec/$(canonical_host_type)')
+'${libexecdir}/octave/${version}/exec/${canonical_host_type}')
 ## Where to put executables to be run by Octave rather than by the
 ## user that are specific to this site.
 OCTAVE_SET_DEFAULT([localarchlibdir],
-'$(libexecdir)/octave/site/exec/$(canonical_host_type)')
+'${libexecdir}/octave/site/exec/${canonical_host_type}')
 OCTAVE_SET_DEFAULT([localapiarchlibdir],
-'$(libexecdir)/octave/$(api_version)/site/exec/$(canonical_host_type)')
+'${libexecdir}/octave/${api_version}/site/exec/${canonical_host_type}')
 OCTAVE_SET_DEFAULT([localverarchlibdir],
-'$(libexecdir)/octave/$(version)/site/exec/$(canonical_host_type)')
+'${libexecdir}/octave/${version}/site/exec/${canonical_host_type}')
 ## Where to put object files that will by dynamically loaded.
 ## This path usually includes the Octave version and configuration
 ## name, so that multiple configurations for multiple versions of
 ## Octave may be installed at once.
 OCTAVE_SET_DEFAULT([octfiledir],
-'$(libdir)/octave/$(version)/oct/$(canonical_host_type)')
+'${libdir}/octave/${version}/oct/${canonical_host_type}')
 ## Directories Octave should search for object files that will be
 ## dynamically loaded and that are specific to this site
 ## (i.e. customizations), before consulting ${octfiledir}.  This should
 ## be a colon-separated list of directories.
 OCTAVE_SET_DEFAULT([localoctfiledir],
-'$(libdir)/octave/site/oct/$(canonical_host_type)')
+'${libdir}/octave/site/oct/${canonical_host_type}')
 OCTAVE_SET_DEFAULT([localapioctfiledir],
-'$(libdir)/octave/site/oct/$(api_version)/$(canonical_host_type)')
+'${libdir}/octave/site/oct/${api_version}/${canonical_host_type}')
 OCTAVE_SET_DEFAULT([localveroctfiledir],
-'$(libdir)/octave/$(version)/site/oct/$(canonical_host_type)')
+'${libdir}/octave/${version}/site/oct/${canonical_host_type}')
 ## Where to install Octave's include files.
-OCTAVE_SET_DEFAULT([octincludedir], '$(includedir)/octave-$(version)/octave')
+OCTAVE_SET_DEFAULT([octincludedir], '${includedir}/octave-${version}/octave')
 ## Where to install the function file distributed with
 ## Octave.  This includes the Octave version, so that the
 ## function files for different versions of Octave will install
 ## themselves in separate directories.
-OCTAVE_SET_DEFAULT([fcnfiledir], '$(datadir)/octave/$(version)/m')
+OCTAVE_SET_DEFAULT([fcnfiledir], '${datadir}/octave/${version}/m')
 ## Directories Octave should search for function files specific
 ## to this site (i.e. customizations), before consulting
 ## ${fcnfiledir}.  This should be a colon-separated list of
 ## directories.
-OCTAVE_SET_DEFAULT([localfcnfiledir], '$(datadir)/octave/site/m')
+OCTAVE_SET_DEFAULT([localfcnfiledir], '${datadir}/octave/site/m')
 OCTAVE_SET_DEFAULT([localapifcnfiledir],
-'$(datadir)/octave/site/$(api_version)/m')
+'${datadir}/octave/site/${api_version}/m')
-OCTAVE_SET_DEFAULT([localverfcnfiledir], '$(datadir)/octave/$(version)/site/m')
+OCTAVE_SET_DEFAULT([localverfcnfiledir], '${datadir}/octave/${version}/site/m')
 ## Where to install and expect extra files like NEWS and doc-cache.
-OCTAVE_SET_DEFAULT([octetcdir], '$(datadir)/octave/$(version)/etc')
+OCTAVE_SET_DEFAULT([octetcdir], '${datadir}/octave/${version}/etc')
 ## Where to install and expect the language files for the gui.
-OCTAVE_SET_DEFAULT([octlocaledir], '$(datadir)/octave/$(version)/locale')
+OCTAVE_SET_DEFAULT([octlocaledir], '${datadir}/octave/${version}/locale')
 ## The full path to the default doc cache file.
-OCTAVE_SET_DEFAULT([doc_cache_file], '$(octetcdir)/doc-cache')
+OCTAVE_SET_DEFAULT([doc_cache_file], '${octetcdir}/doc-cache')
 ## Where to install test files.
-OCTAVE_SET_DEFAULT([octtestsdir], '$(octetcdir)/tests')
+OCTAVE_SET_DEFAULT([octtestsdir], '${octetcdir}/tests')
 ## The full path to the default texi macros file.
-OCTAVE_SET_DEFAULT([texi_macros_file], '$(octetcdir)/macros.texi')
+OCTAVE_SET_DEFAULT([texi_macros_file], '${octetcdir}/macros.texi')
 ## Where Octave will search to find image files.
-OCTAVE_SET_DEFAULT([imagedir], '$(datadir)/octave/$(version)/imagelib')
+OCTAVE_SET_DEFAULT([imagedir], '${datadir}/octave/${version}/imagelib')
 ## Where Octave will search for example data files shipped with distribution.
-OCTAVE_SET_DEFAULT([octdatadir], '$(datadir)/octave/$(version)/data')
+OCTAVE_SET_DEFAULT([octdatadir], '${datadir}/octave/${version}/data')
-OCTAVE_SET_DEFAULT([man1dir], '$(mandir)/man1')
+## Where Octave will look for startup files
+OCTAVE_SET_DEFAULT([startupfiledir], ['${fcnfiledir}/startup'])
+OCTAVE_SET_DEFAULT([localstartupfiledir], ['${localfcnfiledir}/startup'])
+OCTAVE_SET_DEFAULT([man1dir], '${mandir}/man1')
 OCTAVE_SET_DEFAULT([man1ext], '.1')
-OCTAVE_SET_DEFAULT([infofile], '$(infodir)/octave.info')
+OCTAVE_SET_DEFAULT([infofile], '${infodir}/octave.info')
 ### Check for programs used in building, installing, and running Octave.
 ## Programs used in configuring Octave.
 ## Find pkg-config executable (sets $PKG_CONFIG)
 BUILD_CXX="g++"
 BUILD_CXXFLAGS="-O2 -g"
 BUILD_LDFLAGS=""
 BUILD_EXEEXT=""
 else
-BUILD_CC='$(CC)'
+BUILD_CC='${CC}'
-BUILD_CFLAGS='$(CFLAGS)'
+BUILD_CFLAGS='${CFLAGS}'
-BUILD_CXX='$(CXX)'
+BUILD_CXX='${CXX}'
-BUILD_CXXFLAGS='$(CXXFLAGS)'
+BUILD_CXXFLAGS='${CXXFLAGS}'
-BUILD_LDFLAGS='$(LDFLAGS)'
+BUILD_LDFLAGS='${LDFLAGS}'
-BUILD_EXEEXT='$(EXEEXT)'
+BUILD_EXEEXT='${EXEEXT}'
 fi
 AC_ARG_VAR([BUILD_CC],
 [build system C compiler (used if cross compiling)])
 AC_ARG_VAR([BUILD_CFLAGS],
 if test -n "$warn_freetype"; then
 OCTAVE_CONFIGURE_WARNING([warn_freetype])
 else
 FT2_CPPFLAGS="$FT2_CFLAGS"
+## Alias CPPFLAGS to CFLAGS.  This is closer to the true meaning
+## of `pkg-config --cflags` output.
+FT2_CPPFLAGS="$FT2_CFLAGS"
+AC_SUBST(FT2_CPPFLAGS)
 fi
 ## Check for Xft library (when using X11)
 warn_xft=""
 if test -n "$warn_fontconfig"; then
 OCTAVE_CONFIGURE_WARNING([warn_fontconfig])
 else
 FONTCONFIG_CPPFLAGS="$FONTCONFIG_CFLAGS"
+## Alias CPPFLAGS to CFLAGS.  This is closer to the true meaning
+## of `pkg-config --cflags` output.
+FONTCONFIG_CPPFLAGS="$FONTCONFIG_CFLAGS"
+AC_SUBST(FONTCONFIG_CPPFLAGS)
 fi
 ## Check for OSMesa which is needed for offscreen rendering with OpenGL
 ## FIXME: Check for version >= 9.0.0
 OCTAVE_CHECK_LIB(OSMesa, OSMesa,
 [warn_qt_opengl="Qt does not work with the OpenGL libs (GL and GLU); disabling OpenGL graphics with Qt GUI"])
 if test -n "$warn_qt_opengl"; then
 OCTAVE_CONFIGURE_WARNING([warn_qt_opengl])
 fi
-endif
 if test $build_qt_graphics = yes; then
 AC_DEFINE(HAVE_QT_GRAPHICS, 1, [Define to 1 if Qt works with OpenGL libs (GL and GLU)])
 fi
 fi
 if test $enable_shared = yes; then
 SHARED_LIBS=yes
 else
 SHARED_LIBS=no
 fi
+AC_SUBST(SHARED_LIBS)
 if test $enable_static = yes; then
 STATIC_LIBS=yes
 else
 STATIC_LIBS=no
 fi
+AC_SUBST(STATIC_LIBS)
 XTRA_CRUFT_SH_LDFLAGS=
 if test $have_msvc = yes; then
 FLIBS="$FLIBS -lkernel32"
 XTRA_CRUFT_SH_LDFLAGS="-Wl,cruft/cruft.def"
 CPICFLAG=-fPIC
 CXXPICFLAG=-fPIC
 FPICFLAG=-fPIC
 SHLEXT=so
-SHLLIB='$(SHLEXT)'
+SHLLIB='${SHLEXT}'
 SHLBIN=
-SHLEXT_VER='$(SHLEXT).$(version)'
+SHLEXT_VER='${SHLEXT}.${version}'
-SHLLIB_VER='$(SHLLIB).$(version)'
+SHLLIB_VER='${SHLLIB}.${version}'
-SHLBIN_VER='$(SHLBIN).$(version)'
+SHLBIN_VER='${SHLBIN}.${version}'
 SHLLINKEXT=
 LIBPRE=lib
 SHLPRE=lib
 SHLLIBPRE=lib
 SHLBINPRE=lib
-SH_LD='$(CXX)'
+SH_LD='${CXX}'
 SH_LDFLAGS=-shared
-DL_LD='$(SH_LD)'
+DL_LD='${SH_LD}'
-DL_LDFLAGS='$(SH_LDFLAGS)'
+DL_LDFLAGS='${SH_LDFLAGS}'
-MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)'
+MKOCTFILE_DL_LDFLAGS='${DL_LDFLAGS}'
 SONAME_FLAGS=
 NO_OCT_FILE_STRIP=false
-TEMPLATE_AR='$(AR)'
+TEMPLATE_AR='${AR}'
 TEMPLATE_ARFLAGS="$ARFLAGS"
 CRUFT_DLL_DEFS=
 OCTAVE_DLL_DEFS=
 OCTINTERP_DLL_DEFS=
 OCTGUI_DLL_DEFS=
 CXXPICFLAG=
 FPICFLAG=
 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'"
 ;;
 *-*-darwin*)
-DL_LDFLAGS='-bundle -bundle_loader $(top_builddir)/libinterp/octave $(LDFLAGS)'
+DL_LDFLAGS='-bundle -bundle_loader ${top_builddir}/libinterp/octave ${LDFLAGS}'
-MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $(bindir)/octave-$(version)$(EXEEXT)'
+MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader ${bindir}/octave-${version}${EXEEXT}'
-SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)'
+SH_LDFLAGS='-dynamiclib -single_module ${LDFLAGS}'
 case $canonical_host_type in
 powerpc-*)
 CXXPICFLAG=
 CPICFLAG=
 FPICFLAG=
 ;;
 esac
 SHLEXT=dylib
-SHLLIB='$(SHLEXT)'
+SHLLIB='${SHLEXT}'
-SHLEXT_VER='$(version).$(SHLEXT)'
+SHLEXT_VER='${version}.${SHLEXT}'
-SHLLIB_VER='$(version).$(SHLLIB)'
+SHLLIB_VER='${version}.${SHLLIB}'
 NO_OCT_FILE_STRIP=true
-SONAME_FLAGS='-install_name $(octlibdir)/$@'
+SONAME_FLAGS='-install_name ${octlibdir}/$@'
 library_path_var=DYLD_LIBRARY_PATH
 ;;
 *-*-cygwin*)
 CPICFLAG=
 CXXPICFLAG=
 SHLEXT=dll
 SHLLIB=dll.a
 SHLBIN=dll
 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc"
 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
-SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLPRE)%,$(LIBPRE)%,$@).a'
+SONAME_FLAGS='-Wl,--out-implib=$(patsubst ${SHLPRE}%,${LIBPRE}%,$@).a'
 ldpreloadsep=":"
 ;;
 *-*-mingw*)
 if test $have_msvc = yes; then
 DL_LDFLAGS="-shared"
 CXXPICFLAG=-KPIC
 SH_LDFLAGS=-G
 fi
 ## Template closures in archive libraries need a different mechanism.
 if test "$GXX" != yes; then
-TEMPLATE_AR='$(CXX)'
+TEMPLATE_AR='${CXX}'
 TEMPLATE_ARFLAGS="-xar -o"
 fi
 ;;
 esac
 ;;
 esac],
 [link_all_deps=no])
 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes])
+LIBEXT = a
+AC_SUBST(LIBEXT)
 ## Dynamic linking is now enabled only if we are building shared
 ## libs and some API for dynamic linking has been detected.
 ## FIXME: A lot of the following duplicates the functionality of
 ## code generated by the dlopen option for LT_INIT.
-LD_CXX='$(CXX)'
+LD_CXX='${CXX}'
 RDYNAMIC_FLAG=
 DL_API_MSG=""
 dlopen_api=no
 shl_load_api=no
 loadlibrary_api=no
 if test $SHARED_LIBS = yes; then
 LIBOCTINTERP="-loctinterp$SHLLINKEXT"
 LIBOCTAVE="-loctave$SHLLINKEXT"
 else
-LIBOCTINTERP='$(top_builddir)/libinterp/liboctinterp.$(LIBEXT)'
+LIBOCTINTERP='${top_builddir}/libinterp/liboctinterp.${LIBEXT}'
-LIBOCTAVE='$(top_builddir)/liboctave/liboctave.$(LIBEXT)'
+LIBOCTAVE='${top_builddir}/liboctave/liboctave.${LIBEXT}'
 fi
 AC_SUBST(LD_CXX)
 AC_SUBST(RDYNAMIC_FLAG)
 AC_SUBST(ENABLE_DYNAMIC_LINKING)
 AC_SUBST(LIBOCTAVE)
 if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then
 CROSS_TOOL_PREFIX="$ac_tool_prefix"
-MKOCTFILE_AR='$(shell echo $(AR) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+MKOCTFILE_AR='$(shell echo ${AR} | ${SED} "s,${CROSS_TOOL_PREFIX},,")'
-MKOCTFILE_CC='$(shell echo $(CC) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+MKOCTFILE_CC='$(shell echo ${CC} | ${SED} "s,${CROSS_TOOL_PREFIX},,")'
-MKOCTFILE_CXX='$(shell echo $(CXX) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+MKOCTFILE_CXX='$(shell echo ${CXX} | ${SED} "s,${CROSS_TOOL_PREFIX},,")'
-MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+MKOCTFILE_DL_LD='$(shell echo ${DL_LD} | ${SED} "s,${CROSS_TOOL_PREFIX},,")'
-MKOCTFILE_F77='$(shell echo $(F77) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+MKOCTFILE_F77='$(shell echo ${F77} | ${SED} "s,${CROSS_TOOL_PREFIX},,")'
-MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+MKOCTFILE_LD_CXX='$(shell echo ${LD_CXX} | ${SED} "s,${CROSS_TOOL_PREFIX},,")'
-MKOCTFILE_RANLIB='$(shell echo $(RANLIB) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+MKOCTFILE_RANLIB='$(shell echo ${RANLIB} | ${SED} "s,${CROSS_TOOL_PREFIX},,")'
 else
 MKOCTFILE_AR="$AR"
 MKOCTFILE_CC="$CC"
 MKOCTFILE_CXX="$CXX"
 MKOCTFILE_DL_LD="$DL_LD"
 [add extra -fsanitize=address and -fno-omit-frame-pointer options to CFLAGS, CXXFLAGS, and LDFLAGS])],
 [if test "$enableval" = yes; then
 try_address_sanitizer_flags=yes
 fi],
 [])
+if test $try_address_sanitizer_flags = yes; then
+ADDRESS_SANITIZER_OPTIONS="symbolize=1"
+AC_SUBST(ADDRESS_SANITIZER_OPTIONS)
+fi
 AM_CONDITIONAL([AMCOND_ADDRESS_SANITIZER_ENABLED],
 [test $try_address_sanitizer_flags = yes])
 if test $try_address_sanitizer_flags = yes; then
 ### Do the substitutions in all the Makefiles.
 AC_SUBST(ac_config_files)
 AC_SUBST(ac_config_headers)
-dnl We use a .in.h file for oct-conf-post.h simply to copy it to
-dnl the build tree and so that we don't have to add the -I$(top_srcdir)
-dnl to any CPPFLAGS variables.
 AC_CONFIG_FILES([
-oct-conf-post.h:oct-conf-post.in.h
 Makefile
 doc/doxyhtml/Doxyfile
 libgnu/Makefile])
+dnl We use a .in.h file for oct-conf-post.h simply to copy it to
+dnl the build tree and so that we don't have to add the -I${top_srcdir}
+dnl to any CPPFLAGS variables.
+AC_CONFIG_FILES([oct-conf-post.h-tmp:oct-conf-post.in.h])
+AC_CONFIG_COMMANDS([oct-conf-post.h],
+[$SHELL $srcdir/build-aux/move-if-change oct-conf-post.h-tmp oct-conf-post.h])
 OCTAVE_CONFIG_MOVE_IF_CHANGE_FILES([
-libgui/mk-default-qt-settings
+build-aux/mk-mxarray-h.sh
-liboctave/cruft/mkf77def])
+build-aux/mk-version-h.sh
+build-aux/subst-config-vals.sh
+build-aux/subst-cross-config-vals.sh
+build-aux/subst-default-vals.sh
+build-aux/subst-f77-isnan-macro.sh
+build-aux/subst-script-vals.sh
+build-aux/mk-default-qt-settings.sh
+build-aux/mk-f77-def.sh])
 AC_OUTPUT
 ### Print a summary so that important information isn't missed.

Mercurial > octave

comparison configure.ac @ 21398:7e8a410e6124