Commiteb915ca

committed

Fix contrib/xml2 makefile to not override CFLAGS, and in passing make it

auto-configure properly for libxslt present or not.

1 parentabb78b1 commiteb915caCopy full SHA for eb915ca

File tree

-15

lines changed

-15

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $PostgreSQL: pgsql/contrib/Makefile,v 1.82 2007/11/13 21:04:45 tgl Exp $`
	`1`	`+# $PostgreSQL: pgsql/contrib/Makefile,v 1.83 2008/05/08 16:49:36 tgl Exp $`
`2`	`2`
`3`	`3`	`subdir = contrib`
`4`	`4`	`top_builddir = ..`
`@@ -46,10 +46,8 @@ WANTED_DIRS += uuid-ossp`
`46`	`46`	`endif`
`47`	`47`
`48`	`48`	`ifeq ($(with_libxml),yes)`
`49`		`-ifeq ($(with_libxslt),yes)`
`50`	`49`	`WANTED_DIRS += xml2`
`51`	`50`	`endif`
`52`		`-endif`
`53`	`51`
`54`	`52`	`# Missing:`
`55`	`53`	`#start-scripts\ (does not have a makefile)`

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,14 @@`
`1`		`-# $PostgreSQL: pgsql/contrib/xml2/Makefile,v 1.11 2007/11/10 23:59:52 momjian Exp $`
	`1`	`+# $PostgreSQL: pgsql/contrib/xml2/Makefile,v 1.12 2008/05/08 16:49:37 tgl Exp $`
`2`	`2`
`3`	`3`	`MODULE_big = pgxml`
`4`	`4`
`5`		`-# Remove xslt_proc.o from the following line if you don't have libxslt`
`6`		`-OBJS = xpath.o xslt_proc.o`
	`5`	`+OBJS =$(if$(filter -lxslt,$(LIBS)), xpath.o xslt_proc.o, xpath.o)`
`7`	`6`
`8`		`-# Remove -lxslt from the following line if you don't have libxslt.`
`9`		`-SHLIB_LINK = -lxslt -lxml2`
	`7`	`+SHLIB_LINK +=$(filter -lxslt,$(LIBS))$(filter -lxml2,$(LIBS))`
`10`	`8`
`11`	`9`	`DATA_built = pgxml.sql`
`12`	`10`	`DATA = uninstall_pgxml.sql`
`13`	`11`
`14`		`-overrideCFLAGS +=$(shell xml2-config --cflags)`
`15`		`-`
`16`	`12`	`ifdefUSE_PGXS`
`17`	`13`	`PG_CONFIG = pg_config`
`18`	`14`	`PGXS :=$(shell$(PG_CONFIG) --pgxs)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ xslt_process(PG_FUNCTION_ARGS)`
`119`	`119`	`if (resstat<0)`
`120`	`120`	`PG_RETURN_NULL();`
`121`	`121`
`122`		`-PG_RETURN_TEXT_P(cstring_to_text_with_len(resstr,reslen));`
	`122`	`+PG_RETURN_TEXT_P(cstring_to_text_with_len((char*)resstr,reslen));`
`123`	`123`	`}`
`124`	`124`
`125`	`125`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!-- $PostgreSQL: pgsql/doc/src/sgml/xml2.sgml,v 1.4 2007/12/06 04:12:10 tgl Exp $ -->`
	`1`	`+<!-- $PostgreSQL: pgsql/doc/src/sgml/xml2.sgml,v 1.5 2008/05/08 16:49:37 tgl Exp $ -->`
`2`	`2`
`3`	`3`	`<sect1 id="xml2">`
`4`	`4`	`<title>xml2</title>`
`@@ -374,9 +374,7 @@ WHERE t.author_id = p.person_id;`
`374`	`374`	`<title>XSLT functions</title>`
`375`	`375`
`376`	`376`	`<para>`
`377`		`- The following functions are available if libxslt is installed (this is`
`378`		`- not currently detected automatically, so you will have to amend the`
`379`		`- Makefile):`
	`377`	`+ The following functions are available if libxslt is installed:`
`380`	`378`	`</para>`
`381`	`379`
`382`	`380`	`<sect3>`

Comments

(0)