Hi,
I'm going to upload a tix NMU tomorrow noon, here is the interdiff.
Michael
--
Michael Banck
Debian Developer
[EMAIL PROTECTED]
http://www.advogato.org/person/mbanck/diary.html
diff -u tix-8.4.0/configure tix-8.4.0/configure
--- tix-8.4.0/configure
+++ tix-8.4.0/configure
@@ -6615,7 +6615,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -6642,7 +6642,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Xlib.h"; then
+ if test -r "$ac_dir/X11/Intrinsic.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -6656,18 +6656,18 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lX11 $LIBS"
+ LIBS="-lXt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
int
main ()
{
-XrmInitialize ()
+XtMalloc (0)
;
return 0;
}
@@ -6705,7 +6705,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
- if test -r $ac_dir/libX11.$ac_extension; then
+ if test -r $ac_dir/libXt.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
fi
@@ -8917,12 +8917,15 @@
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
+ # following line added by CW for Debian GNU/Hurd
+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
+
if test "$have_dl" = yes; then
SHLIB_LD="${CC} -shared"
- DL_OBJS=""
+ DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
- LD_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS="${CC_SEARCH_FLAGS}"
else
if test "${ac_cv_header_dld_h+set}" = set; then
echo "$as_me:$LINENO: checking for dld.h" >&5
@@ -9063,7 +9066,7 @@
if test $ac_cv_header_dld_h = yes; then
SHLIB_LD="ld -shared"
- DL_OBJS=""
+ DL_OBJS="tclLoadDld.o"
DL_LIBS="-ldld"
LD_SEARCH_FLAGS=""
fi
diff -u tix-8.4.0/tclconfig/tcl.m4 tix-8.4.0/tclconfig/tcl.m4
--- tix-8.4.0/tclconfig/tcl.m4
+++ tix-8.4.0/tclconfig/tcl.m4
@@ -1264,16 +1264,19 @@
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
+ # following line added by CW for Debian GNU/Hurd
+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
+
if test "$have_dl" = yes; then
SHLIB_LD="${CC} -shared"
- DL_OBJS=""
+ DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
- LD_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS="${CC_SEARCH_FLAGS}"
else
AC_CHECK_HEADER(dld.h, [
SHLIB_LD="ld -shared"
- DL_OBJS=""
+ DL_OBJS="tclLoadDld.o"
DL_LIBS="-ldld"
LD_SEARCH_FLAGS=""])
fi
diff -u tix-8.4.0/debian/changelog tix-8.4.0/debian/changelog
--- tix-8.4.0/debian/changelog
+++ tix-8.4.0/debian/changelog
@@ -1,3 +1,12 @@
+tix (8.4.0-4.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Applied patch by Petr Salinger to fix shared library building on
+ GNU/kFreeBSD and GNU/Hurd (closes: #366266, #374623).
+ * Rerun aclocal and autoconf.
+
+ -- Michael Banck <[EMAIL PROTECTED]> Mon, 26 Jun 2006 18:49:10 +0200
+
tix (8.4.0-4.1) unstable; urgency=low
* Non-maintainer upload.
