summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-07-05 22:51:11 +0000
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-07-05 22:51:11 +0000
commitbf280e7bc5d6e2c65ea0235fde208274a714d13b (patch)
tree7d96224012224d5f2c22e213f262f69c980c7863
parent8b721c45d8f8681e59ca145d1ed3839d1b312a99 (diff)
Add build systems for xlogo, xlsatoms, xlsclients, xmag, xman, xmessage,XORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_16XORG-6_8_99_15
xmh, xmore. lib/Xaw/xaw.m4: Add an AM_CONDITIONAL and a shell variable xaw_use_xprint symlink.sh: add some extra files for xgc, xinit, xkbcomp, xlogo, xmb, and xmodmap xc/programs/xmore/xmore.c: Conditionalize use of xprint
-rw-r--r--AUTHORS0
-rw-r--r--COPYING0
-rw-r--r--ChangeLog0
-rw-r--r--INSTALL0
-rw-r--r--Makefile.am62
-rw-r--r--NEWS0
-rw-r--r--README0
-rwxr-xr-xautogen.sh13
-rw-r--r--configure.ac46
-rw-r--r--xmore.c17
10 files changed, 137 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/AUTHORS
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/COPYING
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ChangeLog
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/INSTALL
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..0ad63c9
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,62 @@
+#
+# Copyright 2005 Red Hat, Inc.
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of Red Hat not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission. Red Hat makes no
+# representations about the suitability of this software for any purpose. It
+# is provided "as is" without express or implied warranty.
+#
+# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+bin_PROGRAMS = xmore
+
+xmore_CFLAGS = $(DEP_CFLAGS) -DXMORE
+xmore_LDADD = $(DEP_LIBS)
+
+xmore_SOURCES = \
+ xmore.c \
+ xmore.h
+
+if XAW_USE_XPRINT
+xmore_CFLAGS += -DUSE_XPRINT
+
+xmore_SOURCES += \
+ print.c \
+ printdialog.c \
+ printdialog.h \
+ printdialogprivates.h \
+ print.h
+endif
+
+dist_man_MANS = \
+ xmore.man
+
+# App default files (*.ad)
+
+appdefaultdir = $(sysconfdir)/X11/app-defaults
+
+
+APPDEFAULTFILES = \
+ XMore
+
+
+$(APPDEFAULTFILES): %: %.ad
+ cp $< $@
+
+appdefault_DATA = $(APPDEFAULTFILES)
+
+EXTRA_DIST = $(foreach FILE, $(APPDEFAULTFILES), $(FILE).ad)
+
+CLEANFILES = $(APPDEFAULTFILES)
+
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/NEWS
diff --git a/README b/README
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/README
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..e81f989
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..edb5e93
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,46 @@
+
+dnl Copyright 2005 Red Hat, Inc.
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation, and that the name of Red Hat not be used in
+dnl advertising or publicity pertaining to distribution of the software without
+dnl specific, written prior permission. Red Hat makes no
+dnl representations about the suitability of this software for any purpose. It
+dnl is provided "as is" without express or implied warranty.
+dnl
+dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+dnl PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ([2.57])
+AC_INIT(xmore,[7.0], [xorg@freedesktop.org],xmore)
+AM_INIT_AUTOMAKE([dist-bzip2])
+AM_MAINTAINER_MODE
+
+AM_CONFIG_HEADER(config.h)
+
+AC_PROG_CC
+AC_PROG_INSTALL
+
+# Checks for pkg-config packages
+XAW_CHECK_XPRINT_SUPPORT(DEP)
+if test "x$xaw_use_xprint" = "xyes" ; then
+ PKG_CHECK_MODULES(XPRINT_UTIL, xprintutil)
+
+ DEP_CFLAGS="$DEP_CFLAGS $XPRINT_UTIL_CFLAGS"
+ DEP_LIBS="$DEP_LIBS $XPRINT_UTIL_LIBS"
+fi
+
+AC_SUBST(DEP_CFLAGS)
+AC_SUBST(DEP_LIBS)
+
+AC_OUTPUT([Makefile])
diff --git a/xmore.c b/xmore.c
index 67be5e8..4ed6e23 100644
--- a/xmore.c
+++ b/xmore.c
@@ -37,11 +37,17 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xaw/List.h>
#include <X11/Xaw/Command.h>
#include <X11/Xaw/AsciiText.h>
+#include <X11/Xaw/Cardinals.h>
#include "xmore.h"
+
+#ifdef USE_XPRINT
+
#include "printdialog.h"
#include "print.h"
+#endif
+
#include <stdlib.h>
#include <stdio.h>
#include <limits.h>
@@ -65,8 +71,10 @@ static const char *viewFileName; /* file to browse (from argv[1]) */
/* prototypes */
static void quitAction(Widget w, XEvent *event, String *params, Cardinal *num_params);
static void quitXtProc(Widget w, XtPointer client_data, XtPointer callData);
+#ifdef USE_XPRINT
static void printAction(Widget w, XEvent *event, String *params, Cardinal *num_params);
static void printXtProc(Widget w, XtPointer client_data, XtPointer callData);
+#endif
static XrmOptionDescRec options[] = {
{
@@ -76,7 +84,9 @@ static XrmOptionDescRec options[] = {
static XtActionsRec actions[] = {
{ "quit", quitAction },
+#ifdef USE_XPRINT
{ "print", printAction }
+#endif
};
/* See xmore.h */
@@ -143,6 +153,8 @@ printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData)
XawPrintDialogClosePrinterConnection(printdialog, False);
}
+#ifdef USE_XPRINT
+
static void
printOKXtProc(Widget w, XtPointer client_data, XtPointer callData)
{
@@ -236,6 +248,7 @@ printAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
XtPopup(printdialog_shell, XtGrabNonexclusive);
}
+#endif
int main( int argc, char *argv[] )
{
@@ -279,13 +292,15 @@ int main( int argc, char *argv[] )
XtSetArg(args[n], XtNfontSet, userOptions.textfont); n++;
text = XtCreateManagedWidget("text", asciiTextWidgetClass, form, args, n);
+#ifdef USE_XPRINT
n = 0;
XtSetArg(args[n], XtNfromHoriz, NULL); n++;
XtSetArg(args[n], XtNfromVert, text); n++;
XtSetArg(args[n], XtNlabel, "Print..."); n++;
printbutton = XtCreateManagedWidget("print", commandWidgetClass, form, args, n);
XtAddCallback(printbutton, XtNcallback, printXtProc, 0);
-
+#endif
+
n = 0;
XtSetArg(args[n], XtNfromHoriz, printbutton); n++;
XtSetArg(args[n], XtNfromVert, text); n++;