From e5643b94eb921d8c5d8029c1c5893473f86da068 Mon Sep 17 00:00:00 2001 From: stefan schippers Date: Wed, 13 Nov 2024 01:35:24 +0100 Subject: [PATCH] remove check for libreadline (not used) --- Makefile.conf.in | 4 ++-- config.h.in | 4 ++-- scconfig/hooks.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.conf.in b/Makefile.conf.in index 165c8228..29d1851b 100644 --- a/Makefile.conf.in +++ b/Makefile.conf.in @@ -1,8 +1,8 @@ +# @?libs/tty/readline/cflags@ put /local/xschem/cflags [@ @cc/cflags@ @?libs/sul/libjpeg/cflags@ @?libs/gui/cairo/cflags@ - @?libs/tty/readline/cflags@ @?libs/gui/xrender/cflags@ @?libs/gui/xcb/cflags@ @?libs/gui/xcb_render/cflags@ @@ -12,12 +12,12 @@ put /local/xschem/cflags [@ @libs/script/tcl/cflags@ @] +# @?libs/tty/readline/ldflags@ put /local/xschem/ldflags [@ @cc/ldflags@ -lm @?libs/sul/libjpeg/ldflags@ @?libs/gui/cairo/ldflags@ - @?libs/tty/readline/ldflags@ @?libs/gui/xrender/ldflags@ @?libs/gui/xcb/ldflags@ @?libs/gui/xcb_render/ldflags@ diff --git a/config.h.in b/config.h.in index 9714da81..c63c3268 100644 --- a/config.h.in +++ b/config.h.in @@ -25,8 +25,8 @@ print {\n\n/* Uncomment following line to work around some GPU problems in graph print {/* with tiled fill pattern. Restore of damaged content will use XCopyArea() */\n} print {/* #define FIX_BROKEN_TILED_FILL 1 */} -print {\n\n/* Define this var if libreadline is available and is to be used */\n} -print_ternary ?libs/tty/readline/presents {#define HAS_LIBREADLINE 1} {/*#undef HAS_LIBREADLINE */} +# print {\n\n/* Define this var if libreadline is available and is to be used */\n} +# print_ternary ?libs/tty/readline/presents {#define HAS_LIBREADLINE 1} {/*#undef HAS_LIBREADLINE */} print {\n\n/* Define this var if libjpeg is available and is to be used */\n} print_ternary ?libs/sul/libjpeg/presents {#define HAS_LIBJPEG 1} {/*#undef HAS_LIBJPEG */} diff --git a/scconfig/hooks.c b/scconfig/hooks.c index ab9ba96d..daad383e 100644 --- a/scconfig/hooks.c +++ b/scconfig/hooks.c @@ -309,7 +309,7 @@ int hook_detect_target() require("fstools/awk", 0, 1); require("libs/gui/xpm/*", 0, 1); require("libs/gui/cairo/*", 0, 0); - require("libs/tty/readline/*", 0, 0); + /* require("libs/tty/readline/*", 0, 0); */ require("libs/sul/libjpeg/*", 0, 0); /* require("libs/types/stdint/*", 0, 0); */ require("sys/types/size/4_u_int", 0, 1); @@ -385,7 +385,7 @@ int hook_generate() printf(" tcl: %s\n", get("/target/libs/script/tcl/ldflags")); printf(" tk: %s\n", get("/target/libs/script/tk/ldflags")); printf(" cairo: %s\n", istrue(get("/target/libs/gui/cairo/presents")) ? "yes" : "no"); - printf(" readline: %s\n", istrue(get("/target/libs/tty/readline/presents")) ? "yes" : "no"); + /* printf(" readline: %s\n", istrue(get("/target/libs/tty/readline/presents")) ? "yes" : "no"); */ printf(" libjpeg: %s\n", istrue(get("/target/libs/sul/libjpeg/presents")) ? "yes" : "no"); printf(" xcb: %s\n", istrue(get("/target/libs/gui/xcb/presents")) ? "yes" : "no");