mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-05 22:43:24 +00:00
78 lines
3.0 KiB
Plaintext
78 lines
3.0 KiB
Plaintext
|
--- configure.ORIG Mon Mar 10 18:11:52 1997
|
||
|
|
+++ configure Mon Mar 10 18:15:02 1997
|
||
|
|
@@ -527,7 +527,7 @@
|
||
|
|
# note when updating version numbers here, also update pkgIndex.in (see
|
||
|
|
# comments in Makefile)
|
||
|
|
EXP_MAJOR_VERSION=5
|
||
|
|
-EXP_MINOR_VERSION=22
|
||
|
|
+EXP_MINOR_VERSION=22jp
|
||
|
|
EXP_MICRO_VERSION=0
|
||
|
|
EXP_VERSION=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION
|
||
|
|
EXP_VERSION_NODOTS=$EXP_MAJOR_VERSION$EXP_MINOR_VERSION
|
||
|
|
@@ -1161,6 +1161,8 @@
|
||
|
|
# It thinks the first close brace ends the variable substitution.
|
||
|
|
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
|
||
|
|
|
||
|
|
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
|
||
|
|
+
|
||
|
|
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||
|
|
|
||
|
|
|
||
|
|
@@ -1986,7 +1988,7 @@
|
||
|
|
# this hack is cause the TCLHDIR won't print if there is a "-I" in it.
|
||
|
|
TCLHDIR="${ac_cv_c_tclh}"
|
||
|
|
TCLHDIRDASHI="-I${ac_cv_c_tclh}"
|
||
|
|
- TCL_LIBRARY=`echo $TCLHDIR | sed -e 's/generic//'`/library
|
||
|
|
+ TCL_LIBRARY=`echo $TCLHDIR | sed -e 's/generic//'`
|
||
|
|
fi
|
||
|
|
fi
|
||
|
|
|
||
|
|
@@ -5630,14 +5632,14 @@
|
||
|
|
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
|
||
|
|
else
|
||
|
|
X_PROGS="# no X support on this system"
|
||
|
|
echo "configure: warning: No X based programs will be built" 1>&2
|
||
|
|
echo " WARNING: Can't find Tk headers or library. You can still"
|
||
|
|
- echo " build expect, but not expectk. See Expect's README for"
|
||
|
|
+ echo " build expect, but not expectkjp. See Expect's README for"
|
||
|
|
echo " information on how to obtain Tk. If Tk is installed, see"
|
||
|
|
echo " Expect's INSTALL on how to tell configure where Tk is"
|
||
|
|
echo " installed."
|
||
|
|
@@ -5728,15 +5730,17 @@
|
||
|
|
EXP_LIB_VERSION=$EXP_VERSION_NODOTS
|
||
|
|
fi
|
||
|
|
|
||
|
|
-EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}"
|
||
|
|
-EXP_LIB_SPEC="-L\${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}"
|
||
|
|
-EXP_NONSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}.a
|
||
|
|
+VERSION=${EXP_LIB_VERSION}
|
||
|
|
+
|
||
|
|
+EXP_BUILD_LIB_SPEC="-L`pwd` -lexpectjp${EXP_LIB_VERSION}"
|
||
|
|
+EXP_LIB_SPEC="-L\${exec_prefix}/lib -lexpectjp${EXP_LIB_VERSION}"
|
||
|
|
+eval EXP_NONSHARED_LIB_FILE=libexpectjp${TCL_UNSHARED_LIB_SUFFIX}
|
||
|
|
|
||
|
|
echo $ac_n "checking for type of library to build""... $ac_c" 1>&6
|
||
|
|
echo "configure:5737: checking for type of library to build" >&5
|
||
|
|
-if test "$enable_shared" = "yes" && test "x${TCL_SHLIB_SUFFIX}" != "x" ; then
|
||
|
|
+if test "$enable_shared" = "yes" -a "x${TCL_SHARED_LIB_SUFFIX}" != "x" ; then
|
||
|
|
EXP_SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
|
||
|
|
- EXP_SHARED_LIB_FILE=libexpect$EXP_LIB_VERSION$TCL_SHLIB_SUFFIX
|
||
|
|
+ eval EXP_SHARED_LIB_FILE=libexpectjp${TCL_SHARED_LIB_SUFFIX}
|
||
|
|
EXP_LIB_FILE=$EXP_SHARED_LIB_FILE
|
||
|
|
EXP_LIB_FILES="$EXP_SHARED_LIB_FILE $EXP_NONSHARED_LIB_FILE"
|
||
|
|
echo "$ac_t""both shared and nonshared" 1>&6
|
||
|
|
@@ -5908,6 +5912,7 @@
|
||
|
|
s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
|
||
|
|
s%@CC@%$CC%g
|
||
|
|
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
|
||
|
|
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
|
||
|
|
s%@INSTALL_DATA@%$INSTALL_DATA%g
|
||
|
|
s%@subdirs@%$subdirs%g
|
||
|
|
s%@CPP@%$CPP%g
|