Re: building 2.99.2 release, xdvik and MacOSX

Thomas Esser <[email protected]> Mon, 8 Nov 2004 23:32:47 +0100
Newsgroups gmane.comp.tex.tetex.beta
Message-ID <[email protected]> 
> just tried to build 2.99.2 on my mac with OSX 10.3.

Besides this warning, everything else ok so far?

>   *****************************************************************
>   * Warning: Your linker does not allow multiple definitions.     *

Please, retry with the attatched patch. The file BUGS only exists in
the stand alone distribution of xdvik. I have just added it to teTeX
for the next release.

Thanks for your report!

Thomas
d (text/plain, 2.4 KB) 
diff -ru tetex-src-2.99.2.20041106-beta/texk/xdvik/aclocal.m4 tetex-src/texk/xdvik/aclocal.m4
--- tetex-src-2.99.2.20041106-beta/texk/xdvik/aclocal.m4	2004-11-06 23:59:19.000000000 +0100
+++ tetex-src/texk/xdvik/aclocal.m4	2004-11-08 23:22:06.929001206 +0100
@@ -79,7 +79,7 @@
     xdvi_ld_save_CPPFLAGS="$CPPFLAGS"
     xdvi_ld_save_LDFLAGS="$LDFLAGS"
 
-    LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
+    LIBS="$X_PRE_LIBS -lXt -lX11 $X_EXTRA_LIBS $LIBS"
     CFLAGS="$X_CFLAGS $CFLAGS"
     CPPFLAGS="$X_CFLAGS $CPPFLAGS"
     LDFLAGS="$X_LIBS $LDFLAGS"
@@ -88,7 +88,6 @@
 
     AC_TRY_LINK([
     #include <X11/Intrinsic.h>
-    ],[
     XtIntervalId
     XtAppAddTimeOut(XtAppContext app,
 		    unsigned long interval,
@@ -98,6 +97,7 @@
         (void)app; (void)interval; (void)proc; (void)closure;
         return (XtIntervalId)0;
     }
+    ],[
     ],
     xdvi_linker_multiple_defns=yes, xdvi_linker_multiple_defns=no
     )
diff -ru tetex-src-2.99.2.20041106-beta/texk/xdvik/configure tetex-src/texk/xdvik/configure
--- tetex-src-2.99.2.20041106-beta/texk/xdvik/configure	2004-11-06 23:59:58.000000000 +0100
+++ tetex-src/texk/xdvik/configure	2004-11-08 23:22:17.072512720 +0100
@@ -3625,7 +3625,7 @@
     xdvi_ld_save_CPPFLAGS="$CPPFLAGS"
     xdvi_ld_save_LDFLAGS="$LDFLAGS"
 
-    LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
+    LIBS="$X_PRE_LIBS -lXt -lX11 $X_EXTRA_LIBS $LIBS"
     CFLAGS="$X_CFLAGS $CFLAGS"
     CPPFLAGS="$X_CFLAGS $CPPFLAGS"
     LDFLAGS="$X_LIBS $LDFLAGS"
@@ -3638,9 +3638,6 @@
 #include "confdefs.h"
 
     #include <X11/Intrinsic.h>
-    
-int main() {
-
     XtIntervalId
     XtAppAddTimeOut(XtAppContext app,
 		    unsigned long interval,
@@ -3651,6 +3648,9 @@
         return (XtIntervalId)0;
     }
     
+int main() {
+
+    
 ; return 0; }
 EOF
 if { (eval echo configure:3657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff -ru tetex-src-2.99.2.20041106-beta/texk/xdvik/xdvi.h tetex-src/texk/xdvik/xdvi.h
--- tetex-src-2.99.2.20041106-beta/texk/xdvik/xdvi.h	2004-11-06 23:57:28.000000000 +0100
+++ tetex-src/texk/xdvik/xdvi.h	2004-11-07 01:31:03.000000000 +0100
@@ -992,9 +992,9 @@
  * See the comment in events.c for further explanations.
  */
 #if LD_ALLOWS_MULTIPLE_DEFINITIONS
-# define XDVI_XT_XDVI_XT_TIMER_HACK 1
+# define XDVI_XT_TIMER_HACK 1
 #else
-# define XDVI_XT_XDVI_XT_TIMER_HACK 0
+# define XDVI_XT_TIMER_HACK 0
 #endif
 
 /* globally used GUI stuff */