mirror of
https://git.openafs.org/openafs.git
synced 2025-01-18 23:10:58 +00:00
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.
(cherry picked from commit 4a6a00d6f4)
Reviewed-on: http://gerrit.openafs.org/3345
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Change-Id: Iea866ca6dfe758d95ef890f0d95e1c38012048b4
Reviewed-on: http://gerrit.openafs.org/4078
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
This commit is contained in:
Christof Hanke
Derrick Brashear
parent
41da26a9fd
commit
65ddae68df
20
Makefile.in
20
Makefile.in
@ -340,13 +340,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: des kauth cmd comerr rx vlserver vol volser
|
||||
+${COMPILE_PART1} uss ${COMPILE_PART2}
|
||||
@ -555,7 +564,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
|
||||
|
||||
|
||||
23
acinclude.m4
23
acinclude.m4
@ -1212,6 +1212,7 @@ AC_CHECK_HEADERS(windows.h direct.h sys/ipc.h sys/resource.h)
|
||||
AC_CHECK_HEADERS(security/pam_modules.h ucontext.h regex.h sys/statvfs.h sys/statfs.h sys/bitypes.h)
|
||||
AC_CHECK_HEADERS(linux/errqueue.h,,,[#include <linux/types.h>])
|
||||
AC_CHECK_HEADERS(et/com_err.h)
|
||||
AC_CHECK_HEADERS(ncurses.h curses.h)
|
||||
|
||||
AC_CHECK_TYPES([fsblkcnt_t],,,[
|
||||
#include <sys/types.h>
|
||||
@ -1226,6 +1227,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 <libintl.h>],[-lintl],,,INTL)
|
||||
|
||||
dnl Don't build PAM on IRIX; the interface doesn't work for us.
|
||||
@ -1441,3 +1450,17 @@ struct labeltest struct_labeltest = {
|
||||
])
|
||||
|
||||
])
|
||||
|
||||
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 "**************************************"
|
||||
])
|
||||
|
||||
@ -240,3 +240,6 @@ tests/util/Makefile,
|
||||
|
||||
[chmod a+x src/config/shlib-build
|
||||
chmod a+x src/config/shlib-install])
|
||||
|
||||
# print a final summary
|
||||
SUMMARY
|
||||
|
||||
@ -38,7 +38,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
|
||||
|
||||
|
||||
@ -45,7 +45,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 \"*\""
|
||||
;;
|
||||
@ -59,7 +58,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 \"*\""
|
||||
;;
|
||||
@ -73,7 +71,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 \"*\""
|
||||
;;
|
||||
@ -86,7 +83,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"
|
||||
;;
|
||||
@ -100,7 +96,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"
|
||||
;;
|
||||
@ -114,7 +109,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"
|
||||
;;
|
||||
@ -128,7 +122,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"
|
||||
;;
|
||||
@ -142,7 +135,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"
|
||||
;;
|
||||
@ -166,7 +158,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"
|
||||
@ -195,7 +186,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"
|
||||
@ -226,7 +216,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"
|
||||
@ -244,7 +233,6 @@ case $AFS_SYSNAME in
|
||||
PAM_CFLAGS="-pipe -fPIC"
|
||||
SHLIB_LDFLAGS="-shared -Xlinker -x"
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
TXLIBS="-lncurses"
|
||||
XCFLAGS="-pipe"
|
||||
;;
|
||||
|
||||
@ -255,7 +243,6 @@ case $AFS_SYSNAME in
|
||||
PAM_CFLAGS="-pipe -fPIC"
|
||||
SHLIB_LDFLAGS="-shared -Xlinker -x"
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
TXLIBS="-lncurses"
|
||||
XCFLAGS="-pipe"
|
||||
;;
|
||||
|
||||
@ -265,7 +252,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"
|
||||
;;
|
||||
|
||||
@ -277,7 +263,6 @@ case $AFS_SYSNAME in
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
SHLIB_LDFLAGS="-shared -Xlinker -x"
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
TXLIBS="-lcurses"
|
||||
XCFLAGS="-pipe"
|
||||
;;
|
||||
|
||||
@ -288,7 +273,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"
|
||||
;;
|
||||
|
||||
@ -300,7 +284,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"
|
||||
;;
|
||||
@ -314,7 +297,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"
|
||||
;;
|
||||
@ -327,7 +309,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"
|
||||
;;
|
||||
@ -340,7 +321,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"
|
||||
;;
|
||||
@ -353,7 +333,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"
|
||||
;;
|
||||
@ -370,7 +349,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"
|
||||
;;
|
||||
@ -388,7 +366,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"
|
||||
;;
|
||||
@ -406,7 +383,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"
|
||||
;;
|
||||
@ -422,7 +398,6 @@ case $AFS_SYSNAME in
|
||||
SHLIB_CFLAGS="-fpic"
|
||||
SHLIB_LDFLAGS="-shared -Xlinker -x"
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
TXLIBS="/usr/lib/libcurses.a"
|
||||
XCFLAGS=
|
||||
;;
|
||||
|
||||
@ -434,7 +409,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"
|
||||
;;
|
||||
@ -450,7 +424,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"
|
||||
@ -469,7 +442,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"
|
||||
@ -487,7 +459,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"
|
||||
@ -507,7 +478,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"
|
||||
@ -523,7 +493,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"
|
||||
;;
|
||||
@ -537,7 +506,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"
|
||||
@ -555,7 +523,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"
|
||||
@ -572,7 +539,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"
|
||||
@ -589,7 +555,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"
|
||||
@ -606,7 +571,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"
|
||||
@ -624,7 +588,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"
|
||||
@ -640,7 +603,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"
|
||||
;;
|
||||
@ -656,7 +618,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"
|
||||
@ -670,7 +631,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"
|
||||
@ -686,7 +646,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"
|
||||
@ -702,7 +661,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"
|
||||
@ -719,7 +677,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"
|
||||
@ -735,7 +692,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"
|
||||
@ -747,7 +703,6 @@ case $AFS_SYSNAME in
|
||||
CC="gcc"
|
||||
CCOBJ="gcc"
|
||||
SHLIB_CFLAGS="-PIC"
|
||||
TXLIBS="-lcurses -ltermcap"
|
||||
XCFLAGS=""
|
||||
XLIBELFA="-lelf"
|
||||
XLIBKVM="-lkvm"
|
||||
@ -762,7 +717,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"
|
||||
@ -782,7 +736,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"
|
||||
@ -803,7 +756,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"
|
||||
@ -824,7 +776,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"
|
||||
@ -845,7 +796,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"
|
||||
@ -866,7 +816,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"
|
||||
@ -887,7 +836,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"
|
||||
@ -908,7 +856,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"
|
||||
@ -928,7 +875,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"
|
||||
@ -948,7 +894,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"
|
||||
@ -968,7 +913,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"
|
||||
@ -988,7 +932,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"
|
||||
@ -1117,7 +1060,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)
|
||||
|
||||
@ -51,6 +51,7 @@ LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIB_AFSDB = @LIB_AFSDB@
|
||||
LIB_crypt = @LIB_crypt@
|
||||
LIB_curses = @LIB_curses@
|
||||
LIBS = @LIBS@
|
||||
LIB_LIBINTL = @LIB_libintl@
|
||||
LINUX_KERNEL_PATH = @LINUX_KERNEL_PATH@
|
||||
@ -88,7 +89,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@
|
||||
|
||||
@ -42,7 +42,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
|
||||
|
||||
|
||||
@ -14,13 +14,12 @@
|
||||
#include <afsconfig.h>
|
||||
#include <afs/param.h>
|
||||
|
||||
|
||||
#if defined(AFS_HPUX110_ENV) && !defined(__HP_CURSES)
|
||||
#define __HP_CURSES
|
||||
#if defined(HAVE_NCURSES_H)
|
||||
# include <ncurses.h>
|
||||
#elif defined(HAVE_CURSES_H)
|
||||
# include <curses.h>
|
||||
#endif
|
||||
|
||||
#include <curses.h>
|
||||
|
||||
#include "AFS_component_version_number.c"
|
||||
|
||||
main(argc, argv)
|
||||
|
||||
@ -20,13 +20,6 @@
|
||||
|
||||
|
||||
|
||||
#if defined(AFS_HPUX110_ENV) && !defined(__HP_CURSES)
|
||||
#define __HP_CURSES
|
||||
#endif
|
||||
|
||||
#ifndef AFS_SUN5_ENV
|
||||
#include <curses.h> /*Curses library */
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
#include <sys/file.h>
|
||||
#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD80_ENV)
|
||||
|
||||
@ -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 <ncurses.h> /*Curses library */
|
||||
#else
|
||||
#include <curses.h> /*Curses library */
|
||||
|
||||
#if defined(HAVE_NCURSES_H)
|
||||
# include <ncurses.h>
|
||||
#elif defined(HAVE_CURSES_H)
|
||||
# include <curses.h>
|
||||
#endif
|
||||
|
||||
/*Value for gwin w_type field*/
|
||||
|
||||
@ -53,7 +53,7 @@ all: scout
|
||||
scout.o: scout.c ${INCLS} AFS_component_version_number.c
|
||||
|
||||
scout: scout.o $(LIBS)
|
||||
${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${TXLIBS} ${XLIBS}
|
||||
${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${LIB_curses} ${XLIBS}
|
||||
|
||||
#
|
||||
# Installation targets
|
||||
|
||||
Loading…
Reference in New Issue
Block a user