diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-10 20:53:03 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-10 20:53:06 -0800 |
| commit | 483bdb6fb59dcc802580b8fd066263ec910c9f1d (patch) | |
| tree | 3f2bbf2c6f330e71ca4fd752bb24a2e217da4d74 | |
| parent | 37eccfb9d61170d382d84d2865940a4f8dc71e51 (diff) | |
config: AC_PROG_CC is provided by XORG_DEFAULT_OPTIONS now
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | man/Makefile.am | 14 |
2 files changed, 1 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 0767913..a1c7bc6 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,6 @@ XORG_MACROS_VERSION(1.8) AM_CONFIG_HEADER(src/config.h) # Check for progs -AC_PROG_CC AC_PROG_LIBTOOL XORG_DEFAULT_OPTIONS diff --git a/man/Makefile.am b/man/Makefile.am index 5eb5e75..6171cb9 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -34,21 +34,9 @@ CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ $(XF86Misc_shadowmen) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \ - -e 's/__xconfigfile__/xorg.conf/g' \ - -e 's/__appmansuffix__/$(APP_MAN_SUFFIX)/g' \ - -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' \ - -e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g' - SUFFIXES = .$(LIB_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(LIB_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ |