Permalink
Browse files

update configure system

  • Loading branch information...
jcupitt committed Jan 23, 2013
1 parent b3c16b6 commit 90709538e62d8575220929a02f62446058699247
370 INSTALL

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -11,7 +11,7 @@ AC_PREREQ(2.62)
# and missing INSTALL (the standard Gnu INSTALL is not very useful)
AM_INIT_AUTOMAKE([-Wno-portability foreign])
AM_CONFIG_HEADER(config.h)
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4])
# user-visible library versioning
@@ -33,4 +33,4 @@ libarithmetic_la_SOURCES = \
math2.c \
round.c
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -24,4 +24,4 @@ endif
# used by the final libvips link rather than us
EXTRA_DIST = dummy2.cc
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS += -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -30,4 +30,4 @@ libcolour_la_SOURCES = \
XYZ2scRGB.c \
scRGB2sRGB.c
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -39,4 +39,4 @@ libconversion_la_SOURCES = \
im_wrap.c \
im_zoom.c
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -14,4 +14,4 @@ libconvolution_la_SOURCES = \
im_sharpen.c \
im_spcor.c
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -72,4 +72,4 @@ libdeprecated_la_SOURCES = \
radiance.c \
raw.c
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -56,5 +56,5 @@ libforeign_la_SOURCES = \
EXTRA_DIST =
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -14,4 +14,4 @@ libfreq_filt_la_SOURCES = \
im_invfftr.c \
im_rotquad.c
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -22,4 +22,4 @@ libhistograms_lut_la_SOURCES = \
im_stdif.c \
tone.c
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -13,4 +13,4 @@ libinplace_la_SOURCES = \
im_draw_smudge.c \
inplace_dispatch.c
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -33,7 +33,7 @@ libiofuncs_la_SOURCES = \
EXTRA_DIST = enumtemplate
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
# the headers we scan for enums etc.
# keep in sync with ../include/vips/Makefile.am
@@ -10,4 +10,4 @@ libmorphology_la_SOURCES = \
im_label_regions.c \
im_profile.c
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -23,4 +23,4 @@ libmosaicing_la_SOURCES = \
global_balance.h \
mosaic.h
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -9,4 +9,4 @@ libother_la_SOURCES = \
im_zone.c \
other_dispatch.c
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -39,4 +39,4 @@ endif
noinst_LTLIBRARIES = libresample.la
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -5,4 +5,4 @@ libvideo_la_SOURCES = \
im_video_v4l1.c \
im_video_test.c
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
@@ -1,7 +1,7 @@
SUBDIRS = \
include
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/libvips/include \
-I$(top_srcdir)/libvipsCC/include \
@VIPS_CFLAGS@
@@ -1,6 +1,6 @@
# Let make substitute the value of PYTHON_INCLUDES rather than auto*
# this makes it easier to support multiple python installs
INCLUDES = \
AM_CPPFLAGS = \
-I${top_srcdir}/libvips/include \
-I${top_srcdir}/libvipsCC/include \
@VIPS_CFLAGS@ \
@@ -13,7 +13,7 @@ vipsthumbnail_SOURCES = vipsthumbnail.c
find_mosaic_SOURCES = find_mosaic.c
mergeup_SOURCES = mergeup.c
INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
AM_LDFLAGS = @LDFLAGS@
LDADD = @VIPS_CFLAGS@ ${top_builddir}/libvips/libvips.la @VIPS_LIBS@
if ENABLE_CXX

0 comments on commit 9070953

Please sign in to comment.