[patch] Patch to configure.in to drop useless ncurses probes and add ncurses to LIBS instead of LDFLAGS

slurm-as-needed.patch (text/plain), 2.09 KB, created by Kevin Pyle on 2009-02-14 19:06:11 UTC

--- a/configure.in	2004-09-28 09:34:56.000000000 -0500
+++ b/configure.in	2009-02-14 12:42:52.000000000 -0600
@@ -40,41 +40,15 @@
 fi
 AC_DEFINE(OSTYPE, ["${OSTYPE}"], [The operating system to build for])
 
-for cursespath in /usr/include/ncurses.h /usr/local/include/ncurses.h /usr/local/include/ncurses/ncurses.h /opt/include/ncurses.h /opt/include/curses.h /usr/include/curses.h /usr/local/include/curses.h /dev/null
-do
-  test -f "${cursespath}" && break
-done
-case ${cursespath} in
-  /usr/include/*) 
-	CFLAGS="$CFLAGS -I/usr/include"
-	LDFLAGS=""
-	;;
-  /usr/local/include/ncurses/*)
-        CFLAGS="${CFLAGS} -I/usr/local/include/ncurses"
-        LDFLAGS="-L/usr/local/lib"
-        SOLLDFLAGS="-R/usr/local/lib"
-        ;;
-  /usr/local/include/*) 
-	CFLAGS="${CFLAGS} -I/usr/local/include"
-	LDFLAGS="-L/usr/local/lib"
-	SOLLDFLAGS="-R/usr/local/lib"
-	;;
-  /opt/include/*) 
-	CFLAGS="${CFLAGS} -I/opt/include"
-	LDFLAGS="-L/opt/lib"
-	SOLLDFLAGS="-R/opt/lib"
-	;;
-esac
 # add Slowlaris -R and libraries to LDFLAGS
 if test ${OSTYPE} = "solaris" ; then
 	LDFLAGS="${LDFLAGS} ${SOLLDFLAGS} -lnsl -lsocket -lkstat"
 fi
 
-AC_CHECK_LIB(fridge, vanilla_coke, echo "WTF?!", echo "Warning: No vanilla coke found in fridge.";echo "We highly suggest that you rectify this situation immediatly.")
 ncurses_support="no"
 curses_support="no"
 color_support="no"
-AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES -D_HAVE_NCURSES_COLOR"; color_support="yes"; ncurses_support="yes", AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES"; ncurses_support="yes"; echo "NO TRANSPARENCY SUPPORT in this ncurses lib", AC_CHECK_LIB(curses, initscr, LDFLAGS="$LDFLAGS -lcurses"; CFLAGS="$CFLAGS -D_HAVE_CURSES"; curses_support="yes"; echo "NO TRANSPARENCY SUPPORT in curses lib"))) 
+AC_CHECK_LIB(ncurses, use_default_colors, LIBS="-lncurses $LIBS"; CFLAGS="$CFLAGS -D_HAVE_NCURSES -D_HAVE_NCURSES_COLOR"; color_support="yes"; ncurses_support="yes")
 
 # disable color support on Solaris for now
 if test ${OSTYPE} = "solaris" ; then