Remove configure flag --disable-shared, as it is no longer used by any
port. The last use was QNX, per Peter Eisentraut.
This commit is contained in:
parent
9bedfbd02b
commit
381a9ed66d
33
configure
vendored
33
configure
vendored
@ -748,7 +748,6 @@ LCOV
|
|||||||
GCOV
|
GCOV
|
||||||
enable_debug
|
enable_debug
|
||||||
enable_rpath
|
enable_rpath
|
||||||
enable_shared
|
|
||||||
default_port
|
default_port
|
||||||
WANTED_LANGUAGES
|
WANTED_LANGUAGES
|
||||||
enable_nls
|
enable_nls
|
||||||
@ -810,7 +809,6 @@ with_libs
|
|||||||
enable_integer_datetimes
|
enable_integer_datetimes
|
||||||
enable_nls
|
enable_nls
|
||||||
with_pgport
|
with_pgport
|
||||||
enable_shared
|
|
||||||
enable_rpath
|
enable_rpath
|
||||||
enable_spinlocks
|
enable_spinlocks
|
||||||
enable_debug
|
enable_debug
|
||||||
@ -1490,7 +1488,6 @@ Optional Features:
|
|||||||
disable 64-bit integer date/time support
|
disable 64-bit integer date/time support
|
||||||
--enable-nls[=LANGUAGES]
|
--enable-nls[=LANGUAGES]
|
||||||
enable Native Language Support
|
enable Native Language Support
|
||||||
--disable-shared do not build shared libraries
|
|
||||||
--disable-rpath do not embed shared library search path in
|
--disable-rpath do not embed shared library search path in
|
||||||
executables
|
executables
|
||||||
--disable-spinlocks do not use spinlocks
|
--disable-spinlocks do not use spinlocks
|
||||||
@ -2471,36 +2468,6 @@ _ACEOF
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Option to disable shared libraries
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
# Check whether --enable-shared was given.
|
|
||||||
if test "${enable_shared+set}" = set; then
|
|
||||||
enableval=$enable_shared;
|
|
||||||
case $enableval in
|
|
||||||
yes)
|
|
||||||
:
|
|
||||||
;;
|
|
||||||
no)
|
|
||||||
:
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
{ { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-shared option" >&5
|
|
||||||
$as_echo "$as_me: error: no argument expected for --enable-shared option" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
else
|
|
||||||
enable_shared=yes
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# '-rpath'-like feature can be disabled
|
# '-rpath'-like feature can be disabled
|
||||||
#
|
#
|
||||||
|
@ -163,13 +163,6 @@ AC_DEFINE_UNQUOTED(DEF_PGPORT_STR, "${default_port}",
|
|||||||
[Define to the default TCP port number as a string constant.])
|
[Define to the default TCP port number as a string constant.])
|
||||||
AC_SUBST(default_port)
|
AC_SUBST(default_port)
|
||||||
|
|
||||||
#
|
|
||||||
# Option to disable shared libraries
|
|
||||||
#
|
|
||||||
PGAC_ARG_BOOL(enable, shared, yes,
|
|
||||||
[do not build shared libraries])
|
|
||||||
AC_SUBST(enable_shared)
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# '-rpath'-like feature can be disabled
|
# '-rpath'-like feature can be disabled
|
||||||
#
|
#
|
||||||
|
@ -165,7 +165,6 @@ with_libxml = @with_libxml@
|
|||||||
with_libxslt = @with_libxslt@
|
with_libxslt = @with_libxslt@
|
||||||
with_system_tzdata = @with_system_tzdata@
|
with_system_tzdata = @with_system_tzdata@
|
||||||
with_zlib = @with_zlib@
|
with_zlib = @with_zlib@
|
||||||
enable_shared = @enable_shared@
|
|
||||||
enable_rpath = @enable_rpath@
|
enable_rpath = @enable_rpath@
|
||||||
enable_nls = @enable_nls@
|
enable_nls = @enable_nls@
|
||||||
enable_debug = @enable_debug@
|
enable_debug = @enable_debug@
|
||||||
@ -397,13 +396,6 @@ endif
|
|||||||
# isn't created with the same link flags as libpq, it can't be used.)
|
# isn't created with the same link flags as libpq, it can't be used.)
|
||||||
libpq = -L$(libpq_builddir) -lpq
|
libpq = -L$(libpq_builddir) -lpq
|
||||||
|
|
||||||
# If doing static linking, shared library dependency info isn't available,
|
|
||||||
# so add in the libraries that libpq depends on.
|
|
||||||
ifeq ($(enable_shared), no)
|
|
||||||
libpq += $(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) \
|
|
||||||
$(LDAP_LIBS_FE) $(PTHREAD_LIBS)
|
|
||||||
endif
|
|
||||||
|
|
||||||
# This macro is for use by client executables (not libraries) that use libpq.
|
# This macro is for use by client executables (not libraries) that use libpq.
|
||||||
# We force clients to pull symbols from the non-shared library libpgport
|
# We force clients to pull symbols from the non-shared library libpgport
|
||||||
# rather than pulling some libpgport symbols from libpq just because
|
# rather than pulling some libpgport symbols from libpq just because
|
||||||
|
@ -81,20 +81,16 @@ LINK.static = $(AR) $(AROPT)
|
|||||||
|
|
||||||
ifdef SO_MAJOR_VERSION
|
ifdef SO_MAJOR_VERSION
|
||||||
# Default library naming convention used by the majority of platforms
|
# Default library naming convention used by the majority of platforms
|
||||||
ifeq ($(enable_shared), yes)
|
|
||||||
shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
|
shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
|
||||||
shlib_major = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
|
shlib_major = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
|
||||||
shlib_bare = lib$(NAME)$(DLSUFFIX)
|
shlib_bare = lib$(NAME)$(DLSUFFIX)
|
||||||
endif
|
|
||||||
# Testing the soname variable is a reliable way to determine whether a
|
# Testing the soname variable is a reliable way to determine whether a
|
||||||
# linkable library is being built.
|
# linkable library is being built.
|
||||||
soname = $(shlib_major)
|
soname = $(shlib_major)
|
||||||
else
|
else
|
||||||
# Naming convention for dynamically loadable modules
|
# Naming convention for dynamically loadable modules
|
||||||
ifeq ($(enable_shared), yes)
|
|
||||||
shlib = $(NAME)$(DLSUFFIX)
|
shlib = $(NAME)$(DLSUFFIX)
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
stlib = lib$(NAME).a
|
stlib = lib$(NAME).a
|
||||||
|
|
||||||
ifndef soname
|
ifndef soname
|
||||||
@ -321,7 +317,6 @@ $(stlib): $(OBJS) | $(SHLIB_PREREQS)
|
|||||||
$(RANLIB) $@
|
$(RANLIB) $@
|
||||||
endif #haslibarule
|
endif #haslibarule
|
||||||
|
|
||||||
ifeq ($(enable_shared), yes)
|
|
||||||
|
|
||||||
ifeq (,$(filter cygwin win32,$(PORTNAME)))
|
ifeq (,$(filter cygwin win32,$(PORTNAME)))
|
||||||
ifneq ($(PORTNAME), aix)
|
ifneq ($(PORTNAME), aix)
|
||||||
@ -392,8 +387,6 @@ $(stlib): $(shlib) $(DLL_DEFFILE) | $(SHLIB_PREREQS)
|
|||||||
|
|
||||||
endif # PORTNAME == cygwin || PORTNAME == win32
|
endif # PORTNAME == cygwin || PORTNAME == win32
|
||||||
|
|
||||||
endif # enable_shared
|
|
||||||
|
|
||||||
|
|
||||||
# We need several not-quite-identical variants of .DEF files to build
|
# We need several not-quite-identical variants of .DEF files to build
|
||||||
# DLLs for Windows. These are made from the single source file
|
# DLLs for Windows. These are made from the single source file
|
||||||
@ -446,7 +439,6 @@ ifeq ($(PORTNAME), darwin)
|
|||||||
ranlib $(stlib)
|
ranlib $(stlib)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(enable_shared), yes)
|
|
||||||
install-lib-shared: $(shlib) installdirs-lib
|
install-lib-shared: $(shlib) installdirs-lib
|
||||||
ifdef soname
|
ifdef soname
|
||||||
# we don't install $(shlib) on AIX
|
# we don't install $(shlib) on AIX
|
||||||
@ -471,14 +463,6 @@ endif # not aix
|
|||||||
else # no soname
|
else # no soname
|
||||||
$(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)'
|
$(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)'
|
||||||
endif
|
endif
|
||||||
else # not enable_shared
|
|
||||||
ifndef soname
|
|
||||||
install-lib-shared:
|
|
||||||
@echo "*****"; \
|
|
||||||
echo "* Module $(NAME) was not installed due to lack of shared library support."; \
|
|
||||||
echo "*****"
|
|
||||||
endif
|
|
||||||
endif # enable_shared
|
|
||||||
|
|
||||||
|
|
||||||
installdirs-lib:
|
installdirs-lib:
|
||||||
@ -497,11 +481,9 @@ endif
|
|||||||
uninstall-lib:
|
uninstall-lib:
|
||||||
ifdef soname
|
ifdef soname
|
||||||
rm -f '$(DESTDIR)$(libdir)/$(stlib)'
|
rm -f '$(DESTDIR)$(libdir)/$(stlib)'
|
||||||
ifeq ($(enable_shared), yes)
|
|
||||||
rm -f '$(DESTDIR)$(libdir)/$(shlib_bare)' \
|
rm -f '$(DESTDIR)$(libdir)/$(shlib_bare)' \
|
||||||
'$(DESTDIR)$(libdir)/$(shlib_major)' \
|
'$(DESTDIR)$(libdir)/$(shlib_major)' \
|
||||||
'$(DESTDIR)$(libdir)/$(shlib)'
|
'$(DESTDIR)$(libdir)/$(shlib)'
|
||||||
endif # enable_shared
|
|
||||||
else # no soname
|
else # no soname
|
||||||
rm -f '$(DESTDIR)$(pkglibdir)/$(shlib)'
|
rm -f '$(DESTDIR)$(pkglibdir)/$(shlib)'
|
||||||
endif # no soname
|
endif # no soname
|
||||||
|
@ -81,7 +81,6 @@ all: all-shared-lib $(SQLSCRIPT)
|
|||||||
include $(top_srcdir)/src/Makefile.shlib
|
include $(top_srcdir)/src/Makefile.shlib
|
||||||
|
|
||||||
$(SQLSCRIPT): Makefile snowball_func.sql.in snowball.sql.in
|
$(SQLSCRIPT): Makefile snowball_func.sql.in snowball.sql.in
|
||||||
ifeq ($(enable_shared), yes)
|
|
||||||
echo '-- Language-specific snowball dictionaries' > $@
|
echo '-- Language-specific snowball dictionaries' > $@
|
||||||
cat $(srcdir)/snowball_func.sql.in >> $@
|
cat $(srcdir)/snowball_func.sql.in >> $@
|
||||||
@set -e; \
|
@set -e; \
|
||||||
@ -104,9 +103,6 @@ ifeq ($(enable_shared), yes)
|
|||||||
sed -e "s#_NONASCDICTNAME_#$${nonascdictname}_stem#g" | \
|
sed -e "s#_NONASCDICTNAME_#$${nonascdictname}_stem#g" | \
|
||||||
sed -e "s#_STOPWORDS_#$$stop#g" ; \
|
sed -e "s#_STOPWORDS_#$$stop#g" ; \
|
||||||
done >> $@
|
done >> $@
|
||||||
else
|
|
||||||
echo "-- No language-specific snowball dictionaries, for lack of shared library support" > $@
|
|
||||||
endif
|
|
||||||
|
|
||||||
install: all installdirs install-lib
|
install: all installdirs install-lib
|
||||||
$(INSTALL_DATA) $(SQLSCRIPT) '$(DESTDIR)$(datadir)'
|
$(INSTALL_DATA) $(SQLSCRIPT) '$(DESTDIR)$(datadir)'
|
||||||
|
@ -166,7 +166,6 @@ CONVERSIONS = \
|
|||||||
all: $(SQLSCRIPT)
|
all: $(SQLSCRIPT)
|
||||||
|
|
||||||
$(SQLSCRIPT): Makefile
|
$(SQLSCRIPT): Makefile
|
||||||
ifeq ($(enable_shared), yes)
|
|
||||||
@set -e; \
|
@set -e; \
|
||||||
set $(CONVERSIONS) ; \
|
set $(CONVERSIONS) ; \
|
||||||
while [ "$$#" -gt 0 ] ; \
|
while [ "$$#" -gt 0 ] ; \
|
||||||
@ -183,9 +182,6 @@ ifeq ($(enable_shared), yes)
|
|||||||
echo "CREATE DEFAULT CONVERSION pg_catalog.$$name FOR '$$se' TO '$$de' FROM $$func;"; \
|
echo "CREATE DEFAULT CONVERSION pg_catalog.$$name FOR '$$se' TO '$$de' FROM $$func;"; \
|
||||||
echo "COMMENT ON CONVERSION pg_catalog.$$name IS 'conversion for $$se to $$de';"; \
|
echo "COMMENT ON CONVERSION pg_catalog.$$name IS 'conversion for $$se to $$de';"; \
|
||||||
done > $@
|
done > $@
|
||||||
else
|
|
||||||
echo "-- No conversion support, for lack of shared library support" > $@
|
|
||||||
endif
|
|
||||||
|
|
||||||
$(REGRESSION_SCRIPT): Makefile
|
$(REGRESSION_SCRIPT): Makefile
|
||||||
@set -e; \
|
@set -e; \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user