blob: 044ea2b81956eb2859c8dea18234f076d9577604 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
$NetBSD: patch-aa,v 1.5 2000/08/28 16:00:19 rh Exp $
--- configure.orig Thu Jul 27 14:59:24 2000
+++ configure
@@ -9,7 +9,7 @@
# Defaults:
ac_help=
-ac_default_prefix=/usr/local
+ac_default_prefix=${PREFIX}
# Any additions from configure.in:
ac_help="$ac_help
--enable-intl-patch add -lintl to check for sane"
@@ -1364,7 +1364,6 @@
fi
-INCLUDES="${INCLUDES} -I/usr/local/include"
CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
if test "${ac_cv_prog_gcc}" = "yes"; then
CFLAGS="${CFLAGS} -Wall"
@@ -4739,7 +4738,7 @@
# so we have to use x_includes and x_libraries to test for png
# and all following checks (=sane)
# saved_CPPFLAGS is still up to date
-CPPFLAGS="${CPPFLAGS} -I${x_includes}"
+CPPFLAGS="${CPPFLAGS} -I${x_includes} -I${LOCALBASE}/include"
if test "${USE_PNG}" = "yes"; then
for ac_hdr in png.h
do
@@ -4840,6 +4839,7 @@
# check must stand at end of list because of the missing libintl in libsane.so
# check needs x_libraries and x_includes because they may be needed by png
if test "${ADD_LIBINTL}" = "no"; then
+ CPPFLAGS="${CPPFLAGS} -I${x_includes}"
for ac_hdr in sane/sane.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
