Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit6506a58

Browse files
committed
Enable building contrib/xml2 if configured using --with-libxml.
If this breaks things due to missing libxslt, then I'll have torevert it, but let's see if it breaks the buildfarm.Workarounds in case libxslt is missing include:. don't configure with libxml, or. don't build contrib modules from the contrib Makefile (use the individual module Makefiles instead), or. change the xml2 Makefile
1 parent15ebfee commit6506a58

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

‎configure

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ ac_includes_default="\
314314
# include <unistd.h>
315315
#endif"
316316

317-
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug enable_profiling DTRACE DTRACEFLAGS enable_dtrace CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_krb5 krb_srvtab with_pam with_ldap with_bonjour with_openssl XML2_CONFIG with_zlib EGREP ELF_SYS LDFLAGS_SL AWK FLEX FLEXFLAGS LN_S LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB TAR STRIP ac_ct_STRIP STRIP_STATIC_LIB STRIP_SHARED_LIB YACC YFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS LDAP_LIBS_FE LDAP_LIBS_BE HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build LTLIBOBJS'
317+
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug enable_profiling DTRACE DTRACEFLAGS enable_dtrace CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_krb5 krb_srvtab with_pam with_ldap with_bonjour with_openssl XML2_CONFIG with_libxml with_zlib EGREP ELF_SYS LDFLAGS_SL AWK FLEX FLEXFLAGS LN_S LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB TAR STRIP ac_ct_STRIP STRIP_STATIC_LIB STRIP_SHARED_LIB YACC YFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS LDAP_LIBS_FE LDAP_LIBS_BE HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build LTLIBOBJS'
318318
ac_subst_files=''
319319

320320
# Initialize some variables set by options.
@@ -4331,6 +4331,7 @@ done
43314331
fi
43324332

43334333

4334+
43344335
#
43354336
# Zlib
43364337
#
@@ -24320,6 +24321,7 @@ s,@with_ldap@,$with_ldap,;t t
2432024321
s,@with_bonjour@,$with_bonjour,;t t
2432124322
s,@with_openssl@,$with_openssl,;t t
2432224323
s,@XML2_CONFIG@,$XML2_CONFIG,;t t
24324+
s,@with_libxml@,$with_libxml,;t t
2432324325
s,@with_zlib@,$with_zlib,;t t
2432424326
s,@EGREP@,$EGREP,;t t
2432524327
s,@ELF_SYS@,$ELF_SYS,;t t

‎configure.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.509 2007/04/06 05:36:50 tgl Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.510 2007/04/13 18:50:01 adunstan Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -577,6 +577,7 @@ if test "$with_libxml" = yes ; then
577577
fi
578578
fi
579579

580+
AC_SUBST(with_libxml)
580581

581582
#
582583
# Zlib

‎contrib/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/contrib/Makefile,v 1.71 2007/02/08 15:09:47 momjian Exp $
1+
# $PostgreSQL: pgsql/contrib/Makefile,v 1.72 2007/04/13 18:50:01 adunstan Exp $
22

33
subdir = contrib
44
top_builddir = ..
@@ -37,9 +37,12 @@ ifeq ($(with_openssl),yes)
3737
WANTED_DIRS += sslinfo
3838
endif
3939

40+
ifeq ($(with_libxml),yes)
41+
WANTED_DIRS += xml2
42+
endif
43+
4044
# Missing:
4145
#start-scripts\ (does not have a makefile)
42-
#xml2\ (requires libxml installed)
4346

4447

4548
allinstallinstalldirsuninstalldistprepcleandistcleanmaintainer-clean:

‎src/Makefile.global.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.233 2007/02/09 15:55:57 petere Exp $
2+
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.234 2007/04/13 18:50:01 adunstan Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -152,6 +152,7 @@ with_perl= @with_perl@
152152
with_python= @with_python@
153153
with_tcl= @with_tcl@
154154
with_openssl= @with_openssl@
155+
with_libxml= @with_libxml@
155156
with_zlib= @with_zlib@
156157
enable_shared= @enable_shared@
157158
enable_rpath= @enable_rpath@

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp