--- configure.in.orig Fri Oct 8 06:49:57 1999 +++ configure.in Fri Dec 10 16:25:19 1999 @@ -10,11 +10,14 @@ # note when updating version numbers here, also update pkgIndex.in (see # comments in Makefile) EXP_MAJOR_VERSION=5 -EXP_MINOR_VERSION=30 +EXP_MINOR_VERSION_PREFIX=30 +EXP_MINOR_VERSION_L10N=jp +EXP_MINOR_VERSION=$EXP_MINOR_VERSION_PREFIX$EXP_MINOR_VERSION_L10N EXP_MICRO_VERSION=1 EXP_VERSION=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION EXP_VERSION_NODOTS=$EXP_MAJOR_VERSION$EXP_MINOR_VERSION EXP_VERSION_FULL=$EXP_VERSION.$EXP_MICRO_VERSION +EXP_VERSION_PKG=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION_PREFIX.$EXP_MICRO_VERSION # Tcl's handling of shared_lib_suffix requires this symbol exist VERSION=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION @@ -24,7 +27,6 @@ dnl AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..) AC_CANONICAL_SYSTEM - AC_CONFIG_HEADER(expect_cf.h) # /bin/sh on some systems is too deficient (in particular, Ultrix 4.3 @@ -1042,9 +1044,9 @@ if test x"$no_tk" != x"true" ; then # libexpectk no longer exists # X_PROGS="expectk \$(LIBEXPECTK)" - X_PROGS=expectk + X_PROGS=expectkjp # should really generate following symbol, but I'm hitting configure's limit on substs. - X_PROGS_INSTALLED=expectk_installed + X_PROGS_INSTALLED=expectkjp_installed else X_PROGS="# no X support on this system" AC_MSG_WARN([No X based programs will be built]) @@ -1183,6 +1185,7 @@ AC_SUBST(EXP_MINOR_VERSION) AC_SUBST(EXP_MICRO_VERSION) AC_SUBST(EXP_VERSION_FULL) +AC_SUBST(EXP_VERSION_PKG) AC_SUBST(EXP_VERSION) AC_SUBST(CC) AC_SUBST(EXP_CONFIG_SHELL) @@ -1206,4 +1209,5 @@ AC_SUBST(SETUID) AC_SUBST(UNSHARED_RANLIB) AC_SUBST(DEFAULT_STTY_ARGS) +AC_SUBST(INSTALL_SCRIPT) AC_OUTPUT(Makefile pkgIndex)