Index: GDALmake.opt.in
===================================================================
--- GDALmake.opt.in	(revision 12593)
+++ GDALmake.opt.in	(working copy)
@@ -38,7 +38,7 @@
 
 # SDE_LIB needs to be first because it embeds zlib.  We need to use its symbols instead of -lz's
 
-LIBS	=	$(SDE_LIB) @LIBS@ $(DWG_LIBS) $(CURL_LIB)
+LIBS	=	$(SDE_LIB) @LIBS@ $(KAK_LIBS) $(DWG_LIBS) $(CURL_LIB)
 
 PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_LIBS = @PYTHON_LIBS@
@@ -177,6 +177,26 @@
 #
 KAKDIR = @KAKDIR@
 
+ifneq (($KAKDIR),)
+ifeq ($(HAVE_LIBTOOL),yes)
+KAK_LIBS = \
+    $(KAKDIR)/apps/make/args.o \
+    $(KAKDIR)/apps/make/image_in.o \
+	$(KAKDIR)/apps/make/image_out.o \
+    $(KAKDIR)/apps/make/jp2.o \
+	$(KAKDIR)/apps/make/mj2.o \
+    $(KAKDIR)/apps/make/palette.o \
+	$(KAKDIR)/apps/make/roi_sources.o \
+	$(KAKDIR)/apps/make/kdu_stripe_decompressor.o \
+    $(KAKDIR)/apps/make/kdu_tiff.o \
+    $(KAKDIR)/apps/make/jpx.o
+else
+KAK_LIBS = 
+endif # HAVE_LIBTOOL
+else
+KAK_LIBS = 
+endif
+
 #
 # JPEG-2000 Support via JasPer library.
 #