Attachment #163830 for bug #194409




# $FreeBSD$

PORTNAME=	glusterfs
PORTVERSION=	3.7.6
CATEGORIES=	net
MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
DISTNAME=	${PORTNAME}-3.7.6

MAINTAINER=	craig001@lerwick.hopto.org
COMMENT=	GlusterFS distributed file system

LICENSE=	GPLv2 LGPL3
LICENSE_COMB=	dual

LIB_DEPENDS=	libargp.so:${PORTSDIR}/devel/argp-standalone liburcu-bp.so:${PORTSDIR}/sysutils/liburcu

USE_GCC=	any

USES=		bison gettext libtool pkgconfig python:build readline \
		shebangfix
SHEBANG_FILES=	extras/peer_add_secret_pub.in \
		tools/glusterfind/S57glusterfind-delete-post.py \
		extras/ganesha/scripts/ganesha-ha.sh

USES=		bison gettext libtool pkgconfig python:build readline
USE_GNOME=	glib20 libxml2
USE_LDCONFIG=	yes
USE_OPENSSL=	yes
USE_SQLITE=	yes
USE_RC_SUBR=	glusterd
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \

		--localstatedir=/var \
		--disable-epoll \
		--enable-glupy \
		--disable-georeplication \
		ac_cv_lib_aio_io_setup=no ac_cv_func_fallocate=no \
		ac_cv_func_setfsuid=no 	ac_cv_func_fdatasync=no \
		ac_cv_func_llistxattr=no ac_cv_func_malloc_stats=no
CPPFLAGS+=	-I"${LOCALBASE}/include"
LDFLAGS+=	-L"${LOCALBASE}/lib" -largp
INSTALL_TARGET=	install-strip
PLIST_SUB=	GLUSTERLIBDIR="lib/${PORTNAME}/3.7.6"
KMODDIR?=	/boot/modules

.include <bsd.port.options.mk>

.if ${OSVERSION} < 1000000
WITH_OPENSSL_PORT=	yes
RUN_DEPENDS+=	${KMODDIR}/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)glusterfs/distinfo (-2 / +2 lines)
1	SHA256 (glusterfs-3.6.0beta3.tar.gz) = a5b7d2e41e27348232be74ff448b66c3df1241de8001c82a0e9344d1c42d076e	1	SHA256 (glusterfs-3.7.6.tar.gz) = bb83f0b6bd95599d3742d1c7c12dbbe7b4ef4d4908c5056ee97b3f32c508cf05
2	SIZE (glusterfs-3.6.0beta3.tar.gz) = 5888792	2	SIZE (glusterfs-3.7.6.tar.gz) = 7690697




--- configure.orig	2015-02-16 21:13:46.743376747 +0000
+++ configure	2015-02-16 21:20:20.085666758 +0000
@@ -16076,6 +16076,9 @@
      linux*)
 #do nothing
        ;;
+     freebsd*)
+#do nothing
+       ;;
      netbsd*)
 #do nothing
        ;;
@@ -19518,7 +19521,7 @@
 
 case $host_os in
-     linux*)
+     linux*|freebsd*)
        CFLAGS="`${PYTHON}-config --cflags`"
        CPPFLAGS=$CFLAGS
        LDFLAGS="-L`${PYTHON}-config --prefix`/lib `${PYTHON}-config --ldflags`"
@@ -19507,7 +19507,7 @@
 esac
 
 
-for ac_header in python$PYTHON_VERSION/Python.h
+for ac_header in python$PYTHON_VERSION/Python.h Python.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

Line 0 Link Here

(-)glusterfs/files/patch-fuse-lib-mount (+10 lines)
	1	--- contrib/fuse-lib/mount.c.orig 2015-11-26 00:02:04.760234061 +0000
	2	+++ contrib/fuse-lib/mount.c 2015-11-26 00:03:54.733212503 +0000
	3	@@ -256,6 +256,7 @@
	4	build_iovec (&iov, &iovlen, "from", "/dev/fuse", -1);
	5	build_iovec (&iov, &iovlen, "volname", source, -1);
	6	build_iovec (&iov, &iovlen, "fd", fdstr, -1);
	7	+ build_iovec (&iov, &iovlen, "allow_other", NULL, -1);
	8	ret = nmount (iov, iovlen, mountflags);
	9	#else
	10	ret = mount (source, mountpoint, fstype, mountflags,

Lines 1-3 Link Here

(-)glusterfs/pkg-plist (-10 / +75 lines)
		1	bin/glusterfind
		2	@sample etc/ganesha/ganesha-ha.conf.sample
1	%%ETCDIR%%/gluster-rsyslog-5.8.conf	3	%%ETCDIR%%/gluster-rsyslog-5.8.conf
2	%%ETCDIR%%/gluster-rsyslog-7.2.conf	4	%%ETCDIR%%/gluster-rsyslog-7.2.conf
3	@sample %%ETCDIR%%/glusterd.vol.sample	5	@sample %%ETCDIR%%/glusterd.vol.sample
Lines 8-13 Link Here
8	include/glusterfs/api/glfs-handles.h	10	include/glusterfs/api/glfs-handles.h
9	include/glusterfs/api/glfs.h	11	include/glusterfs/api/glfs.h
10	include/glusterfs/gfchangelog/changelog.h	12	include/glusterfs/gfchangelog/changelog.h
		13	include/glusterfs/gfdb/gfdb_data_store.h
		14	include/glusterfs/gfdb/gfdb_data_store_helper.h
		15	include/glusterfs/gfdb/gfdb_data_store_types.h
		16	include/glusterfs/gfdb/gfdb_mem-types.h
		17	include/glusterfs/gfdb/gfdb_sqlite3.h
		18	include/glusterfs/gfdb/gfdb_sqlite3_helper.h
11	%%GLUSTERLIBDIR%%/auth/addr.so	19	%%GLUSTERLIBDIR%%/auth/addr.so
12	%%GLUSTERLIBDIR%%/auth/login.so	20	%%GLUSTERLIBDIR%%/auth/login.so
13	%%GLUSTERLIBDIR%%/rpc-transport/socket.so	21	%%GLUSTERLIBDIR%%/rpc-transport/socket.so
Lines 21-35 Link Here
21	%%GLUSTERLIBDIR%%/xlator/cluster/replicate.so	29	%%GLUSTERLIBDIR%%/xlator/cluster/replicate.so
22	%%GLUSTERLIBDIR%%/xlator/cluster/stripe.so	30	%%GLUSTERLIBDIR%%/xlator/cluster/stripe.so
23	%%GLUSTERLIBDIR%%/xlator/cluster/switch.so	31	%%GLUSTERLIBDIR%%/xlator/cluster/switch.so
		32	%%GLUSTERLIBDIR%%/xlator/cluster/tier.so
24	%%GLUSTERLIBDIR%%/xlator/debug/error-gen.so	33	%%GLUSTERLIBDIR%%/xlator/debug/error-gen.so
25	%%GLUSTERLIBDIR%%/xlator/debug/io-stats.so	34	%%GLUSTERLIBDIR%%/xlator/debug/io-stats.so
26	%%GLUSTERLIBDIR%%/xlator/debug/trace.so	35	%%GLUSTERLIBDIR%%/xlator/debug/trace.so
27	%%GLUSTERLIBDIR%%/xlator/encryption/crypt.so	36	%%GLUSTERLIBDIR%%/xlator/encryption/crypt.so
28	%%GLUSTERLIBDIR%%/xlator/encryption/rot-13.so	37	%%GLUSTERLIBDIR%%/xlator/encryption/rot-13.so
29	%%GLUSTERLIBDIR%%/xlator/features/access-control.so	38	%%GLUSTERLIBDIR%%/xlator/features/access-control.so
		39	%%GLUSTERLIBDIR%%/xlator/features/arbiter.so
30	%%GLUSTERLIBDIR%%/xlator/features/barrier.so	40	%%GLUSTERLIBDIR%%/xlator/features/barrier.so
		41	%%GLUSTERLIBDIR%%/xlator/features/bit-rot.so
		42	%%GLUSTERLIBDIR%%/xlator/features/bitrot-stub.so
31	%%GLUSTERLIBDIR%%/xlator/features/cdc.so	43	%%GLUSTERLIBDIR%%/xlator/features/cdc.so
32	%%GLUSTERLIBDIR%%/xlator/features/changelog.so	44	%%GLUSTERLIBDIR%%/xlator/features/changelog.so
		45	%%GLUSTERLIBDIR%%/xlator/features/changetimerecorder.so
		46	%%GLUSTERLIBDIR%%/xlator/features/ganesha.so
33	%%GLUSTERLIBDIR%%/xlator/features/gfid-access.so	47	%%GLUSTERLIBDIR%%/xlator/features/gfid-access.so
34	%%GLUSTERLIBDIR%%/xlator/features/glupy.so	48	%%GLUSTERLIBDIR%%/xlator/features/glupy.so
35	%%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.py	49	%%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.py
Lines 54-61 Link Here
54	%%GLUSTERLIBDIR%%/xlator/features/quota.so	68	%%GLUSTERLIBDIR%%/xlator/features/quota.so
55	%%GLUSTERLIBDIR%%/xlator/features/quotad.so	69	%%GLUSTERLIBDIR%%/xlator/features/quotad.so
56	%%GLUSTERLIBDIR%%/xlator/features/read-only.so	70	%%GLUSTERLIBDIR%%/xlator/features/read-only.so
		71	%%GLUSTERLIBDIR%%/xlator/features/shard.so
57	%%GLUSTERLIBDIR%%/xlator/features/snapview-client.so	72	%%GLUSTERLIBDIR%%/xlator/features/snapview-client.so
58	%%GLUSTERLIBDIR%%/xlator/features/snapview-server.so	73	%%GLUSTERLIBDIR%%/xlator/features/snapview-server.so
		74	%%GLUSTERLIBDIR%%/xlator/features/trash.so
		75	%%GLUSTERLIBDIR%%/xlator/features/upcall.so
59	%%GLUSTERLIBDIR%%/xlator/features/worm.so	76	%%GLUSTERLIBDIR%%/xlator/features/worm.so
60	%%GLUSTERLIBDIR%%/xlator/meta.so	77	%%GLUSTERLIBDIR%%/xlator/meta.so
61	%%GLUSTERLIBDIR%%/xlator/mgmt/glusterd.so	78	%%GLUSTERLIBDIR%%/xlator/mgmt/glusterd.so
Lines 78-88 Link Here
78	%%GLUSTERLIBDIR%%/xlator/testing/features/template.so	95	%%GLUSTERLIBDIR%%/xlator/testing/features/template.so
79	%%GLUSTERLIBDIR%%/xlator/testing/performance/symlink-cache.so	96	%%GLUSTERLIBDIR%%/xlator/testing/performance/symlink-cache.so
80	lib/libgfapi.so	97	lib/libgfapi.so
81	lib/libgfapi.so.7	98	lib/libgfapi.so.0
82	lib/libgfapi.so.7.0.0	99	lib/libgfapi.so.0.0.0
83	lib/libgfchangelog.so	100	lib/libgfchangelog.so
84	lib/libgfchangelog.so.0	101	lib/libgfchangelog.so.0
85	lib/libgfchangelog.so.0.0.1	102	lib/libgfchangelog.so.0.0.1
		103	lib/libgfdb.so
		104	lib/libgfdb.so.0
		105	lib/libgfdb.so.0.0.1
86	lib/libgfrpc.so	106	lib/libgfrpc.so
87	lib/libgfrpc.so.0	107	lib/libgfrpc.so.0
88	lib/libgfrpc.so.0.0.1	108	lib/libgfrpc.so.0.0.1
Lines 94-117 Link Here
94	lib/libglusterfs.so.0.0.1	114	lib/libglusterfs.so.0.0.1
95	lib/ocf/resource.d/glusterfs/glusterd	115	lib/ocf/resource.d/glusterfs/glusterd
96	lib/ocf/resource.d/glusterfs/volume	116	lib/ocf/resource.d/glusterfs/volume
		117	lib/ocf/resource.d/heartbeat/ganesha_grace
		118	lib/ocf/resource.d/heartbeat/ganesha_mon
		119	lib/ocf/resource.d/heartbeat/ganesha_nfsd
97	%%PYTHON_SITELIBDIR%%/gluster/__init__.py	120	%%PYTHON_SITELIBDIR%%/gluster/__init__.py
98	%%PYTHON_SITELIBDIR%%/gluster/__init__.pyc	121	%%PYTHON_SITELIBDIR%%/gluster/__init__.pyc
99	%%PYTHON_SITELIBDIR%%/gluster/__init__.pyo	122	%%PYTHON_SITELIBDIR%%/gluster/__init__.pyo
100	%%PYTHON_SITELIBDIR%%/gluster/glupy.py	123	%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.py
101	%%PYTHON_SITELIBDIR%%/gluster/glupy.pyc	124	%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.pyc
102	%%PYTHON_SITELIBDIR%%/gluster/glupy.pyo	125	%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.pyo
103	libdata/pkgconfig/glusterfs-api.pc	126	libdata/pkgconfig/glusterfs-api.pc
104	libdata/pkgconfig/libgfchangelog.pc	127	libdata/pkgconfig/libgfchangelog.pc
		128	libdata/pkgconfig/libgfdb.pc
		129	libexec/ganesha/create-export-ganesha.sh
		130	libexec/ganesha/dbus-send.sh
		131	libexec/ganesha/ganesha-ha.sh
		132	libexec/glusterfs/gfind_missing_files/gcrawler
		133	libexec/glusterfs/gfind_missing_files/gfid_to_path.py
		134	libexec/glusterfs/gfind_missing_files/gfid_to_path.sh
		135	libexec/glusterfs/gfind_missing_files/gfind_missing_files.sh
		136	libexec/glusterfs/glusterfind/S57glusterfind-delete-post.py
		137	libexec/glusterfs/glusterfind/__init__.py
		138	libexec/glusterfs/glusterfind/__init__.pyc
		139	libexec/glusterfs/glusterfind/__init__.pyo
		140	libexec/glusterfs/glusterfind/brickfind.py
		141	libexec/glusterfs/glusterfind/changelog.py
		142	libexec/glusterfs/glusterfind/changelogdata.py
		143	libexec/glusterfs/glusterfind/changelogdata.pyc
		144	libexec/glusterfs/glusterfind/changelogdata.pyo
		145	libexec/glusterfs/glusterfind/conf.py
		146	libexec/glusterfs/glusterfind/conf.pyc
		147	libexec/glusterfs/glusterfind/conf.pyo
		148	libexec/glusterfs/glusterfind/libgfchangelog.py
		149	libexec/glusterfs/glusterfind/libgfchangelog.pyc
		150	libexec/glusterfs/glusterfind/libgfchangelog.pyo
		151	libexec/glusterfs/glusterfind/main.py
		152	libexec/glusterfs/glusterfind/main.pyc
		153	libexec/glusterfs/glusterfind/main.pyo
		154	libexec/glusterfs/glusterfind/nodeagent.py
		155	libexec/glusterfs/glusterfind/tool.conf
		156	libexec/glusterfs/glusterfind/utils.py
		157	libexec/glusterfs/glusterfind/utils.pyc
		158	libexec/glusterfs/glusterfind/utils.pyo
		159	libexec/glusterfs/peer_add_secret_pub
105	man/man8/gluster.8.gz	160	man/man8/gluster.8.gz
106	man/man8/glusterd.8.gz	161	man/man8/glusterd.8.gz
107	man/man8/glusterfs.8.gz	162	man/man8/glusterfs.8.gz
108	man/man8/glusterfsd.8.gz	163	man/man8/glusterfsd.8.gz
109	man/man8/mount.glusterfs.8.gz	164	man/man8/mount.glusterfs.8.gz
		165	sbin/gcron.py
		166	sbin/gfind_missing_files
		167	sbin/glfsheal
110	sbin/gluster	168	sbin/gluster
111	sbin/glusterd	169	sbin/glusterd
112	sbin/glusterfs	170	sbin/glusterfs
113	sbin/glusterfsd	171	sbin/glusterfsd
114	sbin/mount_glusterfs	172	sbin/mount_glusterfs
		173	sbin/snap_scheduler.py
		174	sbin/umountd
115	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/README	175	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/README
116	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/glfs-bm.c	176	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/glfs-bm.c
117	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/launch-script.sh	177	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/launch-script.sh
Lines 119-133 Link Here
119	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/rdd.c	179	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/rdd.c
120	%%PORTDOCS%%%%DOCSDIR%%/glusterfs-mode.el	180	%%PORTDOCS%%%%DOCSDIR%%/glusterfs-mode.el
121	%%PORTDOCS%%%%DOCSDIR%%/glusterfs.vim	181	%%PORTDOCS%%%%DOCSDIR%%/glusterfs.vim
122	%%DATADIR%%/scripts/generate-gfid-file.sh
123	%%DATADIR%%/scripts/get-gfid.sh
124	%%DATADIR%%/scripts/gsync-sync-gfid
125	%%DATADIR%%/scripts/gsync-upgrade.sh
126	%%DATADIR%%/scripts/post-upgrade-script-for-quota.sh	182	%%DATADIR%%/scripts/post-upgrade-script-for-quota.sh
127	%%DATADIR%%/scripts/pre-upgrade-script-for-quota.sh	183	%%DATADIR%%/scripts/pre-upgrade-script-for-quota.sh
128	%%DATADIR%%/scripts/slave-upgrade.sh	184	%%DATADIR%%/scripts/stop-all-gluster-processes.sh
129	@sample /var/db/glusterd/groups/virt.sample	185	@sample /var/db/glusterd/groups/virt.sample
		186	/var/db/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py
		187	@dir /var/db/glusterd/glusterfind/.keys
		188	@dir /var/db/glusterd/glusterfind
130	@dir /var/db/glusterd/groups	189	@dir /var/db/glusterd/groups
		190	@dir /var/db/glusterd/hooks/1/delete/post
		191	@dir /var/db/glusterd/hooks/1/delete
		192	@dir /var/db/glusterd/hooks/1/gsync-create/post
		193	@dir /var/db/glusterd/hooks/1/gsync-create
		194	@dir /var/db/glusterd/hooks/1
		195	@dir /var/db/glusterd/hooks
131	@dir /var/db/glusterd	196	@dir /var/db/glusterd
132	@dir /var/log/glusterfs	197	@dir /var/log/glusterfs
133	@dir /var/run/gluster	198	@dir /var/run/gluster

Return to bug 194409

Lines 1-10 Link Here

(-)glusterfs/Makefile (-5 / +22 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= glusterfs	3	PORTNAME= glusterfs
4	PORTVERSION= 3.6.0.b.3	4	PORTVERSION= 3.7.6
5	CATEGORIES= net	5	CATEGORIES= net
6	MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/	6	MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/
7	DISTNAME= ${PORTNAME}-3.6.0beta3	7	DISTNAME= ${PORTNAME}-3.7.6
8		8
9	MAINTAINER= craig001@lerwick.hopto.org	9	MAINTAINER= craig001@lerwick.hopto.org
10	COMMENT= GlusterFS distributed file system	10	COMMENT= GlusterFS distributed file system
Lines 12-23 Link Here
12	LICENSE= GPLv2 LGPL3	12	LICENSE= GPLv2 LGPL3
13	LICENSE_COMB= dual	13	LICENSE_COMB= dual
14		14
15	LIB_DEPENDS= libargp.so:${PORTSDIR}/devel/argp-standalone	15	LIB_DEPENDS= libargp.so:${PORTSDIR}/devel/argp-standalone liburcu-bp.so:${PORTSDIR}/sysutils/liburcu
		16
		17	USE_GCC= any
		18
		19	USES= bison gettext libtool pkgconfig python:build readline \
		20	shebangfix
		21	SHEBANG_FILES= extras/peer_add_secret_pub.in \
		22	tools/glusterfind/S57glusterfind-delete-post.py \
		23	extras/ganesha/scripts/ganesha-ha.sh
16		24
17	USES= bison gettext libtool pkgconfig python:build readline
18	USE_GNOME= glib20 libxml2	25	USE_GNOME= glib20 libxml2
19	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
20	USE_OPENSSL= yes	27	USE_OPENSSL= yes
		28	USE_SQLITE= yes
21	USE_RC_SUBR= glusterd	29	USE_RC_SUBR= glusterd
22	GNU_CONFIGURE= yes	30	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \	31	CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
Lines 25-36 Link Here
25	--localstatedir=/var \	33	--localstatedir=/var \
26	--disable-epoll \	34	--disable-epoll \
27	--enable-glupy \	35	--enable-glupy \
		36	--disable-georeplication \
28	ac_cv_lib_aio_io_setup=no ac_cv_func_fallocate=no \	37	ac_cv_lib_aio_io_setup=no ac_cv_func_fallocate=no \
29	ac_cv_func_setfsuid=no ac_cv_func_fdatasync=no \	38	ac_cv_func_setfsuid=no ac_cv_func_fdatasync=no \
30	ac_cv_func_llistxattr=no ac_cv_func_malloc_stats=no	39	ac_cv_func_llistxattr=no ac_cv_func_malloc_stats=no
31	CPPFLAGS+= -I"${LOCALBASE}/include"	40	CPPFLAGS+= -I"${LOCALBASE}/include"
32	LDFLAGS+= -L"${LOCALBASE}/lib" -largp	41	LDFLAGS+= -L"${LOCALBASE}/lib" -largp
33	INSTALL_TARGET= install-strip	42	INSTALL_TARGET= install-strip
34	PLIST_SUB= GLUSTERLIBDIR="${PREFIX}/lib/${PORTNAME}/3.6.0beta3"	43	PLIST_SUB= GLUSTERLIBDIR="lib/${PORTNAME}/3.7.6"
		44	KMODDIR?= /boot/modules
		45
		46	.include <bsd.port.options.mk>
		47
		48	.if ${OSVERSION} < 1000000
		49	WITH_OPENSSL_PORT= yes
		50	RUN_DEPENDS+= ${KMODDIR}/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
		51	.endif
35		52
36	.include <bsd.port.mk>	53	.include <bsd.port.mk>

Lines 1-20 Link Here

(-)glusterfs/files/patch-configure (-13 / +14 lines)
1	--- configure.orig 2014-10-01 03:18:06.000000000 +0900	1	--- configure.orig 2015-02-16 21:13:46.743376747 +0000
2	+++ configure 2014-11-24 18:52:14.000000000 +0900	2	+++ configure 2015-02-16 21:20:20.085666758 +0000
3	@@ -19494,7 +19494,7 @@	3	@@ -16076,6 +16076,9 @@
4	saved_LDFLAGS=$LDFLAGS	4	linux*)
		5	#do nothing
		6	;;
		7	+ freebsd*)
		8	+#do nothing
		9	+ ;;
		10	netbsd*)
		11	#do nothing
		12	;;
		13	@@ -19518,7 +19521,7 @@
5		14
6	case $host_os in
7	- linux*)
8	+ linux\|freebsd)
9	CFLAGS="`${PYTHON}-config --cflags`"
10	CPPFLAGS=$CFLAGS
11	LDFLAGS="-L`${PYTHON}-config --prefix`/lib `${PYTHON}-config --ldflags`"
12	@@ -19507,7 +19507,7 @@
13	esac
14		15
15		16
16	-for ac_header in python$PYTHON_VERSION/Python.h	17	-for ac_header in python$PYTHON_VERSION/Python.h
17	+for ac_header in Python.h	18	+for ac_header in python$PYTHON_VERSION/Python.h Python.h
18	do	19	do
19	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	20	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
20	if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then	21	if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then