--- vcl/util/makefile.mk.~1.47.10.2.28.2.~ Fri Aug 13 11:57:38 2004 +++ vcl/util/makefile.mk Tue Oct 19 20:46:04 2004 @@ -299,20 +299,23 @@ SHL1STDLIBS += -lXp -lXext -lSM -lICE -lX11 .ELSE .IF "$(USE_XINERAMA)" != "NO" + +.IF "$(OS)"=="MACOSX" +SHL1STDLIBS += -lXinerama +.ELSE + .IF "$(XINERAMA_LINK)" == "dynamic" SHL1STDLIBS += -lXinerama .ELSE -SHL1STDLIBS += -Wl,-Bstatic -lXinerama -Wl,-Bdynamic +SHL1STDLIBS += -Wl,-static -lXinerama -Wl,-dynamic .ENDIF # $(XINERAMA_LINK) + +.ENDIF # "$(OS)"!="MACOSX" .ENDIF # $(USE_XINERAMA) SHL1STDLIBS += -lXext -lSM -lICE -lX11 .ENDIF # "$(USE_XPRINT)" == "TRUE" .ENDIF # "$(OS)"=="SOLARIS" .ENDIF # "$(GUIBASE)"=="unx" - -.IF "$(OS)"=="MACOSX" -SHL1STDLIBS += -lXinerama -.ENDIF .IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" # some nas versions need -lXt, too