Commit Graph

7 Commits

Author SHA1 Message Date
Darryl L. Miles 0a3b61dbdd build: fix bundled-readline out-of-tree (unblocks the non-Tcl build)
The non-Tcl ("standard") configuration links the bundled GNU readline,
and that path was broken two ways:

* headers: readline's own headers use <readline/*.h> includes, so the
  readline source's parent must be on the include path.  Nothing added
  it, so every module including readline (commands, textio, ...) failed
  with "readline/rlstdc.h: No such file".  Add -I${MAGICSRC}/readline to
  CPPFLAGS for the bundled build only (@MAKE_READLINE@ = 1).

* library: readline/Makefile ran "../readline/configure" from the
  build-readline dir -- a source-relative path that, out-of-tree, points
  into the (empty) build tree.  Use ${MAGICSRC}/readline/readline/
  configure so the out-of-source readline build finds its sources.

Verified: `mkdir b; cd b; ../configure --without-tcl && make` now
completes (rc=0) and produces the native magic binary; previously it
died at commands/CmdFI.o (headers) then at the readline library build.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-26 14:54:11 -04:00
Darryl L. Miles 8b0616eaf5 readline: add configure --enable-readline-bundled option
Cleanup autoconf handling, should always work as expected.
Use of --enable-readline-bundled when readline is needed will use
copy in subdir.
2025-10-04 20:50:31 -04:00
Darryl L. Miles dbdec3aa17 readline/Makefile: lib target (for no-tktcl build option) 2025-10-04 20:50:31 -04:00
Darryl L. Miles 3e5502b936 readline/Makefile: clean fix to unwanted error message 2025-08-01 10:55:50 -04:00
Darryl L. Miles acefe4811f readline/Makefile: move up before with no scheme
rename symlink(s) use phony targets, delegate the symlink creation
management command sequence to a single point in the project inside
the readline/Makefile
2025-07-29 10:50:31 -04:00
Tim Edwards 1cec414618 Added the contents of the "readline" module back. This is
generally unused, as it is incompatible with the Tcl/Tk build of
magic.  However, I had not intended to remove it, only move the
name from "readline-4.3" to "readline".  But "readline/readline"
was in .gitignore, which caused the contents to be removed from
the repository.  This commit restores those files, and also
prevents the readline directory Makefile from making a symbolic
link called "readline" to itself, which was causing compile-time
issues.  The readline code is only kept for backwards compatibility
with ancient versions of magic not using the Tcl/Tk interpreter.
2025-01-10 09:58:57 -05:00
Tim Edwards 231a299b16 Initial commit at Tue Apr 25 08:41:48 EDT 2017 by tim on stravinsky 2017-04-25 08:41:48 -04:00