--- vigra1.2.0/config/configure.in.orig	2003-08-07 02:16:14.000000000 +0200
+++ vigra1.2.0/config/configure.in	2004-03-15 23:57:47.256624568 +0100
@@ -1,18 +1,7 @@
 AC_INIT(include/vigra/config.hxx)
 
-AC_PREFIX_DEFAULT([`pwd`])
 vigra_srcdir=`pwd`
 vigra_builddir=`pwd`
-
-# expand prefix and exec_prefix
-if test "x$prefix" = "xNONE" ; then
-    prefix=$ac_default_prefix
-elif test "x$prefix" = "x." ; then
-    prefix=`pwd`
-fi
-
-VIGRA_DOCDIR_DEFAULT(['${prefix}/doc/vigra'])
-
 AC_CONFIG_AUX_DIR(config)
 
 dnl-------------------------------------------------------------------
@@ -23,9 +23,6 @@
 AC_CYGWIN
 AC_MINGW32
 
-CFLAGS=-O
-CXXFLAGS=-O
-
 AC_ARG_WITH( cc, AC_HELP_STRING([--with-cc], [your C compiler (default=gcc)]), CC=$with_cc, [if test "x$CC" = "x" ; then CC=gcc ; fi])
 AC_ARG_WITH( cxx, AC_HELP_STRING([--with-cxx], [your C++ compiler (default=g++)]), CXX=$with_cxx, [if test "x$CXX" = "x" ; then CXX=g++ ; fi])
 
--- vigra1.2.0/src/impex/Makefile.orig	2003-06-27 02:02:39.000000000 +0200
+++ vigra1.2.0/src/impex/Makefile	2004-03-16 00:14:51.531911056 +0100
@@ -19,7 +19,7 @@
 all: $(TARGET)
 
 $(TARGET): $(OBJS)
-	$(LINKCXXLIB) -version-info 2:$(MAJOR_VERSION)$(MINOR_VERSION)$(MICRO_VERSION):0 -o $(TARGET) $(OBJS)
+	$(LINKCXXLIB) -version-info 2:$(MAJOR_VERSION)$(MINOR_VERSION)$(MICRO_VERSION):0 -o $(TARGET) $(OBJS) $(IMPEX_DEPLIBS)
 
 install: all
 	$(INSTALL) -d $(libdir)