1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-11 02:50:24 +00:00
freebsd-ports/japanese/tk80/files/patch-aa
Akinori MUSHA 647743eb3c Fix up {tcl,tk}Config.sh breakage.
Submitted by:	Takeshi MUTOH <mutoh@info.nara-k.ac.jp>
Approved by:	MAINTAINER
2001-04-09 09:31:03 +00:00

71 lines
2.3 KiB
Plaintext

--- configure.in.orig Mon Apr 9 15:58:13 2001
+++ configure.in Mon Apr 9 16:00:47 2001
@@ -10,6 +10,7 @@
TK_MINOR_VERSION=0
TK_PATCH_LEVEL=".5"
VERSION=${TK_VERSION}
+TCL_L10N=jp
if test "${prefix}" = "NONE"; then
prefix=/usr/local
@@ -68,8 +69,8 @@
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
#--------------------------------------------------------------------
@@ -104,6 +105,8 @@
CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
+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
@@ -575,7 +578,11 @@
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,-S,-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
@@ -584,7 +591,7 @@
MAKE_LIB="ar cr \${TK_LIB_FILE} \${OBJS}"
fi
-DBGX='${TK_DBGX}'
+DBGX="${TK_DBGX}"
eval "TK_LIB_FILE=${TK_LIB_FILE}"
# Note: in the following variable, it's important to use the absolute
@@ -617,10 +624,12 @@
AC_SUBST(SHLIB_VERSION)
AC_SUBST(TCL_BIN_DIR)
AC_SUBST(TCL_BUILD_LIB_SPEC)
+AC_SUBST(TCL_LIB_SPEC)
AC_SUBST(TCL_DBGX)
AC_SUBST(TCL_LIB_FLAG)
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)
@@ -637,4 +646,4 @@
AC_SUBST(XLIBSW)
AC_SUBST(TK_SHARED_BUILD)
AC_SUBST(X11_IMAKE_FLAGS)
-AC_OUTPUT(Makefile tkConfig.sh)
+AC_OUTPUT(Makefile tkConfig.sh ../README.FreeBSD.JP)