diff options
| -rw-r--r-- | aclocal.m4 | 3 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | distrib/configure.ac.in | 4 | ||||
| -rw-r--r-- | settings.in | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 1c89e0d02a..8f9f4c30a7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -359,6 +359,7 @@ AC_DEFUN([FP_SETTINGS], then SettingsCCompilerCommand='$topdir/../mingw/bin/gcc.exe' SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 $CONF_GCC_LINKER_OPTS_STAGE2" + SettingsArCommand='$topdir/../mingw/bin/ar.exe' SettingsPerlCommand='$topdir/../perl/perl.exe' SettingsDllWrapCommand='$topdir/../mingw/bin/dllwrap.exe' SettingsWindresCommand='$topdir/../mingw/bin/windres.exe' @@ -366,6 +367,7 @@ AC_DEFUN([FP_SETTINGS], else SettingsCCompilerCommand="$WhatGccIsCalled" SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 $CONF_GCC_LINKER_OPTS_STAGE2" + SettingsArCommand="$ArCmd" SettingsPerlCommand="$PerlCmd" SettingsDllWrapCommand="/bin/false" SettingsWindresCommand="/bin/false" @@ -385,6 +387,7 @@ AC_DEFUN([FP_SETTINGS], fi AC_SUBST(SettingsCCompilerCommand) AC_SUBST(SettingsCCompilerFlags) + AC_SUBST(SettingsArCommand) AC_SUBST(SettingsPerlCommand) AC_SUBST(SettingsDllWrapCommand) AC_SUBST(SettingsWindresCommand) diff --git a/configure.ac b/configure.ac index 252f077303..bf7e84895a 100644 --- a/configure.ac +++ b/configure.ac @@ -466,8 +466,6 @@ dnl May need to use gcc to find platform details. dnl -------------------------------------------------------------- FPTOOLS_SET_HASKELL_PLATFORM_VARS -FP_SETTINGS - dnl ** figure out how to do context diffs FP_PROG_CONTEXT_DIFF @@ -487,6 +485,7 @@ FP_PROG_AR_NEEDS_RANLIB dnl ** Check to see whether ln -s works AC_PROG_LN_S +FP_SETTINGS dnl ** Find the path to sed AC_PATH_PROGS(SedCmd,gsed sed,sed) diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in index 458f5f433f..0037ff1ce8 100644 --- a/distrib/configure.ac.in +++ b/distrib/configure.ac.in @@ -88,8 +88,6 @@ dnl May need to use gcc to find platform details. dnl -------------------------------------------------------------- FPTOOLS_SET_HASKELL_PLATFORM_VARS -FP_SETTINGS - dnl WordSize for settings.in AC_CHECK_SIZEOF(void *, 4) WordSize=$ac_cv_sizeof_void_p @@ -100,6 +98,8 @@ dnl ** how to invoke `ar' and `ranlib' # FP_PROG_AR_NEEDS_RANLIB +FP_SETTINGS + # AC_CONFIG_FILES(settings mk/config.mk mk/install.mk) AC_OUTPUT diff --git a/settings.in b/settings.in index 02e1e0eaa0..80741ab2d3 100644 --- a/settings.in +++ b/settings.in @@ -1,7 +1,7 @@ [("GCC extra via C opts", "@GccExtraViaCOpts@"), ("C compiler command", "@SettingsCCompilerCommand@"), ("C compiler flags", "@SettingsCCompilerFlags@"), - ("ar command", "@ArCmd@"), + ("ar command", "@SettingsArCommand@"), ("ar flags", "@ArArgs@"), ("ar supports at file", "@ArSupportsAtFile@"), ("touch command", "@SettingsTouchCommand@"), |