Overview
| Comment: | Updated to latest autoconf macros |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
66b966ddc3f286bdc194101963108c46 |
| User & Date: | rkeene on 2014-12-13 22:52:03.735 |
| Other Links: | manifest | tags |
Context
|
2014-12-13
| ||
| 23:02 | Updated to only update remote files if requested check-in: 9e821bdcac user: rkeene tags: trunk | |
| 22:52 | Updated to latest autoconf macros check-in: 66b966ddc3 user: rkeene tags: trunk | |
| 22:51 | Updated ignores check-in: fd2c314964 user: rkeene tags: trunk | |
Changes
Modified aclocal/shobj.m4
from [2c7adb586d]
to [9a0374cc5c].
1 2 3 | dnl Usage: dnl DC_TEST_SHOBJFLAGS(shobjflags, shobjldflags, action-if-not-found) dnl | | > > > > > > > > | | | > > | | > > | > > > | | | | | | | | | | | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > | | > | | | | | | | | | > > > > > | | > > > > > | | > > > > > > > > > > > > > | > > > | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 |
dnl Usage:
dnl DC_TEST_SHOBJFLAGS(shobjflags, shobjldflags, action-if-not-found)
dnl
AC_DEFUN([DC_TEST_SHOBJFLAGS], [
AC_SUBST(SHOBJFLAGS)
AC_SUBST(SHOBJCPPFLAGS)
AC_SUBST(SHOBJLDFLAGS)
OLD_LDFLAGS="$LDFLAGS"
OLD_CFLAGS="$CFLAGS"
OLD_CPPFLAGS="$CPPFLAGS"
SHOBJFLAGS=""
SHOBJCPPFLAGS=""
SHOBJLDFLAGS=""
CFLAGS="$OLD_CFLAGS $1"
CPPFLAGS="$OLD_CPPFLAGS $2"
LDFLAGS="$OLD_LDFLAGS $3"
AC_TRY_LINK([#include <stdio.h>
int unrestst(void);], [ printf("okay\n"); unrestst(); return(0); ], [ SHOBJFLAGS="$1"; SHOBJCPPFLAGS="$2"; SHOBJLDFLAGS="$3" ], [
LDFLAGS="$OLD_LDFLAGS"
CFLAGS="$OLD_CFLAGS"
CPPFLAGS="$OLD_CPPFLAGS"
$4
])
LDFLAGS="$OLD_LDFLAGS"
CFLAGS="$OLD_CFLAGS"
CPPFLAGS="$OLD_CPPFLAGS"
])
AC_DEFUN([DC_GET_SHOBJFLAGS], [
AC_SUBST(SHOBJFLAGS)
AC_SUBST(SHOBJCPPFLAGS)
AC_SUBST(SHOBJLDFLAGS)
DC_CHK_OS_INFO
AC_MSG_CHECKING(how to create shared objects)
if test -z "$SHOBJFLAGS" -a -z "$SHOBJLDFLAGS" -a -z "$SHOBJCPPFLAGS"; then
DC_TEST_SHOBJFLAGS([-fPIC], [-DPIC], [-shared -rdynamic], [
DC_TEST_SHOBJFLAGS([-fPIC], [-DPIC], [-shared], [
DC_TEST_SHOBJFLAGS([-fPIC], [-DPIC], [-shared -rdynamic -mimpure-text], [
DC_TEST_SHOBJFLAGS([-fPIC], [-DPIC], [-shared -mimpure-text], [
DC_TEST_SHOBJFLAGS([-fPIC], [-DPIC], [-shared -rdynamic -Wl,-G,-z,textoff], [
DC_TEST_SHOBJFLAGS([-fPIC], [-DPIC], [-shared -Wl,-G], [
DC_TEST_SHOBJFLAGS([-fPIC], [-DPIC], [-shared -dynamiclib -flat_namespace -undefined suppress -bind_at_load], [
DC_TEST_SHOBJFLAGS([-fPIC], [-DPIC], [-dynamiclib -flat_namespace -undefined suppress -bind_at_load], [
DC_TEST_SHOBJFLAGS([-fPIC], [-DPIC], [-Wl,-dynamiclib -Wl,-flat_namespace -Wl,-undefined,suppress -Wl,-bind_at_load], [
DC_TEST_SHOBJFLAGS([-fPIC], [-DPIC], [-dynamiclib -flat_namespace -undefined suppress], [
DC_TEST_SHOBJFLAGS([-fPIC], [-DPIC], [-dynamiclib], [
AC_MSG_RESULT(cant)
AC_MSG_ERROR([We are unable to make shared objects.])
])
])
])
])
])
])
])
])
])
])
])
fi
AC_MSG_RESULT($SHOBJCPPFLAGS $SHOBJFLAGS $SHOBJLDFLAGS)
DC_SYNC_SHLIBOBJS
])
AC_DEFUN([DC_SYNC_SHLIBOBJS], [
AC_SUBST(SHLIBOBJS)
SHLIBOBJS=""
for obj in $LIB@&t@OBJS; do
SHLIBOBJS="$SHLIBOBJS `echo $obj | sed 's/\.o$/_shr.o/g'`"
done
])
AC_DEFUN([DC_SYNC_RPATH], [
OLD_LDFLAGS="$LDFLAGS"
for tryrpath in "-Wl,-rpath" "-Wl,--rpath" "-Wl,-R"; do
LDFLAGS="$OLD_LDFLAGS $tryrpath -Wl,/tmp"
AC_LINK_IFELSE(AC_LANG_PROGRAM([], [ return(0); ]), [
rpathldflags="$tryrpath"
break
])
done
unset tryrpath
LDFLAGS="$OLD_LDFLAGS"
unset OLD_LDFLAGS
ADDLDFLAGS=""
for opt in $LDFLAGS; do
if echo "$opt" | grep '^-L' >/dev/null; then
rpathdir=`echo "$opt" | sed 's@^-L *@@'`
ADDLDFLAGS="$ADDLDFLAGS $rpathldflags -Wl,$rpathdir"
fi
done
unset opt rpathldflags
LDFLAGS="$LDFLAGS $ADDLDFLAGS"
unset ADDLDFLAGS
])
AC_DEFUN([DC_CHK_OS_INFO], [
AC_CANONICAL_HOST
AC_SUBST(SHOBJEXT)
AC_SUBST(SHOBJFLAGS)
AC_SUBST(SHOBJCPPFLAGS)
AC_SUBST(SHOBJLDFLAGS)
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(AREXT)
if test "$dc_cv_dc_chk_os_info_called" != '1'; then
dc_cv_dc_chk_os_info_called='1'
AC_MSG_CHECKING(host operating system)
AC_MSG_RESULT($host_os)
SHOBJEXT="so"
AREXT="a"
case $host_os in
darwin*)
SHOBJEXT="dylib"
;;
hpux*)
case "$host_cpu" in
ia64)
SHOBJEXT="so"
;;
*)
SHOBJEXT="sl"
;;
esac
;;
aix[0-9].*)
SHOBJEXT="a"
;;
mingw32|mingw32msvc*)
SHOBJEXT="dll"
CFLAGS="$CFLAGS -mms-bitfields"
CPPFLAGS="$CPPFLAGS -mms-bitfields"
SHOBJCPPFLAGS="-DPIC"
SHOBJLDFLAGS='-shared -Wl,--dll -Wl,--enable-auto-image-base -Wl,--output-def,$[@].def,--out-implib,$[@].a'
;;
msvc)
SHOBJEXT="dll"
CFLAGS="$CFLAGS -nologo"
SHOBJCPPFLAGS='-DPIC'
SHOBJLDFLAGS='/LD /LINK /NODEFAULTLIB:MSVCRT'
;;
cygwin*)
SHOBJEXT="dll"
SHOBJFLAGS="-fPIC"
SHOBJCPPFLAGS="-DPIC"
CFLAGS="$CFLAGS -mms-bitfields"
CPPFLAGS="$CPPFLAGS -mms-bitfields"
SHOBJLDFLAGS='-shared -Wl,--enable-auto-image-base -Wl,--output-def,$[@].def,--out-implib,$[@].a'
;;
esac
fi
])
AC_DEFUN(SHOBJ_SET_SONAME, [
SAVE_LDFLAGS="$LDFLAGS"
AC_MSG_CHECKING([how to specify soname])
for try in "-Wl,--soname,$1" "Wl,-install_name,$1" '__fail__'; do
LDFLAGS="$SAVE_LDFLAGS"
if test "${try}" = '__fail__'; then
AC_MSG_RESULT([can't])
break
fi
LDFLAGS="${LDFLAGS} ${try}"
AC_TRY_LINK([void TestTest(void) { return; }], [], [
LDFLAGS="${SAVE_LDFLAGS}"
SHOBJLDFLAGS="${SHOBJLDFLAGS} ${try}"
AC_MSG_RESULT([$try])
break
])
done
AC_SUBST(SHOBJLDFLAGS)
])
|
Modified aclocal/tcl.m4
from [7c92d40f9e]
to [7fd1e39b5f].
1 2 3 | dnl Tcl M4 Routines dnl Must call AC_CANONICAL_HOST before calling us | | | 1 2 3 4 5 6 7 8 9 10 11 | dnl Tcl M4 Routines dnl Must call AC_CANONICAL_HOST before calling us AC_DEFUN([TCLEXT_FIND_TCLCONFIG], [ AC_MSG_CHECKING([for path to tclConfig.sh]) TCLCONFIGPATH="" AC_ARG_WITH([tcl], AS_HELP_STRING([--with-tcl], [directory containing tcl configuration (tclConfig.sh)]), [ if test "x$withval" = "xno"; then AC_MSG_ERROR([cant build without tcl]) fi |
| ︙ | ︙ | |||
21 22 23 24 25 26 27 28 29 30 31 32 33 | done ]) if test -z "$TCLCONFIGPATH"; then AC_MSG_ERROR([unable to locate tclConfig.sh. Try --with-tcl.]) fi AC_SUBST(TCLCONFIGPATH) AC_MSG_RESULT([$TCLCONFIGPATH]) ]) dnl Must define TCLCONFIGPATH before calling us (i.e., by TCLEXT_FIND_TCLCONFIG) | > > > > > > > > > > > > > > > > | | < > > > > > > > > | | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 |
done
])
if test -z "$TCLCONFIGPATH"; then
AC_MSG_ERROR([unable to locate tclConfig.sh. Try --with-tcl.])
fi
for try_tclsh in "$TCLCONFIGPATH/../bin/tclsh" \
"$TCLCONFIGPATH/../bin/tclsh8.6" \
"$TCLCONFIGPATH/../bin/tclsh8.5" \
"$TCLCONFIGPATH/../bin/tclsh8.4" \
`which tclsh 2>/dev/null` \
`which tclsh8.6 2>/dev/null` \
`which tclsh8.5 2>/dev/null` \
`which tclsh8.4 2>/dev/null` \
tclsh; do
if test -x "$try_tclsh"; then
break
fi
done
TCLSH_PROG="${try_tclsh}"
AC_SUBST(TCLCONFIGPATH)
AC_SUBST(TCLSH_PROG)
AC_MSG_RESULT([$TCLCONFIGPATH])
])
dnl Must define TCLCONFIGPATH before calling us (i.e., by TCLEXT_FIND_TCLCONFIG)
AC_DEFUN([TCLEXT_LOAD_TCLCONFIG], [
AC_MSG_CHECKING([for working tclConfig.sh])
if test -f "$TCLCONFIGPATH/tclConfig.sh"; then
. "$TCLCONFIGPATH/tclConfig.sh"
else
AC_MSG_ERROR([unable to load tclConfig.sh])
fi
AC_MSG_RESULT([found])
])
AC_DEFUN([TCLEXT_INIT], [
AC_CANONICAL_HOST
TCLEXT_FIND_TCLCONFIG
TCLEXT_LOAD_TCLCONFIG
AC_DEFINE_UNQUOTED([MODULE_SCOPE], [static], [Define how to declare a function should only be visible to the current module])
AC_ARG_ENABLE([stubs], AS_HELP_STRING([--disable-stubs], [disable use of Tcl stubs]), [
if test "$enableval" = "no"; then
TCL_SUPPORTS_STUBS=0
else
TCL_SUPPORTS_STUBS=1
fi
])
if test "$TCL_SUPPORTS_STUBS" = "1"; then
AC_DEFINE([USE_TCL_STUBS], [1], [Define if you are using the Tcl Stubs Mechanism])
TCL_STUB_LIB_SPEC="`eval echo "${TCL_STUB_LIB_SPEC}"`"
LIBS="${LIBS} ${TCL_STUB_LIB_SPEC}"
else
TCL_LIB_SPEC="`eval echo "${TCL_LIB_SPEC}"`"
LIBS="${LIBS} ${TCL_LIB_SPEC}"
fi
TCL_INCLUDE_SPEC="`eval echo "${TCL_INCLUDE_SPEC}"`"
CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC}"
CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC}"
DEFS="${DEFS} ${TCL_DEFS}"
dnl Needed for package installation
TCL_PACKAGE_PATH="`echo "${TCL_PACKAGE_PATH}" | sed 's@ *$''@@' | awk '{ print [$]1 }'`"
AC_SUBST(TCL_PACKAGE_PATH)
AC_SUBST(LIBS)
])
|
Modified build/autogen.sh
from [01ca528618]
to [3d66c1a312].
1 2 3 4 5 6 7 | #! /bin/bash cat aclocal/*.m4 > aclocal.m4 || exit 1 autoconf || exit 1 rm -rf autom4te.cache/ exit 0 | > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 |
#! /bin/bash
(
mkdir aclocal >/dev/null 2>/dev/null
cd aclocal || exit 1
for file in shobj.m4 tcl.m4; do
rm -f "${file}"
wget -O "${file}.new" "http://rkeene.org/devel/autoconf/${file}" || continue
mv "${file}.new" "${file}"
done
)
cat aclocal/*.m4 > aclocal.m4 || exit 1
autoconf || exit 1
rm -rf autom4te.cache/
exit 0
|