]>
Commit | Line | Data |
---|---|---|
87217da6 JB |
1 | --- vigra1.3.2/config/configure.in.orig 2005-01-27 21:06:04.000000000 +0100 |
2 | +++ vigra1.3.2/config/configure.in 2005-04-03 00:07:14.930618800 +0200 | |
3 | @@ -38,7 +38,7 @@ | |
4 | prefix=`pwd` | |
5 | fi | |
fde58f7f | 6 | |
87217da6 JB |
7 | -AC_CONFIG_AUX_DIR($vigra_srcdir/config) |
8 | +AC_CONFIG_AUX_DIR(config) | |
fde58f7f JB |
9 | |
10 | dnl------------------------------------------------------------------- | |
87217da6 JB |
11 | dnl compiler and platform configuration |
12 | @@ -48,9 +48,6 @@ | |
13 | dnl AC_CYGWIN seems to be part of AC_CANONICAL_SYSTEM | |
14 | dnl AC_MINGW32 seems to be part of AC_CANONICAL_SYSTEM | |
fde58f7f JB |
15 | |
16 | -CFLAGS=-O | |
17 | -CXXFLAGS=-O | |
18 | - | |
19 | 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]) | |
20 | 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]) | |
21 | ||
87217da6 JB |
22 | --- vigra1.3.2/src/impex/Makefile.in.orig 2004-11-09 11:40:31.000000000 +0100 |
23 | +++ vigra1.3.2/src/impex/Makefile.in 2005-04-03 00:12:44.739480232 +0200 | |
24 | @@ -21,7 +21,7 @@ | |
fde58f7f JB |
25 | all: $(TARGET) |
26 | ||
27 | $(TARGET): $(OBJS) | |
28 | - $(LINKCXXLIB) -version-info 2:$(MAJOR_VERSION)$(MINOR_VERSION)$(MICRO_VERSION):0 -o $(TARGET) $(OBJS) | |
29 | + $(LINKCXXLIB) -version-info 2:$(MAJOR_VERSION)$(MINOR_VERSION)$(MICRO_VERSION):0 -o $(TARGET) $(OBJS) $(IMPEX_DEPLIBS) | |
30 | ||
31 | install: all | |
32 | $(INSTALL) -d $(libdir) |