summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2008-01-24 14:26:34 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2008-01-24 14:26:34 -0800
commit3f7624048aa6064c69e2320a70fb7fc89e0bb7ef (patch)
tree856ee723d51b478bdee52876f22318251b0ff5fa
parent503843fd3066031adbd4a362c686acc721787b7d (diff)
downloadxorg-lib-libXpm-3f7624048aa6064c69e2320a70fb7fc89e0bb7ef.tar.gz
Bug 14171: sxpm/Makefile.am:21: SED was already defined
<http://bugs.freedesktop.org/show_bug.cgi?id=14171>
-rw-r--r--configure.ac1
-rw-r--r--cxpm/Makefile.am2
-rw-r--r--sxpm/Makefile.am2
3 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 2f56e4d..dc569e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,7 @@ AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CC
+AC_PROG_SED
# Checks for pkg-config packages
PKG_CHECK_MODULES(XPM, xproto x11)
diff --git a/cxpm/Makefile.am b/cxpm/Makefile.am
index 097a640..3aecc8c 100644
--- a/cxpm/Makefile.am
+++ b/cxpm/Makefile.am
@@ -14,8 +14,6 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
CLEANFILES = $(appman_DATA)
-SED = sed
-
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
diff --git a/sxpm/Makefile.am b/sxpm/Makefile.am
index 7780bd8..65388f8 100644
--- a/sxpm/Makefile.am
+++ b/sxpm/Makefile.am
@@ -18,8 +18,6 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
CLEANFILES = $(appman_DATA)
-SED = sed
-
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11