From: Christof Hanke Date: Sun, 21 Nov 2010 22:01:53 +0000 (+0100) Subject: check curses-libs by configure X-Git-Tag: openafs-devel-1_7_1~1184 X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=4a6a00d6f45bd0ac94e2eb05adee41552073643a check curses-libs by configure Presently, the used curses-library are determined by OS. The leads to a build error when no curses-headers are installed. Use configure to test if curses.h or ncurses.h is present. ncurses takes precedence over curses.h. If neither the curses- nor ncurses-libs are available, do not build afsmonitor and scout. A summary at the end of the configure should make this clear to everyone. The variable TXLIBS has been renamed to LIB_curses. Change-Id: I3f661e0b6199be41818dc22149b061e3d599b77f Reviewed-on: http://gerrit.openafs.org/3345 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/Makefile.in b/Makefile.in index 764a6bd..b154736 100644 --- a/Makefile.in +++ b/Makefile.in @@ -346,13 +346,22 @@ afsd: cmd comerr sys kauth @CLIENT_UAFS_DEP@ +${COMPILE_PART1} afsd ${COMPILE_PART2} gtx: cmd comerr auth kauth - +${COMPILE_PART1} gtx ${COMPILE_PART2} + +set -x; \ + if test "@LIB_curses@"; then \ + ${COMPILE_PART1} gtx ${COMPILE_PART2} ; \ + else \ + echo Not building gtx, because no curses-headers found. ; \ + fi fsprobe: cmd comerr util fsint volser +${COMPILE_PART1} fsprobe ${COMPILE_PART2} scout: cmd comerr gtx fsprobe - +${COMPILE_PART1} scout ${COMPILE_PART2} + if test "@LIB_curses@"; then \ + ${COMPILE_PART1} scout ${COMPILE_PART2} ; \ + else \ + echo Not building scout, because no curses-headers found. ; \ + fi uss: hcrypto kauth cmd comerr rx vlserver vol volser +${COMPILE_PART1} uss ${COMPILE_PART2} @@ -557,7 +566,12 @@ xstat: cmd comerr fsint viced +${COMPILE_PART1} xstat ${COMPILE_PART2} afsmonitor: cmd comerr gtx xstat - +${COMPILE_PART1} afsmonitor ${COMPILE_PART2} + +set -x; \ + if test "@LIB_curses@"; then \ + ${COMPILE_PART1} afsmonitor ${COMPILE_PART2} ; \ + else \ + echo Not building afsmonitor, because no curses-headers found. ; \ + fi tests: rxtests ubiktests rpctestlib diff --git a/acinclude.m4 b/acinclude.m4 index 77c3caa..3165f1d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1216,6 +1216,7 @@ AC_CHECK_HEADERS(security/pam_modules.h ucontext.h regex.h sys/statvfs.h sys/sta AC_CHECK_HEADERS(sys/socket.h sys/ioctl.h errno.h time.h syslog.h) AC_CHECK_HEADERS(linux/errqueue.h,,,[#include ]) AC_CHECK_HEADERS(et/com_err.h stdio_ext.h) +AC_CHECK_HEADERS(ncurses.h curses.h) AC_CHECK_TYPES([fsblkcnt_t],,,[ #include @@ -1230,6 +1231,14 @@ AC_CHECK_TYPES([fsblkcnt_t],,,[ #endif ]) +dnl check for curses-lib +save_LIBS=$LIBS +AC_CHECK_LIB( [ncurses], [setupterm], +[LIB_curses=-lncurses], +[AC_CHECK_LIB([curses], [setupterm], [LIB_curses=-lcurses])]) +LIBS=$save_LIBS +AC_SUBST(LIB_curses) + OPENAFS_TEST_PACKAGE(libintl,[#include ],[-lintl],,,INTL) dnl Don't build PAM on IRIX; the interface doesn't work for us. @@ -1584,3 +1593,17 @@ dnl Eventually, this will look for the system one, or for OpenSSL LIB_hcrypto="-lafshcrypto" AC_SUBST(LIB_hcrypto) ]) + +AC_DEFUN([SUMMARY], [ + # Print a configuration summary +echo +echo "**************************************" +echo configure summary +echo +AS_IF([test $LIB_curses],[ +echo "LIB_curses : $LIB_curses" ],[ +echo "XXX LIB_curses not found! not building scout and afsmonitor!" +]) +echo +echo "**************************************" +]) diff --git a/configure.ac b/configure.ac index 37824e1..fdf43f3 100644 --- a/configure.ac +++ b/configure.ac @@ -244,3 +244,6 @@ tests/util/Makefile, [chmod a+x src/config/shlib-build chmod a+x src/config/shlib-install]) + +# print a final summary +SUMMARY diff --git a/src/afsmonitor/Makefile.in b/src/afsmonitor/Makefile.in index 4a1cf1a..acc7820 100644 --- a/src/afsmonitor/Makefile.in +++ b/src/afsmonitor/Makefile.in @@ -40,7 +40,7 @@ LIBS=${TOP_LIBDIR}/libxstat_fs.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/util.a -EXTRA_LIBS=${TXLIBS} ${XLIBS} +EXTRA_LIBS=${LIB_curses} ${XLIBS} all: afsmonitor diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index 7a6ea2e..992fb9b 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -44,7 +44,6 @@ case $AFS_SYSNAME in DBG="-g3" MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-pthread -lpthread -lmach -lexc -lc" - TXLIBS="-lcurses" XCFLAGS="-D_NO_PROTO -DOSF" SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\"" ;; @@ -58,7 +57,6 @@ case $AFS_SYSNAME in CSTATIC="-non_shared" MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-pthread -lpthread -lmach -lexc -lc" - TXLIBS="-lcurses" XCFLAGS="-D_NO_PROTO -DOSF" SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\"" ;; @@ -72,7 +70,6 @@ case $AFS_SYSNAME in LWP_OPTMZ="-O2" MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-pthread -lpthread -lmach -lexc -lc" - TXLIBS="-lcurses" XCFLAGS="-D_NO_PROTO -DOSF" SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\"" ;; @@ -85,7 +82,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -99,7 +95,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -113,7 +108,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -127,7 +121,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -141,7 +134,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -165,7 +157,6 @@ case $AFS_SYSNAME in RM="/bin/rm" SHLIB_LDFLAGS="-b -Bsymbolic" SHLIB_SUFFIX="sl" - TXLIBS="/usr/lib/libHcurses.a" VFSCK_CFLAGS="-D_FILE64" XCFLAGS0="-ldld -lc -Wp,-H200000 -Wl,-a,archive -DAUTH_DBM_LOG +z -Wl,+k -D_LARGEFILE64_SOURCE" XCFLAGS64="${XCFLAGS0} +DA2.0W" @@ -194,7 +185,6 @@ case $AFS_SYSNAME in RM="/bin/rm" SHLIB_LDFLAGS="-b -Bsymbolic" SHLIB_SUFFIX="sl" - TXLIBS="/usr/lib/libHcurses.a" VFSCK_CFLAGS="-I/usr/old/usr/include -D_FILE64" XCFLAGS0="-ldld -lc -Wp,-H200000 -Wl,-a,archive -DAUTH_DBM_LOG +z -Wl,+k -D_LARGEFILE64_SOURCE" XCFLAGS64="${XCFLAGS0} +DA2.0W" @@ -225,7 +215,6 @@ case $AFS_SYSNAME in RM="/bin/rm" SHLIB_LDFLAGS="-b -Bsymbolic" SHLIB_SUFFIX="sl" - TXLIBS="/usr/lib/hpux32/libcurses.so" VFSCK_CFLAGS="-I/usr/old/usr/include -D_FILE64" XCFLAGS0="-ldld -lc -Wp,-H200000 -Wl,-a,archive_shared -DAUTH_DBM_LOG +z -Wl,+k -D_LARGEFILE64_SOURCE" XCFLAGS64="${XCFLAGS0} +DD64" @@ -243,7 +232,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-pipe -fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" SHLIB_LINKER="${MT_CC} -shared" - TXLIBS="-lncurses" XCFLAGS="-pipe" ;; @@ -254,7 +242,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-pipe -fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" SHLIB_LINKER="${MT_CC} -shared" - TXLIBS="-lncurses" XCFLAGS="-pipe" ;; @@ -264,7 +251,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-O2 -pipe -fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" SHLIB_LINKER="${MT_CC} -shared" - TXLIBS="-lncurses" XCFLAGS="-O2 -pipe -fPIC" ;; @@ -276,7 +262,6 @@ case $AFS_SYSNAME in SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" SHLIB_LINKER="${MT_CC} -shared" - TXLIBS="-lcurses" XCFLAGS="-pipe" ;; @@ -287,7 +272,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-pipe -fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" SHLIB_LINKER="${MT_CC} -shared" - TXLIBS="/usr/lib/libcurses.so" XCFLAGS="-pipe" ;; @@ -299,7 +283,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE -G0" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -313,7 +296,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -326,7 +308,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" SHLIB_CFLAGS="-fPIC" - TXLIBS="/usr/lib64/libncurses.so" XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -339,7 +320,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" SHLIB_CFLAGS="-fPIC" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE -fPIC" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -352,7 +332,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -369,7 +348,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -387,7 +365,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -405,7 +382,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -418,7 +394,6 @@ case $AFS_SYSNAME in SHLIB_CFLAGS="-fpic" SHLIB_LDFLAGS="-shared -Xlinker -x" SHLIB_LINKER="${MT_CC} -shared" - TXLIBS="/usr/lib/libcurses.a" XCFLAGS= ;; @@ -430,7 +405,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -446,7 +420,6 @@ case $AFS_SYSNAME in LWP_OPTMZ="-O2" REGEX_OBJ="regex.o" XCFLAGS="-no-cpp-precomp" - TXLIBS="-lncurses" EXTRA_VLIBOBJS="fstab.o" SHLIB_LINKER="${MT_CC} -dynamiclib" SHLIB_SUFFIX="dylib" @@ -465,7 +438,6 @@ case $AFS_SYSNAME in LWP_OPTMZ="-Os" OPTMZ="-Os" REGEX_OBJ="regex.o" - TXLIBS="-lncurses" EXTRA_VLIBOBJS="fstab.o" SHLIB_LINKER="${MT_CC} -dynamiclib" SHLIB_SUFFIX="dylib" @@ -483,7 +455,6 @@ case $AFS_SYSNAME in LWP_OPTMZ="-Os" OPTMZ="-Os" REGEX_OBJ="regex.o" - TXLIBS="-lncurses" EXTRA_VLIBOBJS="fstab.o" SHLIB_LINKER="${MT_CC} -dynamiclib" SHLIB_SUFFIX="dylib" @@ -503,7 +474,6 @@ case $AFS_SYSNAME in OPTMZ="-Os" PAM_LIBS="-lpam" REGEX_OBJ="regex.o" - TXLIBS="-lncurses" EXTRA_VLIBOBJS="fstab.o" SHLIB_LINKER="${MT_CC} -dynamiclib" SHLIB_SUFFIX="dylib" @@ -519,7 +489,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -533,7 +502,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthreads" SHLIB_SUFFIX="o" - TXLIBS="-lcurses" XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void" XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl" SHLIB_LINKER="${MT_CC} -bM:SRE -berok" @@ -551,7 +519,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthreads" SHLIB_SUFFIX="o" - TXLIBS="-lcurses" XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void" XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl" SHLIB_LINKER="${MT_CC} -bM:SRE -berok" @@ -568,7 +535,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthreads" SHLIB_SUFFIX="o" - TXLIBS="-lcurses" XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void" XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl" SHLIB_LINKER="${MT_CC} -bM:SRE -berok" @@ -585,7 +551,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthreads" SHLIB_SUFFIX="o" - TXLIBS="-lcurses" XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void" XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl" SHLIB_LINKER="${MT_CC} -bM:SRE -berok" @@ -602,7 +567,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthreads" SHLIB_SUFFIX="o" - TXLIBS="-lcurses" XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void" XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl" SHLIB_LINKER="${MT_CC} -bM:SRE -berok" @@ -620,7 +584,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" OPTMZ=-O XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" @@ -636,7 +599,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" ;; @@ -652,7 +614,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x -Xlinker -Bsymbolic" - TXLIBS="-lncurses" OPTMZ=-O XCFLAGS="-D_LARGEFILE64_SOURCE -D__s390x__" SHLIB_LINKER="${MT_CC} -shared" @@ -666,7 +627,6 @@ case $AFS_SYSNAME in FSINCLUDES="-I/usr/include/sys/fs" MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread" - TXLIBS="-lcurses" XCFLAGS64="-64 -mips3" XCFLAGS="-o32" XLDFLAGS64="-64" @@ -682,7 +642,6 @@ case $AFS_SYSNAME in FSINCLUDES="-I/usr/include/sys/fs" MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread" - TXLIBS="-lcurses" XCFLAGS64="-D_BSD_COMPAT -64 -mips3" XCFLAGS="-D_OLD_TERMIOS -D_BSD_COMPAT -o32" XLDFLAGS64="-64" @@ -698,7 +657,6 @@ case $AFS_SYSNAME in FSINCLUDES="-I/usr/include/sys/fs" MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread" - TXLIBS="-lcurses" XCFLAGS64="-D_BSD_COMPAT -64 -mips3" XCFLAGS="-D_OLD_TERMIOS -D_BSD_COMPAT -n32 -woff 1009,1014,1110,1116,1164,1169,1171,1174,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552,3201 -Wl,-woff,84,-woff,15" XLDFLAGS64="-64" @@ -715,7 +673,6 @@ case $AFS_SYSNAME in MT_CC="/usr/bin/cc" MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread" - TXLIBS="-lcurses" XCFLAGS64="-64 -mips3" XCFLAGS="-n32 -mips3 -woff 1009,1014,1110,1116,1164,1171,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552,3201 -Wl,-woff,84,-woff,15" XLDFLAGS64="-64 -mips3" @@ -731,7 +688,6 @@ case $AFS_SYSNAME in PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" XCFLAGS="-D_LARGEFILE64_SOURCE" XCFLAGS64="-D_LARGEFILE64_SOURCE -m64" XLDFLAGS64="-m64" @@ -743,7 +699,6 @@ case $AFS_SYSNAME in CC="gcc" CCOBJ="gcc" SHLIB_CFLAGS="-PIC" - TXLIBS="-lcurses -ltermcap" XCFLAGS="" XLIBELFA="-lelf" XLIBKVM="-lkvm" @@ -758,7 +713,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}' MT_LIBS="-lpthread -lsocket" SHLIB_CFLAGS="-KPIC" - TXLIBS="-lcurses" XCFLAGS="-dy -Bdynamic" XLIBELFA="-lelf" XLIBKVM="-lkvm" @@ -778,7 +732,6 @@ case $AFS_SYSNAME in PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" SHLIB_LDFLAGS="-G -Bsymbolic" - TXLIBS="-L/usr/ccs/lib -lcurses" XCFLAGS="-dy -Bdynamic" XLIBELFA="-lelf" LD="/usr/ccs/bin/ld" @@ -799,7 +752,6 @@ case $AFS_SYSNAME in PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" SHLIB_LDFLAGS="-G -Bsymbolic" - TXLIBS="-lcurses" XCFLAGS64='${XCFLAGS} -xarch=v9' XCFLAGS="-dy -Bdynamic" XLIBELFA="-lelf" @@ -820,7 +772,6 @@ case $AFS_SYSNAME in PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" SHLIB_LDFLAGS="-G -Bsymbolic" - TXLIBS="-lcurses" XCFLAGS64='${XCFLAGS} -xarch=v9' XCFLAGS="-dy -Bdynamic" XLIBELFA="-lelf" @@ -841,7 +792,6 @@ case $AFS_SYSNAME in PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" SHLIB_LDFLAGS="-G -Bsymbolic" - TXLIBS="-lcurses" XCFLAGS64='${XCFLAGS} -xarch=v9' XCFLAGS="-dy -Bdynamic" XLIBELFA="-lelf" @@ -862,7 +812,6 @@ case $AFS_SYSNAME in PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" SHLIB_LDFLAGS="-G -Bsymbolic" - TXLIBS="-lcurses" XCFLAGS64='${XCFLAGS} -m64' XCFLAGS="-dy -Bdynamic" XLIBELFA="-lelf" @@ -883,7 +832,6 @@ case $AFS_SYSNAME in PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" SHLIB_LDFLAGS="-G -Bsymbolic" - TXLIBS="-lcurses" XCFLAGS64='${XCFLAGS} -xarch=v9' XCFLAGS="-dy -Bdynamic" XLIBELFA="-lelf" @@ -904,7 +852,6 @@ case $AFS_SYSNAME in PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" SHLIB_LDFLAGS="-G -Bsymbolic" - TXLIBS="-lcurses" XCFLAGS64='${XCFLAGS} -xarch=amd64' XCFLAGS="-dy -Bdynamic" XLIBELFA="-lelf" @@ -924,7 +871,6 @@ case $AFS_SYSNAME in PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" SHLIB_LDFLAGS="-G -Bsymbolic" - TXLIBS="-lcurses" XCFLAGS64='${XCFLAGS} -xarch=amd64' XCFLAGS="-dy -Bdynamic" XLIBELFA="-lelf" @@ -944,7 +890,6 @@ case $AFS_SYSNAME in PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" SHLIB_LDFLAGS="-G -Bsymbolic" - TXLIBS="-lcurses" XCFLAGS64='${XCFLAGS} -xarch=amd64' XCFLAGS="-dy -Bdynamic" XLIBELFA="-lelf" @@ -964,7 +909,6 @@ case $AFS_SYSNAME in PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" SHLIB_LDFLAGS="-G -Bsymbolic" - TXLIBS="-lcurses" XCFLAGS64='${XCFLAGS} -m64' XCFLAGS="-dy -Bdynamic" XLIBELFA="-lelf" @@ -984,7 +928,6 @@ case $AFS_SYSNAME in PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" SHLIB_CFLAGS="-KPIC" SHLIB_LDFLAGS="-G -Bsymbolic" - TXLIBS="-lcurses" XCFLAGS64='${XCFLAGS} -xarch=amd64' XCFLAGS="-dy -Bdynamic" XLIBELFA="-lelf" @@ -1129,7 +1072,6 @@ AC_SUBST(SHLIB_CFLAGS) AC_SUBST(SHLIB_LDFLAGS) AC_SUBST(SHLIB_LINKER) AC_SUBST(SHLIB_SUFFIX) -AC_SUBST(TXLIBS) AC_SUBST(VFSCK_CFLAGS) AC_SUBST(XCFLAGS) AC_SUBST(CFLAGS_NOERROR) diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in index 890fa57..a68f5ad 100644 --- a/src/config/Makefile.config.in +++ b/src/config/Makefile.config.in @@ -54,6 +54,7 @@ LDFLAGS_roken = @LDFLAGS_roken@ LEX = @LEX@ LIB_AFSDB = @LIB_AFSDB@ LIB_crypt = @LIB_crypt@ +LIB_curses = @LIB_curses@ LIB_hcrypto = @LIB_hcrypto@ LIB_roken = @LIB_roken@ LIBS = @LIBS@ @@ -95,7 +96,6 @@ TOP_LIBDIR = @TOP_LIBDIR@ TOP_JLIBDIR= @TOP_JLIBDIR@ TOP_OBJDIR = @TOP_OBJDIR@ TOP_SRCDIR = @TOP_SRCDIR@ -TXLIBS = @TXLIBS@ VPATH = ${srcdir} XCFLAGS64 = @XCFLAGS64@ XCFLAGS = @XCFLAGS@ diff --git a/src/gtx/Makefile.in b/src/gtx/Makefile.in index e220c70..4b5a97a 100644 --- a/src/gtx/Makefile.in +++ b/src/gtx/Makefile.in @@ -43,7 +43,7 @@ LIBS=\ ${TOP_LIBDIR}/libcom_err.a \ ${TOP_LIBDIR}/util.a -EXTRA_LIBS=${TXLIBS} ${XLIBS} +EXTRA_LIBS=${LIB_curses} ${XLIBS} KEYMAP_SRCS=keymap.c input.c frame.c diff --git a/src/gtx/curses_test.c b/src/gtx/curses_test.c index d555ae5..2255ff4 100644 --- a/src/gtx/curses_test.c +++ b/src/gtx/curses_test.c @@ -14,13 +14,12 @@ #include #include - -#if defined(AFS_HPUX110_ENV) && !defined(__HP_CURSES) -#define __HP_CURSES +#if defined(HAVE_NCURSES_H) +# include +#elif defined(HAVE_CURSES_H) +# include #endif -#include - #include "AFS_component_version_number.c" main(argc, argv) diff --git a/src/gtx/curseswindows.c b/src/gtx/curseswindows.c index e1796d5..1d28040 100644 --- a/src/gtx/curseswindows.c +++ b/src/gtx/curseswindows.c @@ -20,13 +20,6 @@ -#if defined(AFS_HPUX110_ENV) && !defined(__HP_CURSES) -#define __HP_CURSES -#endif - -#ifndef AFS_SUN5_ENV -#include /*Curses library */ -#endif #include #include #if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD80_ENV) diff --git a/src/gtx/gtxcurseswin.h b/src/gtx/gtxcurseswin.h index 096a3f6..a60f05c 100644 --- a/src/gtx/gtxcurseswin.h +++ b/src/gtx/gtxcurseswin.h @@ -11,13 +11,11 @@ #define __gator_curseswindows_h 1 #include "gtxwindows.h" /*Base gator window dfns */ -#if defined(AFS_HPUX110_ENV) && !defined(__HP_CURSES) -#define __HP_CURSES -#endif -#ifdef AFS_LINUX20_ENV -#include /*Curses library */ -#else -#include /*Curses library */ + +#if defined(HAVE_NCURSES_H) +# include +#elif defined(HAVE_CURSES_H) +# include #endif /*Value for gwin w_type field*/ diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in index c5955f9..341599f 100644 --- a/src/scout/Makefile.in +++ b/src/scout/Makefile.in @@ -56,7 +56,7 @@ all: scout scout.o: scout.c ${INCLS} AFS_component_version_number.c scout: scout.o $(LIBS) - $(AFS_LDRULE) scout.o $(LIBS) $(LIB_roken) ${TXLIBS} ${XLIBS} + $(AFS_LDRULE) scout.o $(LIBS) $(LIB_roken) ${LIB_curses} ${XLIBS} # # Installation targets