handle not building X programs

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6450 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-07-12 20:56:44 +00:00
parent 20b62ed217
commit 62f8feee7b
2 changed files with 22 additions and 9 deletions

View File

@@ -6,10 +6,20 @@ INCLUDES += $(INCLUDE_krb4) $(X_CFLAGS)
WFLAGS += $(WFLAGS_NOIMPLICITINT)
bin_PROGRAMS = kx
bin_SCRIPTS = rxterm rxtelnet tenletxr
X_PROGS_BIN_PROGS = kx
X_PROGS_BIN_SCRPTS = rxterm rxtelnet tenletxr
X_PROGS_LIBEXEC_PROGS = kxd
libexec_PROGRAMS = kxd
MAKE_X_PROGS_BIN_PROGS = @MAKE_X_PROGS_BIN_PROGS@
MAKE_X_PROGS_BIN_SCRPTS = @MAKE_X_PROGS_BIN_SCRPTS@
MAKE_X_PROGS_LIBEXEC_PROGS = @MAKE_X_PROGS_LIBEXEC_PROGS@
bin_PROGRAMS = $(MAKE_X_PROGS_BIN_PROGS)
bin_SCRIPTS = $(MAKE_X_PROGS_BIN_SCRPTS)
libexec_PROGRAMS = $(MAKE_X_PROGS_LIBEXEC_PROGS)
EXTRA_PROGRAMS = $(X_PROGS_BIN_PROGS) $(X_PROGS_LIBEXEC_PROGS)
EXTRA_SCRIPTS = $(X_PROGS_BIN_SCRPTS)
if NEED_WRITEAUTH
XauWriteAuth_c = writeauth.c

View File

@@ -213,14 +213,17 @@ AC_C_INLINE
KRB_CHECK_X
if test "$no_x" = "yes" ; then
MAKE_X_PROGS_BIN=""
MAKE_X_PROGS_LIBEXEC=""
MAKE_X_PROGS_BIN_PROGS=""
MAKE_X_PROGS_BIN_SCRPTS=""
MAKE_X_PROGS_LIBEXEC_PROGS=""
else
MAKE_X_PROGS_BIN='$(X_PROGS_BIN)'
MAKE_X_PROGS_LIBEXEC='$(X_PROGS_LIBEXEC)'
MAKE_X_PROGS_BIN_PROGS='$(X_PROGS_BIN_PROGS)'
MAKE_X_PROGS_BIN_SCRPTS='$(X_PROGS_BIN_SCRPTS)'
MAKE_X_PROGS_LIBEXEC_PROGS='$(X_PROGS_LIBEXEC_PROGS)'
fi
AC_SUBST(MAKE_X_PROGS_BIN)dnl
AC_SUBST(MAKE_X_PROGS_LIBEXEC)dnl
AC_SUBST(MAKE_X_PROGS_BIN_PROGS)dnl
AC_SUBST(MAKE_X_PROGS_BIN_SCRPTS)dnl
AC_SUBST(MAKE_X_PROGS_LIBEXEC_PROGS)dnl
AC_CHECK_XAU