[tex-live] location of t1* binaries
Thomas Esser
te at dbs.uni-hannover.de
Tue Oct 5 20:09:52 CEST 2004
On Tue, Oct 05, 2004 at 07:57:55AM +0200, Thomas Esser wrote:
> > First off, I'm happy to do this, and I'm happy to make the -lkpathsea
> > change you mentioned to lcdf-typetools configure.
>
> Ok, thanks. I'll send you the promissed patch later...
Now, attatched to this mail.
> > But why aren't you just passing t1utils ./configure a '--bindir'
> > option??
>
> Sounds like a good idea. I'll check...
Seems to work, so I think that I don't need this any more.
Thomas
-------------- next part --------------
--- configure.in.orig 2004-09-18 02:19:48.000000000 +0200
+++ configure.in 2004-10-05 20:05:40.102403000 +0200
@@ -129,26 +129,40 @@
KPSEINTERFACE_O=
LIBKPATHSEA=
else
- if test "x$kpathsea" != x -a "x$kpathsea" != xyes; then
- CPPFLAGS="$CPPFLAGS -I$kpathsea/include"
- LDFLAGS="$LDFLAGS -L$kpathsea/lib"
+ if test -d ../../texk/kpathsea; then
+ local_src_kpse=yes
else
- kpathsea=yes
+ local_src_kpse=no
fi
- dnl check for kpathsea/kpathsea.h
- AC_CHECK_HEADER(kpathsea/kpathsea.h, [kpse_header=yes], [kpse_header=no])
-
- dnl if not found and kpathsea prefix not set, check /usr/local
- if test "x$kpse_header" != xyes -a "x$kpathsea" = xyes -a -r /usr/local/include/kpathsea/tex-file.h; then
- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- LDFLAGS="$LDFLAGS -L/usr/local/lib"
- AC_CHECK_HEADER(kpathsea/tex-file.h, [kpse_header=yes], [kpse_header=no])
+ if test "x$local_src_kpse" = xyes; then
+ CPPFLAGS="$CPPFLAGS -I../../../texk -I\$(srcdir)/../../../texk"
+ LIBKPATHSEA=../../../texk/kpathsea/.libs/libkpathsea.a
+ kpse_header=yes
+ kpse_library=yes
+ else
+ if test "x$kpathsea" != x -a "x$kpathsea" != xyes; then
+ CPPFLAGS="$CPPFLAGS -I$kpathsea/include"
+ LDFLAGS="$LDFLAGS -L$kpathsea/lib"
+ else
+ kpathsea=yes
+ fi
+
+ dnl check for kpathsea/kpathsea.h
+ AC_CHECK_HEADER(kpathsea/kpathsea.h, [kpse_header=yes], [kpse_header=no])
+
+ dnl if not found and kpathsea prefix not set, check /usr/local
+ if test "x$kpse_header" != xyes -a "x$kpathsea" = xyes -a -r /usr/local/include/kpathsea/tex-file.h; then
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
+ AC_CHECK_HEADER(kpathsea/tex-file.h, [kpse_header=yes], [kpse_header=no])
+ fi
+
+ dnl check for -lkpathsea
+ AC_CHECK_LIB(kpathsea, kpse_set_program_name, [kpse_library=yes], [kpse_library=no])
+ LIBKPATHSEA='-lkpathsea'
fi
- dnl check for -lkpathsea
- AC_CHECK_LIB(kpathsea, kpse_set_program_name, [kpse_library=yes], [kpse_library=no])
-
dnl bail out if not found
if test "x$kpse_header" != xyes -o "x$kpse_library" != xyes; then
AC_MSG_ERROR([
@@ -165,14 +179,13 @@
dnl OK, found
AC_DEFINE(HAVE_KPATHSEA, 1, [Define if you want to use kpathsea.])
KPSEINTERFACE_O='kpseinterface.$(OBJEXT)'
- LIBKPATHSEA='-lkpathsea'
fi
AC_SUBST([KPSEINTERFACE_O])
AC_SUBST([LIBKPATHSEA])
AC_ARG_ENABLE(selfauto-set, [ --disable-selfauto-set disable setting SELFAUTO variables from kpsewhich], :, enable_selfauto_set=yes)
-if test "x$enable_selfauto_set" = xyes -a "x$kpathsea" != xno; then
+if test "x$enable_selfauto_set" = xyes -a "x$kpathsea" != xno -a "x$local_src_kpse" != xyes; then
kpsewhich='kpsewhich'
test "x$kpathsea" != xyes -a -x "$kpathsea/bin/kpsewhich" && kpsewhich="$kpathsea/bin/kpsewhich"
SELFAUTOLOC=`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null`
More information about the tex-live
mailing list