Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
postgres-lambda-diff
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakob Huber
postgres-lambda-diff
Commits
eb915caf
Commit
eb915caf
authored
17 years ago
by
Tom Lane
Browse files
Options
Downloads
Patches
Plain Diff
Fix contrib/xml2 makefile to not override CFLAGS, and in passing make it
auto-configure properly for libxslt present or not.
parent
abb78b1b
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
contrib/Makefile
+1
-3
1 addition, 3 deletions
contrib/Makefile
contrib/xml2/Makefile
+3
-7
3 additions, 7 deletions
contrib/xml2/Makefile
contrib/xml2/xslt_proc.c
+1
-1
1 addition, 1 deletion
contrib/xml2/xslt_proc.c
doc/src/sgml/xml2.sgml
+2
-4
2 additions, 4 deletions
doc/src/sgml/xml2.sgml
with
7 additions
and
15 deletions
contrib/Makefile
+
1
−
3
View file @
eb915caf
# $PostgreSQL: pgsql/contrib/Makefile,v 1.8
2
200
7/11/13 21:04:45
tgl Exp $
# $PostgreSQL: pgsql/contrib/Makefile,v 1.8
3
200
8/05/08 16:49:36
tgl Exp $
subdir
=
contrib
top_builddir
=
..
...
...
@@ -46,10 +46,8 @@ WANTED_DIRS += uuid-ossp
endif
ifeq
($(with_libxml),yes)
ifeq
($(with_libxslt),yes)
WANTED_DIRS
+=
xml2
endif
endif
# Missing:
# start-scripts \ (does not have a makefile)
...
...
This diff is collapsed.
Click to expand it.
contrib/xml2/Makefile
+
3
−
7
View file @
eb915caf
# $PostgreSQL: pgsql/contrib/xml2/Makefile,v 1.1
1
200
7/11/10 23:59:52 momjian
Exp $
# $PostgreSQL: pgsql/contrib/xml2/Makefile,v 1.1
2
200
8/05/08 16:49:37 tgl
Exp $
MODULE_big
=
pgxml
# Remove xslt_proc.o from the following line if you don't have libxslt
OBJS
=
xpath.o xslt_proc.o
OBJS
=
$(
if
$(
filter
-lxslt
,
$(
LIBS
))
, xpath.o xslt_proc.o, xpath.o
)
# Remove -lxslt from the following line if you don't have libxslt.
SHLIB_LINK
=
-lxslt
-lxml2
SHLIB_LINK
+=
$(
filter
-lxslt
,
$(
LIBS
))
$(
filter
-lxml2
,
$(
LIBS
))
DATA_built
=
pgxml.sql
DATA
=
uninstall_pgxml.sql
override
CFLAGS
+=
$(
shell xml2-config
--cflags
)
ifdef
USE_PGXS
PG_CONFIG
=
pg_config
PGXS
:=
$(
shell
$(
PG_CONFIG
)
--pgxs
)
...
...
This diff is collapsed.
Click to expand it.
contrib/xml2/xslt_proc.c
+
1
−
1
View file @
eb915caf
...
...
@@ -119,7 +119,7 @@ xslt_process(PG_FUNCTION_ARGS)
if
(
resstat
<
0
)
PG_RETURN_NULL
();
PG_RETURN_TEXT_P
(
cstring_to_text_with_len
(
resstr
,
reslen
));
PG_RETURN_TEXT_P
(
cstring_to_text_with_len
(
(
char
*
)
resstr
,
reslen
));
}
...
...
This diff is collapsed.
Click to expand it.
doc/src/sgml/xml2.sgml
+
2
−
4
View file @
eb915caf
<!-- $PostgreSQL: pgsql/doc/src/sgml/xml2.sgml,v 1.
4
200
7/12/06 04:12:10
tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/xml2.sgml,v 1.
5
200
8/05/08 16:49:37
tgl Exp $ -->
<sect1 id="xml2">
<title>xml2</title>
...
...
@@ -374,9 +374,7 @@ WHERE t.author_id = p.person_id;
<title>XSLT functions</title>
<para>
The following functions are available if libxslt is installed (this is
not currently detected automatically, so you will have to amend the
Makefile):
The following functions are available if libxslt is installed:
</para>
<sect3>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment