work around an Autoconf bug

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

4 files changed, 14 insertions, 8 deletions

diff --git a/Build/source/libs/t1lib/ChangeLog b/Build/source/libs/t1lib/ChangeLog
index abdf48e85ca..d74d680e27c 100644
--- a/Build/source/libs/t1lib/ChangeLog
+++ b/Build/source/libs/t1lib/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Exchange role of t1lib.h and lib/t1lib/t1lib.h
+	to work around an Autoconf bug when srcdir as an absolute path.
+	Bug reported by Nikola Lecic <nikola.lecic@anthesphoria.net>.
+
 2009-12-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Check if libm is required for sqrt().
diff --git a/Build/source/libs/t1lib/Makefile.in b/Build/source/libs/t1lib/Makefile.in
index 813258c3f18..b021ac47081 100644
--- a/Build/source/libs/t1lib/Makefile.in
+++ b/Build/source/libs/t1lib/Makefile.in
@@ -53,7 +53,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/lib/t1lib/sysconf.h
-CONFIG_CLEAN_FILES = t1lib.h lib/t1lib/t1lib.h
+CONFIG_CLEAN_FILES = lib/t1lib/t1lib.h t1lib.h
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 AR = ar
@@ -304,7 +304,7 @@ $(top_srcdir)/lib/t1lib/sysconf.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_dep
 
 distclean-hdr:
 	-rm -f lib/t1lib/sysconf.h lib/t1lib/stamp-h1
-t1lib.h: $(top_builddir)/config.status 
+lib/t1lib/t1lib.h: $(top_builddir)/config.status 
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 clean-noinstLIBRARIES:
diff --git a/Build/source/libs/t1lib/configure b/Build/source/libs/t1lib/configure
index 768d67fbf94..81ba0079fce 100755
--- a/Build/source/libs/t1lib/configure
+++ b/Build/source/libs/t1lib/configure
@@ -4831,9 +4831,9 @@ if test -f $srcdir/$T1LIB_TREE/lib/t1lib/t1lib.h; then
   as_fn_error "Sorry, you must remove the file $T1LIB_TREE/lib/t1lib/t1lib.h" "$LINENO" 5
 fi
 
-ac_config_files="$ac_config_files t1lib.h:$T1LIB_TREE/lib/t1lib/t1lib.h.in"
+ac_config_files="$ac_config_files lib/t1lib/t1lib.h:$T1LIB_TREE/lib/t1lib/t1lib.h.in"
 
-ac_config_links="$ac_config_links lib/t1lib/t1lib.h:t1lib.h"
+ac_config_links="$ac_config_links t1lib.h:lib/t1lib/t1lib.h"
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -5563,8 +5563,8 @@ do
   case $ac_config_target in
     "lib/t1lib/sysconf.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/t1lib/sysconf.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "t1lib.h") CONFIG_FILES="$CONFIG_FILES t1lib.h:$T1LIB_TREE/lib/t1lib/t1lib.h.in" ;;
-    "lib/t1lib/t1lib.h") CONFIG_LINKS="$CONFIG_LINKS lib/t1lib/t1lib.h:t1lib.h" ;;
+    "lib/t1lib/t1lib.h") CONFIG_FILES="$CONFIG_FILES lib/t1lib/t1lib.h:$T1LIB_TREE/lib/t1lib/t1lib.h.in" ;;
+    "t1lib.h") CONFIG_LINKS="$CONFIG_LINKS t1lib.h:lib/t1lib/t1lib.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff --git a/Build/source/libs/t1lib/configure.ac b/Build/source/libs/t1lib/configure.ac
index f822a0bc18c..35e7d6c40fd 100644
--- a/Build/source/libs/t1lib/configure.ac
+++ b/Build/source/libs/t1lib/configure.ac
@@ -130,8 +130,8 @@ if test -f $srcdir/$T1LIB_TREE/lib/t1lib/t1lib.h; then
 fi
 
 dnl Use $T1LIB_TREE to exclude $T1LIB_TREE/lib/t1lib/t1lib.h.in from DIST_COMMON
-AC_CONFIG_FILES([t1lib.h:$T1LIB_TREE/lib/t1lib/t1lib.h.in])
-AC_CONFIG_LINKS([lib/t1lib/t1lib.h:t1lib.h])
+AC_CONFIG_FILES([lib/t1lib/t1lib.h:$T1LIB_TREE/lib/t1lib/t1lib.h.in])
+AC_CONFIG_LINKS([t1lib.h:lib/t1lib/t1lib.h])
 
 AC_CONFIG_FILES([Makefile])