Remove configure option --enable-xprint Remove AM conditional USE_XPRINT Signed-off-by: Gaetan Nadon <[email protected]> --- Makefile.am | 11 ----------- configure.ac | 15 +++------------ 2 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/Makefile.am b/Makefile.am index ecb138c..e4c4193 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,17 +127,6 @@ if NEED_STRCASECMP xedit_SOURCES += strcasecmp.c endif -if USE_XPRINT -xedit_CFLAGS += -DINCLUDE_XPRINT_SUPPORT - -xedit_SOURCES += \ - print.c \ - printdialog.c \ - printdialog.h \ - printdialogprivates.h \ - print.h -endif - # lisp/lsp lisp_lsp_DEPENDENCIES = liblisp.a libre.a libmp.a lisp_lsp_CFLAGS = $(CWARNFLAGS) -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"@lisp...@\" -D_BSD_SOURCE diff --git a/configure.ac b/configure.ac index 01c067b..a2b0eb7 100644 --- a/configure.ac +++ b/configure.ac @@ -40,18 +40,9 @@ AC_PROG_INSTALL AC_PROG_RANLIB PKG_PROG_PKG_CONFIG -AC_ARG_ENABLE(xprint, - AS_HELP_STRING([--enable-xprint], - [Compile with xprint support (default: disabled)]), - [enable_xprint=$enableval], [enable_xprint=no]) -AM_CONDITIONAL(USE_XPRINT, test x$enable_xprint = xyes) -if test x$enable_xprint = xyes; then - PKG_CHECK_MODULES(PKGDEPS, xprintutil xp xaw8) - print_noprint=xprint -else - PKG_CHECK_MODULES(PKGDEPS, xaw7) - print_noprint=noxprint -fi +PKG_CHECK_MODULES(PKGDEPS, xaw7) +print_noprint=noxprint + AC_CONFIG_LINKS([app-defaults/Xedit:app-defaults/Xedit-$print_noprint]) AC_ARG_WITH(lispdir, AS_HELP_STRING([--with-lispdir=PATH], -- 1.6.0.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
