summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-01-06 02:22:44 (GMT)
committerhobbs <hobbs>2000-01-06 02:22:44 (GMT)
commit6dd6f78acaf07d5c334e15e375e24db54641a0da (patch)
tree3b709770edab9af16d5084f68a9916ed83254364
parent4c5f4740437cc555ba6eefb29fa68171dbcf517f (diff)
downloadtk-6dd6f78acaf07d5c334e15e375e24db54641a0da.zip
tk-6dd6f78acaf07d5c334e15e375e24db54641a0da.tar.gz
tk-6dd6f78acaf07d5c334e15e375e24db54641a0da.tar.bz2
* unix/Makefile.in: added unix/aclocal.m4 to distribution [Bug: 3938]
* unix/aclocal.m4: changed NetBSD SHLIB_CFLAGS from -fpic to -fPIC
-rw-r--r--unix/Makefile.in3
-rw-r--r--unix/aclocal.m43
2 files changed, 4 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index a7af472..d0dda46 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.35 1999/12/13 23:03:36 wart Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.36 2000/01/06 02:22:44 hobbs Exp $
# Current Tk version; used in various names.
@@ -930,6 +930,7 @@ dist: $(UNIX_DIR)/configure
cp $(TOP_DIR)/license.terms $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix
chmod 664 $(DISTDIR)/unix/Makefile.in
cp $(UNIX_DIR)/configure $(UNIX_DIR)/configure.in \
+ $(UNIX_DIR)/aclocal.m4 \
$(UNIX_DIR)/tkConfig.sh.in $(TCLDIR)/unix/install-sh \
$(UNIX_DIR)/porting.notes $(UNIX_DIR)/porting.old \
$(UNIX_DIR)/README $(DISTDIR)/unix
diff --git a/unix/aclocal.m4 b/unix/aclocal.m4
index 317d2a9..1575806 100644
--- a/unix/aclocal.m4
+++ b/unix/aclocal.m4
@@ -732,7 +732,8 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*)
# Not available on all versions: check for include file.
AC_CHECK_HEADER(dlfcn.h, [
- SHLIB_CFLAGS="-fpic"
+ # NetBSD/SPARC needs -fPIC, -fpic will not do.
+ SHLIB_CFLAGS="-fPIC"
SHLIB_LD="ld -Bshareable -x"
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"