Blob Blame Raw
diff -up u4/src/Makefile.common.unbundle u4/src/Makefile.common
--- u4/src/Makefile.common.unbundle	2011-03-29 20:31:06.682285027 -0500
+++ u4/src/Makefile.common	2011-03-29 20:31:15.882001317 -0500
@@ -6,7 +6,6 @@ VERSION=1.1svn
 CSRCS=\
         lzw/hash.c \
         lzw/lzw.c \
-        unzip.c \
         $(NULL)
 
 CXXSRCS=\
diff -up u4/src/Makefile.unbundle u4/src/Makefile
--- u4/src/Makefile.unbundle	2010-12-13 16:50:58.000000000 -0600
+++ u4/src/Makefile	2011-03-29 20:23:10.861965251 -0500
@@ -15,7 +15,7 @@ FEATURES=-DHAVE_BACKTRACE=1 -DHAVE_VARIA
 DEBUGCXXFLAGS=-ggdb1 -rdynamic -g -O0 -fno-inline -fno-eliminate-unused-debug-types -gstabs -g3
 CXXFLAGS=$(FEATURES) -Wall -I. $(UIFLAGS) $(shell xml2-config --cflags) -DICON_FILE=\"$(datadir)/pixmaps/u4.bmp\" -DVERSION=\"$(VERSION)\" $(DEBUGCXXFLAGS)
 CFLAGS=$(CXXFLAGS)
-LIBS=$(UILIBS) $(shell xml2-config --libs) -lpng
+LIBS=$(UILIBS) $(shell xml2-config --libs) -lpng $(EXTRALIBS)
 INSTALL=install
 
 ifeq ($(STATIC_GCC_LIBS),true)
diff -up u4/src/u4file.cpp.unbundle u4/src/u4file.cpp
--- u4/src/u4file.cpp.unbundle	2011-03-29 20:23:10.856965406 -0500
+++ u4/src/u4file.cpp	2011-03-29 20:23:10.868965036 -0500
@@ -4,9 +4,9 @@
 
 #include <cctype>
 #include <cstdlib>
+#include <unzip.h>
 
 #include "u4file.h"
-#include "unzip.h"
 #include "debug.h"
 #ifdef MACOSX
 #include <libgen.h>