diff options
| -rw-r--r-- | Makefile | 19 | ||||
| -rwxr-xr-x | configure | 220 |
2 files changed, 115 insertions, 124 deletions
@@ -24,12 +24,11 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --include config/config.make +-include config.make VERBOSE := TXR_CFLAGS := $(CFLAGS) -TXR_CFLAGS += -iquote $(conf_dir) \ - -iquote . $(if $(top_srcdir), -iquote $(top_srcdir)) \ +TXR_CFLAGS += -iquote . $(if $(top_srcdir), -iquote $(top_srcdir)) \ $(LANG_FLAGS) $(DIAG_FLAGS) \ $(DBG_FLAGS) $(PLATFORM_CFLAGS) $(EXTRA_FLAGS) TXR_CFLAGS += $(filter-out $(REMOVE_FLAGS),$(TXR_CFLAGS)) @@ -212,14 +211,13 @@ endef -include $(OBJS:.o=.d) $(OBJS:.o=.v) # Add dependencies -$(call DEP,$(OBJS) $(EXTRA_OBJS-y),\ - $(conf_dir)/config.make $(conf_dir)/config.h) +$(call DEP,$(OBJS) $(EXTRA_OBJS-y),config.make config.h) $(eval $(foreach item,lex.yy.o txr.o match.o parser.o,\ $(call DEP,opt/$(item) dbg/$(item),y.tab.h))) $(eval $(foreach item,y.tab.c y.tab.h lex.yy.c,\ - $(call DEP,$(item),$(conf_dir)/config.make $(conf_dir)/config.h))) + $(call DEP,$(item),config.make config.h))) lex.yy.c: $(top_srcdir)parser.l $(call ABBREV,LEX) @@ -277,9 +275,10 @@ rebuild clean repatch: notconfigured distclean: $(V)echo "executing generic cleanup for non-configured directory" - rm -f txr txr.exe txr-dbg txr-dbg.exe y.tab.c lex.yy.c y.tab.h y.output - rm -rf config - rm -rf config.* + rm -f txr txr.exe txr-dbg txr-dbg.exe txr-win.exe txr-win-dbg.exe + rm -rf y.tab.c lex.yy.c y.tab.h y.output + rm -rf config opt dbg + rm -f config.* rm -rf mpi-1.?.? else rebuild: clean repatch $(PROG) @@ -290,7 +289,7 @@ clean: conftest.clean tests.clean rm -rf opt dbg $(EXTRA_OBJS-y) distclean: clean - rm -rf $(conf_dir) + rm -f config.h config.make config.log endif TESTS_TMP := txr.test.out @@ -142,10 +142,6 @@ have_alloca= have_termios= have_winsize= termios_define= -conf_dir=config -config_h=$conf_dir/config.h -config_make=$conf_dir/config.make -config_log=$conf_dir/config.log # # Parse configuration variables @@ -226,7 +222,7 @@ These variables can also influence what features are present in the software, and can determine various defaults for those behaviors which are dynamically configurable when the software is run. -Configuration variables are recorded in a file called $config_make. +Configuration variables are recorded in a file called config.make. This is a GNU makefile, and consequently uses the GNU make syntax. It is included in the main Makefile by an include statement. @@ -250,7 +246,7 @@ No variables are required. The configure script establishes default values for any variables which are needed by the build, but which are not specified on the command line. -After running $0, check that the $config_make contents are sane. +After running $0, check that the config.make contents are sane. The following variables are supported. Note that make variable syntax may be used in paths. Default values are shown in [square brackets]. @@ -267,7 +263,7 @@ install-prefix [$install_prefix] Specifies an extra path prefix that will be prepended to all paths during installation, which allows the software to be installed in a temporary directory for packaging. This variable becomes the \$(DESTDIR) - variable in the $config_make makefile. + variable in the config.make makefile. bindir [$bindir] @@ -287,7 +283,7 @@ mandir [$mandir] cross [$cross] Specifies the root of a cross-compiling toolchain. - This becomes the \$(cross) variable in the $config_make makefile, and by + This becomes the \$(cross) variable in the config.make makefile, and by default will be added as a prefix to all of the toolchain commands. It should include the trailing slash, unless the \$compiler_prefix and \$tool_prefix variables take care of this by providing a leading slash. @@ -310,7 +306,7 @@ cc [$cc] Specifies the name of the toolchain front-end driver command to use for compiling C sources to object files, and for linking object files to - executables. This becomes the TXR_CC variable in $config_make. + executables. This becomes the TXR_CC variable in config.make. intptr [$intptr] @@ -609,8 +605,7 @@ fi gen_config_make() { - mkdir -p $conf_dir - cat > $config_make <<! + cat > config.make <<! # # Make include file automatically generated by $0. # Changes to this file are lost when the above is re-run. @@ -666,8 +661,6 @@ compiler_prefix := $compiler_prefix # prefix for non-compiler toolchain commands tool_prefix := $tool_prefix -conf_dir := $conf_dir - # do we compile in syslog support? have_syslog := $have_syslog @@ -723,7 +716,7 @@ TXR_DBG_OPTS := $txr_dbg_opts # Before doing some other tests, we need a config.make # -printf "Generating %s ... " $config_make +printf "Generating config.make ... " gen_config_make printf "\n" @@ -731,8 +724,7 @@ printf "\n" # Start config.h header # -mkdir -p $conf_dir -cat <<! > $config_h +cat <<! > config.h /* * Header file automatically generated by $0. * Tweaking this file may seem like a good temporary workaround @@ -863,7 +855,7 @@ int $ident(void); int main(void) { return 0; } ! if ! conftest ; then - printf "#define %s txr_%s\n" $ident $ident >> $config_h + printf "#define %s txr_%s\n" $ident $ident >> config.h have_unistd=y fi done @@ -890,7 +882,7 @@ if conftest EXTRA_FLAGS=-Werror ; then else printf "no\n" lang_flags="$lang_flags -U__STRICT_ANSI__" - printf "Regenerating %s ..." $config_make + printf "Regenerating config.make ..." gen_config_make printf "done\n" fi @@ -904,7 +896,7 @@ if [ "$(make conftest.darwin)" = "yes" ] ; then printf "yes\n" need_darwin_c_source=y lang_flags="$lang_flags -D_DARWIN_C_SOURCE" - printf "Regenerating %s ..." $config_make + printf "Regenerating config.make ..." gen_config_make printf "done\n" else @@ -966,7 +958,7 @@ if conftest EXTRA_FLAGS=-Werror ; then printf "absent\n" else printf "present\n" - cat >> $config_h <<! + cat >> config.h <<! $(for x in isalpha isupper islower isdigit isxdigit isalnum isspace \ ispunct isprint isgraph iscntrl isblank ; do \ printf "#undef %s\n" $x ; done) @@ -993,8 +985,8 @@ done if [ -n "$longlong" ] ; then printf '"%s"\n' "$longlong" - printf "#define HAVE_LONGLONG_T 1\n" >> $config_h - printf "typedef $longlong longlong_t;\n" >> $config_h + printf "#define HAVE_LONGLONG_T 1\n" >> config.h + printf "typedef $longlong longlong_t;\n" >> config.h else printf "none\n" fi @@ -1015,8 +1007,8 @@ done if [ -n "$ulonglong" ] ; then printf '"%s"\n' "$ulonglong" - printf "#define HAVE_ULONGLONG_T 1\n" >> $config_h - printf "typedef $ulonglong ulonglong_t;\n" >> $config_h + printf "#define HAVE_ULONGLONG_T 1\n" >> config.h + printf "typedef $ulonglong ulonglong_t;\n" >> config.h else printf "none\n" fi @@ -1057,8 +1049,8 @@ fi if [ -n "$superlong" ] ; then printf '"%s"\n' "$superlong" - printf "#define HAVE_SUPERLONG_T 1\n" >> $config_h - printf "typedef $superlong superlong_t;\n" >> $config_h + printf "#define HAVE_SUPERLONG_T 1\n" >> config.h + printf "typedef $superlong superlong_t;\n" >> config.h else printf "none\n" fi @@ -1088,8 +1080,8 @@ fi if [ -n "$usuperlong" ] ; then printf '"%s"\n' "$usuperlong" - printf "#define HAVE_USUPERLONG_T 1\n" >> $config_h - printf "typedef $usuperlong usuperlong_t;\n" >> $config_h + printf "#define HAVE_USUPERLONG_T 1\n" >> config.h + printf "typedef $usuperlong usuperlong_t;\n" >> config.h else printf "none\n" fi @@ -1116,7 +1108,7 @@ read_syms() SIZEOF* ) eval $(printf "%s=%d\n" "$deferred_sym" "$size") if [ -n "$print_into_config" ] ; then - printf "#define %s %s\n" "$deferred_sym" "$size" >> $config_h + printf "#define %s %s\n" "$deferred_sym" "$size" >> config.h fi ;; esac @@ -1130,7 +1122,7 @@ read_syms() SIZEOF* ) eval $(printf "%s=%d\n" "$symbol" "$size") if [ -n "$print_into_config" ] ; then - printf "#define %s %s\n" "$symbol" "$size" >> $config_h + printf "#define %s %s\n" "$symbol" "$size" >> config.h fi ;; esac @@ -1197,23 +1189,23 @@ char DUMMY; fi printf '"%s"\n' "$intptr" -printf "typedef $intptr int_ptr_t;\n" >> $config_h +printf "typedef $intptr int_ptr_t;\n" >> config.h if [ -n "$uintptr" ] ; then - printf "#define HAVE_UINTPTR_T 1\n" >> $config_h - printf "typedef unsigned $intptr uint_ptr_t;\n" >> $config_h + printf "#define HAVE_UINTPTR_T 1\n" >> config.h + printf "typedef unsigned $intptr uint_ptr_t;\n" >> config.h fi intptr_max_expr="((((convert($intptr, 1) << $((SIZEOF_PTR * 8 - 2))) - 1) << 1) + 1)" -printf "#define INT_PTR_MAX %s\n" "$intptr_max_expr" >> $config_h -printf "#define INT_PTR_MIN (-INT_PTR_MAX)\n" >> $config_h +printf "#define INT_PTR_MAX %s\n" "$intptr_max_expr" >> config.h +printf "#define INT_PTR_MIN (-INT_PTR_MAX)\n" >> config.h if [ -n "$longlong" ] && [ $SIZEOF_LONGLONG_T -eq $(( 2 * SIZEOF_PTR )) ] then - printf "#define HAVE_DOUBLE_INTPTR_T 1\n" >> $config_h - printf "typedef longlong_t double_intptr_t;\n" >> $config_h + printf "#define HAVE_DOUBLE_INTPTR_T 1\n" >> config.h + printf "typedef longlong_t double_intptr_t;\n" >> config.h elif [ -n "$superlong" ] && [ $SIZEOF_SUPERLONG_T -eq $(( 2 * SIZEOF_PTR )) ] then - printf "#define HAVE_DOUBLE_INTPTR_T 1\n" >> $config_h - printf "typedef superlong_t double_intptr_t;\n" >> $config_h + printf "#define HAVE_DOUBLE_INTPTR_T 1\n" >> config.h + printf "typedef superlong_t double_intptr_t;\n" >> config.h fi #if HAVE_LONGLONG_T && @@ -1247,7 +1239,7 @@ if [ -z "$lit_align" ] ; then fi printf "%d\n" "$lit_align" -printf "#define LIT_ALIGN %d\n" "$lit_align" >> $config_h +printf "#define LIT_ALIGN %d\n" "$lit_align" >> config.h # # Inline functions @@ -1287,7 +1279,7 @@ $inline int func(void) fi printf '"%s"\n' "$inline" -printf "#define INLINE $inline\n" >> $config_h +printf "#define INLINE $inline\n" >> config.h # # DBL_DECIMAL_DIG @@ -1310,14 +1302,14 @@ int main(void) ! if conftest ; then printf "yes (%s)\n" $try_sym - printf "#define FLO_MAX_DIG $try_sym\n" >> $config_h + printf "#define FLO_MAX_DIG $try_sym\n" >> config.h have_dbl_decimal_dig=y fi done if ! [ $have_dbl_decimal_dig ] ; then printf "no\n" - printf "#define FLO_MAX_DIG (DBL_DIG + 2)\n" >> $config_h + printf "#define FLO_MAX_DIG (DBL_DIG + 2)\n" >> config.h fi # @@ -1349,7 +1341,7 @@ syntax error fi printf "okay\n" - printf "#define HAVE_VALGRIND 1\n" >> $config_h + printf "#define HAVE_VALGRIND 1\n" >> config.h fi # @@ -1435,7 +1427,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_SYS_WAIT 1\n" >> $config_h + printf "#define HAVE_SYS_WAIT 1\n" >> config.h else printf "no\n" fi @@ -1458,7 +1450,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_SYS_STAT 1\n" >> $config_h + printf "#define HAVE_SYS_STAT 1\n" >> config.h else printf "no\n" fi @@ -1482,7 +1474,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_ENVIRON 1\n" >> $config_h + printf "#define HAVE_ENVIRON 1\n" >> config.h else printf "no\n" fi @@ -1504,7 +1496,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_GETENVIRONMENTSTRINGS 1\n" >> $config_h + printf "#define HAVE_GETENVIRONMENTSTRINGS 1\n" >> config.h have_windows_h=y else printf "no\n" @@ -1538,7 +1530,7 @@ int main(int argc, char **argv) if conftest ; then printf "yes\n" - printf "#define HAVE_FORK_STUFF 1\n" >> $config_h + printf "#define HAVE_FORK_STUFF 1\n" >> config.h have_unistd=y else printf "no\n" @@ -1559,7 +1551,7 @@ int main(int argc, char **argv) if conftest ; then printf "yes\n" - printf "#define HAVE_GETPPID 1\n" >> $config_h + printf "#define HAVE_GETPPID 1\n" >> config.h have_unistd=y else printf "no\n" @@ -1584,7 +1576,7 @@ int main(int argc, char **argv) if conftest ; then printf "yes\n" - printf "#define HAVE_FCNTL_H 1\n" >> $config_h + printf "#define HAVE_FCNTL_H 1\n" >> config.h else printf "no\n" fi @@ -1610,7 +1602,7 @@ int main(int argc, char **argv) if conftest ; then printf "yes\n" - printf "#define HAVE_POLL 1\n" >> $config_h + printf "#define HAVE_POLL 1\n" >> config.h else printf "no\n" fi @@ -1627,8 +1619,8 @@ for try_field in tm_gmtoff __tm_gmtoff ; do int x = sizeof ((struct tm *) 0)->$try_field; ! if conftest_o ; then - printf "#define HAVE_TM_GMTOFF 1\n" >> $config_h - printf "#define TM_GMTOFF %s\n" $try_field >> $config_h + printf "#define HAVE_TM_GMTOFF 1\n" >> config.h + printf "#define TM_GMTOFF %s\n" $try_field >> config.h break fi done @@ -1639,8 +1631,8 @@ for try_field in tm_zone __tm_zone ; do int x = sizeof ((struct tm *) 0)->$try_field; ! if conftest_o ; then - printf "#define HAVE_TM_ZONE 1\n" >> $config_h - printf "#define TM_ZONE %s\n" $try_field >> $config_h + printf "#define HAVE_TM_ZONE 1\n" >> config.h + printf "#define TM_ZONE %s\n" $try_field >> config.h break fi done @@ -1660,7 +1652,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_TIMEGM 1\n" >> $config_h + printf "#define HAVE_TIMEGM 1\n" >> config.h else printf "no\n" fi @@ -1679,7 +1671,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_SETENV 1\n" >> $config_h + printf "#define HAVE_SETENV 1\n" >> config.h else printf "no\n" fi @@ -1696,7 +1688,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_TZSET 1\n" >> $config_h + printf "#define HAVE_TZSET 1\n" >> config.h else printf "no\n" fi @@ -1718,7 +1710,7 @@ int main(int argc, char **argv) ! if conftest ; then printf "yes\n" - printf "#define HAVE_GMTIME_R 1\n" >> $config_h + printf "#define HAVE_GMTIME_R 1\n" >> config.h have_unistd=y else printf "no\n" @@ -1738,7 +1730,7 @@ int main(int argc, char **argv) ! if conftest ; then printf "yes\n" - printf "#define HAVE_STRPTIME 1\n" >> $config_h + printf "#define HAVE_STRPTIME 1\n" >> config.h else printf "no\n" fi @@ -1756,7 +1748,7 @@ int main(int argc, char **argv) ! if conftest ; then printf "yes\n" - printf "#define HAVE_POSIX_SLEEP 1\n" >> $config_h + printf "#define HAVE_POSIX_SLEEP 1\n" >> config.h have_unistd=y else printf "no\n" @@ -1775,7 +1767,7 @@ int main(int argc, char **argv) ! if conftest ; then printf "yes\n" - printf "#define HAVE_POSIX_USLEEP 1\n" >> $config_h + printf "#define HAVE_POSIX_USLEEP 1\n" >> config.h have_unistd=y else printf "no\n" @@ -1795,7 +1787,7 @@ int main(int argc, char **argv) ! if conftest ; then printf "yes\n" - printf "#define HAVE_POSIX_NANOSLEEP 1\n" >> $config_h + printf "#define HAVE_POSIX_NANOSLEEP 1\n" >> config.h have_unistd=y else printf "no\n" @@ -1814,7 +1806,7 @@ int main(int argc, char **argv) ! if conftest ; then printf "yes\n" - printf "#define HAVE_DAEMON 1\n" >> $config_h + printf "#define HAVE_DAEMON 1\n" >> config.h have_unistd=y else printf "no\n" @@ -1833,7 +1825,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_ISATTY 1\n" >> $config_h + printf "#define HAVE_ISATTY 1\n" >> config.h have_unistd=y else printf "no\n" @@ -1855,7 +1847,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_SYSLOG 1\n" >> $config_h + printf "#define HAVE_SYSLOG 1\n" >> config.h have_syslog=y else printf "no\n" @@ -1881,7 +1873,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_POSIX_SIGS 1\n" >> $config_h + printf "#define HAVE_POSIX_SIGS 1\n" >> config.h have_posix_sigs=y else printf "no\n" @@ -1904,7 +1896,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_SIGALTSTACK 1\n" >> $config_h + printf "#define HAVE_SIGALTSTACK 1\n" >> config.h else printf "no\n" fi @@ -1926,7 +1918,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_ITIMER 1\n" >> $config_h + printf "#define HAVE_ITIMER 1\n" >> config.h have_sys_time=y else printf "no\n" @@ -1947,7 +1939,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_MAKEDEV 1\n" >> $config_h + printf "#define HAVE_MAKEDEV 1\n" >> config.h else printf "no\n" fi @@ -1968,7 +1960,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_SYMLINK 1\n" >> $config_h + printf "#define HAVE_SYMLINK 1\n" >> config.h have_unistd=y else printf "no\n" @@ -1991,7 +1983,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_MKDIR 1\n" >> $config_h + printf "#define HAVE_MKDIR 1\n" >> config.h else printf "no\n" fi @@ -2013,7 +2005,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_MKNOD 1\n" >> $config_h + printf "#define HAVE_MKNOD 1\n" >> config.h have_unistd=y else printf "no\n" @@ -2031,7 +2023,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_CHMOD 1\n" >> $config_h + printf "#define HAVE_CHMOD 1\n" >> config.h else printf "no\n" fi @@ -2049,7 +2041,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_PIPE 1\n" >> $config_h + printf "#define HAVE_PIPE 1\n" >> config.h else printf "no\n" fi @@ -2066,7 +2058,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_FTRUNCATE 1\n" >> $config_h + printf "#define HAVE_FTRUNCATE 1\n" >> config.h else printf "no\n" fi @@ -2087,7 +2079,7 @@ int main(int argc, char **argv) ! if conftest ; then printf "yes\n" - printf "#define HAVE_WSPAWN 1\n" >> $config_h + printf "#define HAVE_WSPAWN 1\n" >> config.h else printf "no\n" fi @@ -2104,7 +2096,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_CHSIZE 1\n" >> $config_h + printf "#define HAVE_CHSIZE 1\n" >> config.h else printf "no\n" fi @@ -2123,7 +2115,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_LOG2 1\n" >> $config_h + printf "#define HAVE_LOG2 1\n" >> config.h else printf "no\n" fi @@ -2140,7 +2132,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_ROUND 1\n" >> $config_h + printf "#define HAVE_ROUND 1\n" >> config.h else printf "no\n" fi @@ -2167,7 +2159,7 @@ int main(void) ! if conftest ; then printf "yes\n" - printf "#define HAVE_GLOB 1\n" >> $config_h + printf "#define HAVE_GLOB 1\n" >> config.h have_glob=y else printf "no\n" @@ -2202,7 +2194,7 @@ int main(int argc, char *argv[]) if conftest ; then printf "yes\n" - printf "#define HAVE_FTW 1\n" >> $config_h + printf "#define HAVE_FTW 1\n" >> config.h have_ftw=y else printf "no\n" @@ -2222,7 +2214,7 @@ int main(int argc, char *argv[]) if conftest ; then printf "yes\n" - printf "#define HAVE_FNMATCH 1\n" >> $config_h + printf "#define HAVE_FNMATCH 1\n" >> config.h have_ftw=y else printf "no\n" @@ -2260,7 +2252,7 @@ int main(int argc, char **argv) if conftest ; then printf "yes\n" - printf "#define HAVE_GETEUID 1\n" >> $config_h + printf "#define HAVE_GETEUID 1\n" >> config.h have_unistd=y else printf "no\n" @@ -2286,7 +2278,7 @@ int main(int argc, char **argv) if conftest ; then printf "yes\n" - printf "#define HAVE_SETRESUID 1\n" >> $config_h + printf "#define HAVE_SETRESUID 1\n" >> config.h have_unistd=y else printf "no\n" @@ -2308,11 +2300,11 @@ int main(int argc, char **argv) if conftest ; then printf "yes\n" - printf "#define HAVE_SETGROUPS 1\n" >> $config_h + printf "#define HAVE_SETGROUPS 1\n" >> config.h have_unistd=y elif conftest EXTRA_FLAGS=-D__EXTENSIONS__=1 ; then printf "yes\n" - printf "#define HAVE_SETGROUPS 1\n" >> $config_h + printf "#define HAVE_SETGROUPS 1\n" >> config.h lang_flags="$lang_flags -D__EXTENSIONS__=1" # Solaris buggery have_unistd=y else @@ -2338,7 +2330,7 @@ int main(void) if conftest ; then printf "yes\n" - printf "#define HAVE_PWUID 1\n" >> $config_h + printf "#define HAVE_PWUID 1\n" >> config.h have_pwuid=y else printf "no\n" @@ -2365,7 +2357,7 @@ int main(void) if conftest ; then printf "yes\n" - printf "#define HAVE_PWUID_R 1\n" >> $config_h + printf "#define HAVE_PWUID_R 1\n" >> config.h else printf "no\n" fi @@ -2390,7 +2382,7 @@ int main(void) if conftest ; then printf "yes\n" - printf "#define HAVE_GRGID 1\n" >> $config_h + printf "#define HAVE_GRGID 1\n" >> config.h have_grgid=y else printf "no\n" @@ -2416,7 +2408,7 @@ int main(void) if conftest ; then printf "yes\n" - printf "#define HAVE_GRGID_R 1\n" >> $config_h + printf "#define HAVE_GRGID_R 1\n" >> config.h else printf "no\n" fi @@ -2441,7 +2433,7 @@ for try_lcrypt in "" "-lcrypt" "no" ; do fi if conftest EXTRA_LDFLAGS=$try_lcrypt; then printf "yes\n" - printf "#define HAVE_CRYPT 1\n" >> $config_h + printf "#define HAVE_CRYPT 1\n" >> config.h if [ -n "$try_lcrypt" ] ; then conf_ldflags="${conf_ldflags:+"$conf_ldflags "}-lcrypt" fi @@ -2464,8 +2456,8 @@ int main(int argc, char **argv) if conftest ; then printf "yes\n" - printf "#define HAVE_ALLOCA 1\n" >> $config_h - printf "#define ALLOCA_H <%s>\n" $try_header >> $config_h + printf "#define HAVE_ALLOCA 1\n" >> config.h + printf "#define ALLOCA_H <%s>\n" $try_header >> config.h have_alloca=y break; fi @@ -2491,7 +2483,7 @@ int main(int argc, char **argv) if conftest ; then printf "yes\n" - printf "#define HAVE_TERMIOS 1\n" >> $config_h + printf "#define HAVE_TERMIOS 1\n" >> config.h have_termios=y else printf "no\n" @@ -2513,7 +2505,7 @@ int main(int argc, char **argv) ! if conftest ; then printf "yes\n" - printf "#define HAVE_WINSIZE 1\n" >> $config_h + printf "#define HAVE_WINSIZE 1\n" >> config.h have_winsize=y break; fi @@ -2538,7 +2530,7 @@ int main(int argc, char **argv) if conftest ; then printf "yes\n" - printf "#define HAVE_MKSTEMPS 1\n" >> $config_h + printf "#define HAVE_MKSTEMPS 1\n" >> config.h else printf "no\n" fi @@ -2576,10 +2568,10 @@ int main(int argc, char **argv) if conftest ; then printf "yes\n" - printf "#define HAVE_FSEEKO 1\n" >> $config_h + printf "#define HAVE_FSEEKO 1\n" >> config.h elif conftest EXTRA_FLAGS=-D_LARGEFILE_SOURCE ; then printf "yes\n" - printf "#define HAVE_FSEEKO 1\n" >> $config_h + printf "#define HAVE_FSEEKO 1\n" >> config.h lang_flags="$lang_flags -D_LARGEFILE_SOURCE" else printf "no\n" @@ -2666,14 +2658,14 @@ int main(int argc, char **argv) if conftest ; then printf "yes\n" - printf "#define HAVE_SOCKETS 1\n" >> $config_h + printf "#define HAVE_SOCKETS 1\n" >> config.h have_sockets=y elif conftest EXTRA_LDFLAGS="-lsocket -lnsl" ; then printf "yes\n" - printf "#define HAVE_SOCKETS 1\n" >> $config_h + printf "#define HAVE_SOCKETS 1\n" >> config.h have_sockets=y conf_ldflags="${conf_ldflags:+"$conf_ldflags "}-lsocket -lnsl" - printf "Need libs for sockets: regenerating %s ..." $config_make + printf "Need libs for sockets: regenerating config.make ..." gen_config_make printf "done\n" else @@ -2700,7 +2692,7 @@ int main(void) if conftest ; then printf "yes\n" - printf "#define HAVE_GETADDRINFO 1\n" >> $config_h + printf "#define HAVE_GETADDRINFO 1\n" >> config.h else printf "no\n" fi @@ -2724,7 +2716,7 @@ int main(void) if conftest ; then printf "yes\n" - printf "#define HAVE_UNAME 1\n" >> $config_h + printf "#define HAVE_UNAME 1\n" >> config.h else printf "no\n" fi @@ -2746,7 +2738,7 @@ int main(void) if conftest ; then printf "yes\n" - printf "#define HAVE_UTSNAME_DOMAINNAME 1\n" >> $config_h + printf "#define HAVE_UTSNAME_DOMAINNAME 1\n" >> config.h else printf "no\n" fi @@ -2756,15 +2748,15 @@ fi # if [ -n "$have_unistd" ] ; then - printf "#define HAVE_UNISTD_H 1\n" >> $config_h + printf "#define HAVE_UNISTD_H 1\n" >> config.h fi if [ -n "$have_sys_time" ] ; then - printf "#define HAVE_SYS_TIME 1\n" >> $config_h + printf "#define HAVE_SYS_TIME 1\n" >> config.h fi if [ -n "$have_windows_h" ] ; then - printf "#define HAVE_WINDOWS_H 1\n" >> $config_h + printf "#define HAVE_WINDOWS_H 1\n" >> config.h fi # @@ -2773,7 +2765,7 @@ fi if [ -n "$extra_debugging" ] ; then printf "Configuring extra debugging, as requested ...\n" - printf "#define CONFIG_EXTRA_DEBUGGING 1\n" >> $config_h + printf "#define CONFIG_EXTRA_DEBUGGING 1\n" >> config.h fi # @@ -2786,21 +2778,21 @@ $make conftest.clean # Some final blurbs into config.h # -[ -n "$debug_support" ] && printf "#define CONFIG_DEBUG_SUPPORT 1\n" >> $config_h -[ -n "$gen_gc" ] && printf "#define CONFIG_GEN_GC 1\n" >> $config_h +[ -n "$debug_support" ] && printf "#define CONFIG_DEBUG_SUPPORT 1\n" >> config.h +[ -n "$gen_gc" ] && printf "#define CONFIG_GEN_GC 1\n" >> config.h # # Regenerate config.make # -printf "Regenerating %s ... " $config_make +printf "Regenerating config.make ... " gen_config_make printf "done\n" # # Save configuration in config.log # -cat > $config_log <<! +cat > config.log <<! Configured on $(date) using |