From c96105ad786a73e6a7c03cd571f44469e1f270bc Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Wed, 28 Feb 2024 14:18:15 -0700 Subject: [PATCH 01/12] curses detection and linking for CMake builds --- experimental/CMakeLists.txt | 8 ++++++++ experimental/cmake/sst.cmake | 4 ++++ experimental/cmake_configure_files/sst_config.h.in | 3 +++ src/sst/core/CMakeLists.txt | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/experimental/CMakeLists.txt b/experimental/CMakeLists.txt index 3a99d7dad..652101be3 100644 --- a/experimental/CMakeLists.txt +++ b/experimental/CMakeLists.txt @@ -55,6 +55,14 @@ if(NOT SST_DISABLE_ZLIB) find_package(ZLIB) endif() +option(SST_DISABLE_CURSES "Use curses library (needed for interactive sst-info)" OFF) +if(NOT SST_DISABLE_CURSES) + find_package(Curses) + if(NOT CURSES_HAVE_NCURSES_H) + message(FATAL_ERROR "Curses was found, but the specific header was not") + endif() +endif() + option(SST_ENABLE_HDF5 "Use HDF5 library" OFF) if(SST_ENABLE_HDF5) find_package(HDF5 REQUIRED) diff --git a/experimental/cmake/sst.cmake b/experimental/cmake/sst.cmake index 4e288e2d7..81a964a7c 100644 --- a/experimental/cmake/sst.cmake +++ b/experimental/cmake/sst.cmake @@ -42,6 +42,10 @@ if(ZLIB_FOUND) set(HAVE_LIBZ ON) endif(ZLIB_FOUND) +if(CURSES_FOUND) + set(HAVE_CURSES ON) +endif(CURSES_FOUND) + check_include_file(execinfo.h HAVE_EXECINFO_H) check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE) check_include_file(mach/mach_time.h HAVE_MACH_MACH_TIME_H) diff --git a/experimental/cmake_configure_files/sst_config.h.in b/experimental/cmake_configure_files/sst_config.h.in index e9d2804c4..5ffd2c896 100644 --- a/experimental/cmake_configure_files/sst_config.h.in +++ b/experimental/cmake_configure_files/sst_config.h.in @@ -35,6 +35,9 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_C_ASM_H 1 +/* Defines whether we have the curses library */ +#cmakedefine HAVE_CURSES 1 + /* Define to 1 if you have the declaration of `cygwin_conv_path', and to 0 if you don't. */ #cmakedefine HAVE_DECL_CYGWIN_CONV_PATH 1 diff --git a/src/sst/core/CMakeLists.txt b/src/sst/core/CMakeLists.txt index 8334557f3..6063b7683 100644 --- a/src/sst/core/CMakeLists.txt +++ b/src/sst/core/CMakeLists.txt @@ -243,6 +243,11 @@ if(Threads_FOUND) target_link_libraries(sstsim.x PRIVATE Threads::Threads) endif() +if(CURSES_FOUND) + target_link_libraries(sstinfo.x PRIVATE ${CURSES_LIBRARIES}) + target_include_directories(sstinfo.x PRIVATE ${CURSES_INCLUDE_DIRS}) +endif() + add_executable(sst bootsst.cc) target_link_libraries(sst PRIVATE sst-boot-lib sst-env-lib sst-config-lib) From e90c0af6338fcaf25dc24c7e83199355247875a7 Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Wed, 28 Feb 2024 14:24:36 -0700 Subject: [PATCH 02/12] fix autotools detection of correct curses header --- config/sst_check_curses.m4 | 4 ++-- configure.ac | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/sst_check_curses.m4 b/config/sst_check_curses.m4 index 01e58433a..1db540612 100644 --- a/config/sst_check_curses.m4 +++ b/config/sst_check_curses.m4 @@ -23,9 +23,9 @@ AC_DEFUN([SST_CHECK_CURSES], CURSES_CPPFLAGS_LDFLAGS= CURSES_LIBS=])]) -dnl Check for curses.h header +dnl Check for header AC_LANG_PUSH([C++]) - AC_CHECK_HEADER([curses.h], [], [sst_check_curses_happy="no"]) + AC_CHECK_HEADER([ncurses.h], [], [sst_check_curses_happy="no"]) AC_LANG_POP([C++]) dnl Check that library is usable diff --git a/configure.ac b/configure.ac index 496d957b3..9eaad92a6 100644 --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,6 @@ SST_CHECK_MPI([], [AC_MSG_ERROR([Could not find MPI package])]) SST_CHECK_PYTHON([], [AC_MSG_ERROR([Could not find Python, this is required for SST to build])]) SST_CHECK_LIBZ([have_zlib="yes"],[have_zlib="no"],[AC_MSG_ERROR([zlib was requested but could not be found.])]) SST_CHECK_CURSES() -dnl AC_MSG_ERROR([Could not find curses, this is required for utility sst-info to build])]) SST_CHECK_BACKTRACE() SST_CHECK_HDF5() SST_CHECK_MEM_POOL() From 120c90e8902ede18b6bb26fec1004c0532788c0b Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Mon, 4 Mar 2024 14:16:23 -0700 Subject: [PATCH 03/12] typo: CURSES_CFPPLAGS -> CURSES_CPPFLAGS --- src/sst/core/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sst/core/Makefile.am b/src/sst/core/Makefile.am index 5e89af571..6fab1b58b 100644 --- a/src/sst/core/Makefile.am +++ b/src/sst/core/Makefile.am @@ -342,7 +342,7 @@ sstinfo_x_LDADD += $(LIBZ_LIBS) endif if USE_CURSES -AM_CPPFLAGS += $(CURSES_CFPPLAGS) +AM_CPPFLAGS += $(CURSES_CPPFLAGS) sstinfo_x_LDADD += $(CURSES_LIBS) sstinfo_x_LDFLAGS += $(CURSES_LDFLAGS) endif From b61d2bfc28faeb371b0d063a4146436baca902f0 Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Tue, 5 Mar 2024 11:24:12 -0700 Subject: [PATCH 04/12] fix linking against curses dependencies in CMake build --- experimental/CMakeLists.txt | 2 ++ src/sst/core/CMakeLists.txt | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/experimental/CMakeLists.txt b/experimental/CMakeLists.txt index 652101be3..561819745 100644 --- a/experimental/CMakeLists.txt +++ b/experimental/CMakeLists.txt @@ -57,6 +57,8 @@ endif() option(SST_DISABLE_CURSES "Use curses library (needed for interactive sst-info)" OFF) if(NOT SST_DISABLE_CURSES) + # https://gitlab.kitware.com/cmake/cmake/-/issues/23236 + set(CURSES_NEED_NCURSES 1) find_package(Curses) if(NOT CURSES_HAVE_NCURSES_H) message(FATAL_ERROR "Curses was found, but the specific header was not") diff --git a/src/sst/core/CMakeLists.txt b/src/sst/core/CMakeLists.txt index 6063b7683..ebda624d7 100644 --- a/src/sst/core/CMakeLists.txt +++ b/src/sst/core/CMakeLists.txt @@ -245,7 +245,9 @@ endif() if(CURSES_FOUND) target_link_libraries(sstinfo.x PRIVATE ${CURSES_LIBRARIES}) - target_include_directories(sstinfo.x PRIVATE ${CURSES_INCLUDE_DIRS}) + # Before means no chance of interfering with a system curses if a + # user-provided one was specified. + target_include_directories(sstinfo.x BEFORE PRIVATE ${CURSES_INCLUDE_DIRS}) endif() add_executable(sst bootsst.cc) From 972d028071b821adfb3b271b9e09be79458173c8 Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Tue, 5 Mar 2024 11:35:46 -0700 Subject: [PATCH 05/12] curses detection in autotools now uses ncurses6-config --- config/sst_check_curses.m4 | 47 +++++++++++++++++++++----------------- configure.ac | 5 ++-- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/config/sst_check_curses.m4 b/config/sst_check_curses.m4 index 1db540612..8e069def4 100644 --- a/config/sst_check_curses.m4 +++ b/config/sst_check_curses.m4 @@ -3,38 +3,43 @@ AC_DEFUN([SST_CHECK_CURSES], sst_check_curses_happy="yes" AC_ARG_WITH([curses], - [AS_HELP_STRING([--with-ncurses@<:@=DIR@:>@], - [Use ncurses library found in DIR])]) + [AS_HELP_STRING([--with-ncurses@<:@=DIR or EXEC@:>@], + [Use ncurses library found in DIR or associated with the ncurses6-config utility specified by EXEC])]) AS_IF([test "$with_curses" = "no"], [sst_check_curses_happy="no"]) + NCURSES_CONFIG_EXE="no" + + dnl check if user provided a specific ncurses6-config + AS_IF([test ! -d "$with_curses"], + [AS_IF([test -x "$with_curses"], + [NCURSES_CONFIG_EXE=$with_curses])]) + + dnl test ncurses6-config + AS_IF([test $NCURSES_CONFIG_EXE = "no"], + [AS_IF([test -n "$with_curses"], + [AC_PATH_PROGS([NCURSES_CONFIG_EXE], ["ncurses6-config"], ["no"], ["$with_curses/bin"])], + [AC_PATH_PROGS([NCURSES_CONFIG_EXE], ["ncurses6-config"], ["no"])])]) + + dnl error if ncurses6-config can't be found rather than look for the + dnl specific libraries + AC_MSG_CHECKING([ncurses6-config exists]) + AC_MSG_RESULT([$NCURSES_CONFIG_EXE]) + AS_IF([test $CURSES_CONFIG_EXE = "no"], + [AC_MSG_ERROR([Unable to locate ncurses6-config utility])]) + + CURSES_CPPFLAGS=`$NCURSES_CONFIG_EXE --cflags` + CURSES_LDFLAGS=`$NCURSES_CONFIG_EXE --libs-only-L` + CURSES_LIBS=`$NCURSES_CONFIG_EXE --libs-only-l` + CPPFLAGS_saved="$CPPFLAGS" LDFLAGS_saved="$LDFLAGS" - dnl Use user-defined curses library - AS_IF([test "$sst_check_curses_happy" = "yes"], [ - AS_IF([test ! -z "$with_curses" -a "$with_curses" != "yes"], - [CURSES_CPPFLAGS="-I$with_curses/include" - CPPFLAGS="$CURSES_CPPFLAGS $CPPFLAGS" - CURSES_LDFLAGS="-L$with_curses/lib" - CURSES_LIBS="-lncurses", - LDFLAGS="$CURSES_LDFLAGS $LDFLAGS"], - [CURSES_CPPFLAGS= - CURSES_CPPFLAGS_LDFLAGS= - CURSES_LIBS=])]) - dnl Check for header AC_LANG_PUSH([C++]) AC_CHECK_HEADER([ncurses.h], [], [sst_check_curses_happy="no"]) AC_LANG_POP([C++]) -dnl Check that library is usable -AS_IF([test "$sst_check_curses_happy" != "no"], - [AC_CHECK_LIB([ncursesw], [wprintw], [CURSES_LIBS="-lncursesw"], - [AC_CHECK_LIB([ncurses], [wprintw], [CURSES_LIBS="-lncurses"], - [AC_CHECK_LIB([curses], [wprintw], [CURSES_LIBS="-lcurses"], [sst_check_curses_happy = "no"])])]) - ]) - CPPFLAGS="$CPPFLAGS_saved" LDFLAGS="$LDFLAGS_saved" diff --git a/configure.ac b/configure.ac index 9eaad92a6..317775f16 100644 --- a/configure.ac +++ b/configure.ac @@ -227,6 +227,7 @@ echo "Configuration Information (Dependencies):" echo "" printf "%38s : %s (%s)\n" "Found Python" "$PYTHON_EXE" "$PYTHON_VERSION" + if test "x$sst_check_hdf5_happy" = "xyes" ; then printf "%38s : Yes\n" "HDF5 Support" else @@ -239,9 +240,9 @@ else fi if test "x$sst_check_curses_happy" = "xyes" ; then - printf "%38s : Yes\n" "curses library" + printf "%38s : %s %s\n" "curses library" "$CURSES_LDFLAGS" "$CURSES_LIBS" else - printf "%38s : No\n" "curses library" + printf "%38s : Not found\n" "curses library" fi echo "-------------------------------------------------------" From 4f6fda3de59e2448817abaa4ee7d650c44bac1f6 Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Tue, 5 Mar 2024 11:49:09 -0700 Subject: [PATCH 06/12] silence _XOPEN_SOURCE redefinition at source level --- src/sst/core/main.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/sst/core/main.cc b/src/sst/core/main.cc index 9c4d14b31..a2d85877d 100644 --- a/src/sst/core/main.cc +++ b/src/sst/core/main.cc @@ -14,6 +14,11 @@ #include "sst/core/warnmacros.h" DISABLE_WARN_DEPRECATED_REGISTER +// The Python header already defines this and should override one from the +// command line. +#ifdef _XOPEN_SOURCE +#undef _XOPEN_SOURCE +#endif #include REENABLE_WARNING From e474d19fe7d6e830be712ff6afe7f5299108117a Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Tue, 5 Mar 2024 13:24:40 -0700 Subject: [PATCH 07/12] fix variable name --- config/sst_check_curses.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sst_check_curses.m4 b/config/sst_check_curses.m4 index 8e069def4..7d18a3b5c 100644 --- a/config/sst_check_curses.m4 +++ b/config/sst_check_curses.m4 @@ -25,7 +25,7 @@ AC_DEFUN([SST_CHECK_CURSES], dnl specific libraries AC_MSG_CHECKING([ncurses6-config exists]) AC_MSG_RESULT([$NCURSES_CONFIG_EXE]) - AS_IF([test $CURSES_CONFIG_EXE = "no"], + AS_IF([test $NCURSES_CONFIG_EXE = "no"], [AC_MSG_ERROR([Unable to locate ncurses6-config utility])]) CURSES_CPPFLAGS=`$NCURSES_CONFIG_EXE --cflags` From 5d0b9288d6f730627abe4767264329f32a781164 Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Tue, 5 Mar 2024 14:21:15 -0700 Subject: [PATCH 08/12] cmake-format --- experimental/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/experimental/CMakeLists.txt b/experimental/CMakeLists.txt index 561819745..46b7e6b30 100644 --- a/experimental/CMakeLists.txt +++ b/experimental/CMakeLists.txt @@ -55,13 +55,16 @@ if(NOT SST_DISABLE_ZLIB) find_package(ZLIB) endif() -option(SST_DISABLE_CURSES "Use curses library (needed for interactive sst-info)" OFF) +option(SST_DISABLE_CURSES + "Use curses library (needed for interactive sst-info)" OFF) if(NOT SST_DISABLE_CURSES) # https://gitlab.kitware.com/cmake/cmake/-/issues/23236 set(CURSES_NEED_NCURSES 1) find_package(Curses) if(NOT CURSES_HAVE_NCURSES_H) - message(FATAL_ERROR "Curses was found, but the specific header was not") + message( + FATAL_ERROR + "Curses was found, but the specific header was not") endif() endif() From ef5993babaa0fff2a33030bc01374a5ba2ee066e Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Wed, 6 Mar 2024 13:53:00 -0700 Subject: [PATCH 09/12] update autotools usage of older ncurses --- config/sst_check_curses.m4 | 9 ++++++--- src/sst/core/Makefile.am | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/sst_check_curses.m4 b/config/sst_check_curses.m4 index 7d18a3b5c..8f398ac90 100644 --- a/config/sst_check_curses.m4 +++ b/config/sst_check_curses.m4 @@ -28,9 +28,13 @@ AC_DEFUN([SST_CHECK_CURSES], AS_IF([test $NCURSES_CONFIG_EXE = "no"], [AC_MSG_ERROR([Unable to locate ncurses6-config utility])]) + dnl Older versions only have --libs, not --libs-only-l and --libs-only-L, + dnl which combines the two. Ideally, CURSES_LDFLAGS (sstinfo_x_LDFLAGS) + dnl contains --libs-only-L and CURSES_LIBS (sstinfo_x_LDADD) contains + dnl --libs-only-l, but rather than complicated logic testing the above, + dnl combining everything into LDADD seems acceptable.. CURSES_CPPFLAGS=`$NCURSES_CONFIG_EXE --cflags` - CURSES_LDFLAGS=`$NCURSES_CONFIG_EXE --libs-only-L` - CURSES_LIBS=`$NCURSES_CONFIG_EXE --libs-only-l` + CURSES_LIBS=`$NCURSES_CONFIG_EXE --libs` CPPFLAGS_saved="$CPPFLAGS" LDFLAGS_saved="$LDFLAGS" @@ -44,7 +48,6 @@ dnl Check for header LDFLAGS="$LDFLAGS_saved" AC_SUBST([CURSES_CPPFLAGS]) - AC_SUBST([CURSES_LDFLAGS]) AC_SUBST([CURSES_LIBS]) AS_IF([test "x$sst_check_curses_happy" = "xyes"], [AC_DEFINE([HAVE_CURSES], [1], [Defines whether we have the curses library])]) AM_CONDITIONAL([USE_CURSES], [test "x$sst_check_curses_happy" = "xyes"]) diff --git a/src/sst/core/Makefile.am b/src/sst/core/Makefile.am index 6fab1b58b..e914b2130 100644 --- a/src/sst/core/Makefile.am +++ b/src/sst/core/Makefile.am @@ -344,7 +344,6 @@ endif if USE_CURSES AM_CPPFLAGS += $(CURSES_CPPFLAGS) sstinfo_x_LDADD += $(CURSES_LIBS) -sstinfo_x_LDFLAGS += $(CURSES_LDFLAGS) endif if USE_HDF5 From 5ff2e32fbd99c8f69f0c9de8c3bcf7ce760bb4a4 Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Wed, 6 Mar 2024 13:55:36 -0700 Subject: [PATCH 10/12] clean up printing of curses link line --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 317775f16..4d2264ceb 100644 --- a/configure.ac +++ b/configure.ac @@ -240,7 +240,7 @@ else fi if test "x$sst_check_curses_happy" = "xyes" ; then - printf "%38s : %s %s\n" "curses library" "$CURSES_LDFLAGS" "$CURSES_LIBS" + printf "%38s : %s %s\n" "curses library" "$CURSES_LIBS" else printf "%38s : Not found\n" "curses library" fi From 1c67b790da81408bec89ab0c21d113b6332514ff Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Fri, 8 Mar 2024 16:09:29 -0700 Subject: [PATCH 11/12] ncurses6-config, ncurses5.4-config, ncurses5-config, ... --- config/sst_check_curses.m4 | 63 ++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/config/sst_check_curses.m4 b/config/sst_check_curses.m4 index 8f398ac90..dc2cd62e1 100644 --- a/config/sst_check_curses.m4 +++ b/config/sst_check_curses.m4 @@ -4,48 +4,59 @@ AC_DEFUN([SST_CHECK_CURSES], AC_ARG_WITH([curses], [AS_HELP_STRING([--with-ncurses@<:@=DIR or EXEC@:>@], - [Use ncurses library found in DIR or associated with the ncurses6-config utility specified by EXEC])]) + [Use ncurses library found in DIR or associated with the ncursesN-config utility specified by EXEC])]) AS_IF([test "$with_curses" = "no"], [sst_check_curses_happy="no"]) NCURSES_CONFIG_EXE="no" - dnl check if user provided a specific ncurses6-config + dnl check if user provided a specific ncursesN-config AS_IF([test ! -d "$with_curses"], [AS_IF([test -x "$with_curses"], [NCURSES_CONFIG_EXE=$with_curses])]) - dnl test ncurses6-config + dnl test ncursesN-config + AS_IF([test $NCURSES_CONFIG_EXE = "no"], + [AS_IF([test -n "$with_curses"], + [AC_PATH_PROGS([NCURSES_CONFIG_EXE], ["ncurses6-config" "ncurses5.4-config" "ncurses5-config"], ["no"], ["$with_curses/bin"])], + [AC_PATH_PROGS([NCURSES_CONFIG_EXE], ["ncurses6-config" "ncurses5.4-config" "ncurses5-config"], ["no"])])]) AS_IF([test $NCURSES_CONFIG_EXE = "no"], [AS_IF([test -n "$with_curses"], [AC_PATH_PROGS([NCURSES_CONFIG_EXE], ["ncurses6-config"], ["no"], ["$with_curses/bin"])], [AC_PATH_PROGS([NCURSES_CONFIG_EXE], ["ncurses6-config"], ["no"])])]) - dnl error if ncurses6-config can't be found rather than look for the + dnl don't continue if ncursesN-config can't be found rather than look for the dnl specific libraries - AC_MSG_CHECKING([ncurses6-config exists]) - AC_MSG_RESULT([$NCURSES_CONFIG_EXE]) AS_IF([test $NCURSES_CONFIG_EXE = "no"], - [AC_MSG_ERROR([Unable to locate ncurses6-config utility])]) - - dnl Older versions only have --libs, not --libs-only-l and --libs-only-L, - dnl which combines the two. Ideally, CURSES_LDFLAGS (sstinfo_x_LDFLAGS) - dnl contains --libs-only-L and CURSES_LIBS (sstinfo_x_LDADD) contains - dnl --libs-only-l, but rather than complicated logic testing the above, - dnl combining everything into LDADD seems acceptable.. - CURSES_CPPFLAGS=`$NCURSES_CONFIG_EXE --cflags` - CURSES_LIBS=`$NCURSES_CONFIG_EXE --libs` - - CPPFLAGS_saved="$CPPFLAGS" - LDFLAGS_saved="$LDFLAGS" - -dnl Check for header - AC_LANG_PUSH([C++]) - AC_CHECK_HEADER([ncurses.h], [], [sst_check_curses_happy="no"]) - AC_LANG_POP([C++]) - - CPPFLAGS="$CPPFLAGS_saved" - LDFLAGS="$LDFLAGS_saved" + [ + CURSES_CPPFLAGS= + CURSES_LIBS= + sst_check_curses_happy="no" + ], + [ + dnl Older versions only have --libs, not --libs-only-l and --libs-only-L, + dnl which combines the two. Ideally, CURSES_LDFLAGS (sstinfo_x_LDFLAGS) + dnl contains --libs-only-L and CURSES_LIBS (sstinfo_x_LDADD) contains + dnl --libs-only-l, but rather than complicated logic testing the above, + dnl combining everything into LDADD seems acceptable.. + CURSES_CPPFLAGS=`$NCURSES_CONFIG_EXE --cflags` + CURSES_LIBS=`$NCURSES_CONFIG_EXE --libs` + + CPPFLAGS_saved="$CPPFLAGS" + LDFLAGS_saved="$LDFLAGS" + + CPPFLAGS="$CPPFLAGS $CURSES_CPPFLAGS" + LDFLAGS="$LDFLAGS $CURSES_LIBS" + + dnl Check for specific header + AC_LANG_PUSH([C++]) + AC_CHECK_HEADER([ncurses.h], [], [sst_check_curses_happy="no"]) + AC_LANG_POP([C++]) + + CPPFLAGS="$CPPFLAGS_saved" + LDFLAGS="$LDFLAGS_saved" + ] + ) AC_SUBST([CURSES_CPPFLAGS]) AC_SUBST([CURSES_LIBS]) From 8f58b120f5069e2075f85a38ab39f24b000b94a8 Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Fri, 8 Mar 2024 16:11:15 -0700 Subject: [PATCH 12/12] remove debugging leftovers --- config/sst_check_curses.m4 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/sst_check_curses.m4 b/config/sst_check_curses.m4 index dc2cd62e1..81eb3f423 100644 --- a/config/sst_check_curses.m4 +++ b/config/sst_check_curses.m4 @@ -20,10 +20,6 @@ AC_DEFUN([SST_CHECK_CURSES], [AS_IF([test -n "$with_curses"], [AC_PATH_PROGS([NCURSES_CONFIG_EXE], ["ncurses6-config" "ncurses5.4-config" "ncurses5-config"], ["no"], ["$with_curses/bin"])], [AC_PATH_PROGS([NCURSES_CONFIG_EXE], ["ncurses6-config" "ncurses5.4-config" "ncurses5-config"], ["no"])])]) - AS_IF([test $NCURSES_CONFIG_EXE = "no"], - [AS_IF([test -n "$with_curses"], - [AC_PATH_PROGS([NCURSES_CONFIG_EXE], ["ncurses6-config"], ["no"], ["$with_curses/bin"])], - [AC_PATH_PROGS([NCURSES_CONFIG_EXE], ["ncurses6-config"], ["no"])])]) dnl don't continue if ncursesN-config can't be found rather than look for the dnl specific libraries