build system cleanup

git-svn-id: svn://tug.org/texlive/trunk@12807 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 6 insertions, 24 deletions

diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am
index 060b39fdbd2..b2f7a43d61f 100644
--- a/Build/source/libs/xpdf/Makefile.am
+++ b/Build/source/libs/xpdf/Makefile.am
@@ -37,7 +37,7 @@ FOFI_SRC = $(top_srcdir)/$(XPDF_TREE)/fofi
 XPDF_SRC = $(top_srcdir)/$(XPDF_TREE)/xpdf
 
 INCLUDES = -Igoo -Ifofi -Ixpdf -I$(GOO_SRC) -I$(FOFI_SRC) -I$(XPDF_SRC)
-AM_CPPFLAGS = $(XPDF_SELF_FLAGS)
+AM_CPPFLAGS = -DPDF_PARSER_ONLY
 
 noinst_LIBRARIES = libxpdf.a
 
diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in
index 24782dfc4ba..f70265973bd 100644
--- a/Build/source/libs/xpdf/Makefile.in
+++ b/Build/source/libs/xpdf/Makefile.in
@@ -41,8 +41,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/../../build-aux/depcomp \
 	../../build-aux/missing ../../build-aux/texinfo.tex \
 	../../build-aux/ylwrap ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -163,7 +162,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-XPDF_SELF_FLAGS = @XPDF_SELF_FLAGS@
 XPDF_TREE = @XPDF_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -220,7 +218,7 @@ GOO_SRC = $(top_srcdir)/$(XPDF_TREE)/goo
 FOFI_SRC = $(top_srcdir)/$(XPDF_TREE)/fofi
 XPDF_SRC = $(top_srcdir)/$(XPDF_TREE)/xpdf
 INCLUDES = -Igoo -Ifofi -Ixpdf -I$(GOO_SRC) -I$(FOFI_SRC) -I$(XPDF_SRC)
-AM_CPPFLAGS = $(XPDF_SELF_FLAGS)
+AM_CPPFLAGS = -DPDF_PARSER_ONLY
 noinst_LIBRARIES = libxpdf.a
 nodist_libxpdf_a_SOURCES = \
 	$(goo_libGoo_a_sources) \
diff --git a/Build/source/libs/xpdf/aclocal.m4 b/Build/source/libs/xpdf/aclocal.m4
index 15ac07208d2..542504c5f15 100644
--- a/Build/source/libs/xpdf/aclocal.m4
+++ b/Build/source/libs/xpdf/aclocal.m4
@@ -904,4 +904,3 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([../../m4/kpse-xpdf-flags.m4])
diff --git a/Build/source/libs/xpdf/configure b/Build/source/libs/xpdf/configure
index 38976579aec..1ee05068ab4 100755
--- a/Build/source/libs/xpdf/configure
+++ b/Build/source/libs/xpdf/configure
@@ -640,7 +640,6 @@ ac_includes_default="\
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 XPDF_TREE
-XPDF_SELF_FLAGS
 EGREP
 GREP
 CPP
@@ -5709,10 +5708,6 @@ _ACEOF
 fi
 
 
-
-XPDF_SELF_FLAGS=-DPDF_PARSER_ONLY
-
-
 ac_config_headers="$ac_config_headers aconf.h"
 
 
diff --git a/Build/source/libs/xpdf/configure.ac b/Build/source/libs/xpdf/configure.ac
index a465d0f0276..24d82ee2e45 100644
--- a/Build/source/libs/xpdf/configure.ac
+++ b/Build/source/libs/xpdf/configure.ac
@@ -59,10 +59,6 @@ AC_CHECK_FUNCS([popen mkstemp mkstemps])
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 
-dnl **** We need to use the same flags when building and using libxpdf.a
-
-KPSE_XPDF_SELF_FLAGS
-
 AC_CONFIG_HEADERS([aconf.h],
  [sed -e 's/^#define PACKAGE/#define XPDF_PACKAGE/' \
       -e 's/^#define VERSION/#define XPDF_VERSION/' aconf.h >aconf.tmp && mv -f aconf.tmp aconf.h])
diff --git a/Build/source/libs/xpdf/fofi/Makefile.in b/Build/source/libs/xpdf/fofi/Makefile.in
index 4ecb6a28056..74690e2506d 100644
--- a/Build/source/libs/xpdf/fofi/Makefile.in
+++ b/Build/source/libs/xpdf/fofi/Makefile.in
@@ -33,8 +33,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/hdrs.am
 subdir = fofi
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -92,7 +91,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-XPDF_SELF_FLAGS = @XPDF_SELF_FLAGS@
 XPDF_TREE = @XPDF_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
diff --git a/Build/source/libs/xpdf/goo/Makefile.in b/Build/source/libs/xpdf/goo/Makefile.in
index d1be34901a9..6dbcfa7e99e 100644
--- a/Build/source/libs/xpdf/goo/Makefile.in
+++ b/Build/source/libs/xpdf/goo/Makefile.in
@@ -33,8 +33,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/hdrs.am
 subdir = goo
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -92,7 +91,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-XPDF_SELF_FLAGS = @XPDF_SELF_FLAGS@
 XPDF_TREE = @XPDF_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
diff --git a/Build/source/libs/xpdf/xpdf/Makefile.in b/Build/source/libs/xpdf/xpdf/Makefile.in
index 1109e1a2bb6..3fc89a36d78 100644
--- a/Build/source/libs/xpdf/xpdf/Makefile.in
+++ b/Build/source/libs/xpdf/xpdf/Makefile.in
@@ -33,8 +33,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/hdrs.am
 subdir = xpdf
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -92,7 +91,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-XPDF_SELF_FLAGS = @XPDF_SELF_FLAGS@
 XPDF_TREE = @XPDF_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@