1999-04-02 02:38:05 +00:00
--- configure.in.ORIG Wed Mar 24 11:32:28 1999
+++ configure.in Wed Mar 24 11:32:37 1999
1998-09-28 15:15:11 +00:00
@@ -10,6 +10,7 @@
1998-05-10 08:11:44 +00:00
TK_MINOR_VERSION=0
1999-04-02 02:38:05 +00:00
TK_PATCH_LEVEL=".5"
1998-05-10 08:11:44 +00:00
VERSION=${TK_VERSION}
+TCL_L10N=jp
if test "${prefix}" = "NONE"; then
prefix=/usr/local
1999-04-02 02:38:05 +00:00
@@ -68,8 +69,8 @@
1998-05-10 08:11:44 +00:00
if test ! -d $TCL_BIN_DIR; then
AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR doesn't exist)
fi
-if test ! -f $TCL_BIN_DIR/Makefile; then
- AC_MSG_ERROR(There's no Makefile in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?)
+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
+ AC_MSG_ERROR(There's no tclConfig.sh in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?)
fi
#--------------------------------------------------------------------
1999-04-02 02:38:05 +00:00
@@ -104,6 +105,8 @@
1998-09-28 15:15:11 +00:00
CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
1999-04-02 02:38:05 +00:00
EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
1998-05-10 08:11:44 +00:00
+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
+
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
# If Tcl and Tk are installed in different places, adjust the library
1999-04-02 02:38:05 +00:00
@@ -564,7 +567,11 @@
1998-09-28 15:15:11 +00:00
TK_SHARED_BUILD=1
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
+ if test "X$PORTOBJFORMAT" = "Xelf"; then
+ MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} -Wl,-soname,\${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+ else
MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+ fi
RANLIB=":"
else
TK_SHARED_BUILD=0
1999-04-02 02:38:05 +00:00
@@ -606,10 +613,12 @@
1998-05-10 08:11:44 +00:00
AC_SUBST(SHLIB_VERSION)
AC_SUBST(TCL_BIN_DIR)
AC_SUBST(TCL_BUILD_LIB_SPEC)
+AC_SUBST(TCL_LIB_SPEC)
1998-09-28 15:15:11 +00:00
AC_SUBST(TCL_DBGX)
AC_SUBST(TCL_LIB_FLAG)
1998-05-10 08:11:44 +00:00
AC_SUBST(TCL_SRC_DIR)
AC_SUBST(TCL_VERSION)
+AC_SUBST(TCL_L10N)
AC_SUBST(TK_BUILD_LIB_SPEC)
AC_SUBST(TK_CC_SEARCH_FLAGS)
AC_SUBST(TK_LD_SEARCH_FLAGS)