From 381a9ed66d8a601eb972be172e7251ca7f0e9d78 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 30 Aug 2012 16:26:53 -0400 Subject: [PATCH] Remove configure flag --disable-shared, as it is no longer used by any port. The last use was QNX, per Peter Eisentraut. --- configure | 33 ------------------- configure.in | 7 ---- src/Makefile.global.in | 8 ----- src/Makefile.shlib | 18 ---------- src/backend/snowball/Makefile | 4 --- .../utils/mb/conversion_procs/Makefile | 4 --- 6 files changed, 74 deletions(-) diff --git a/configure b/configure index 6a89cca1f6..8f59c93ff9 100755 --- a/configure +++ b/configure @@ -748,7 +748,6 @@ LCOV GCOV enable_debug enable_rpath -enable_shared default_port WANTED_LANGUAGES enable_nls @@ -810,7 +809,6 @@ with_libs enable_integer_datetimes enable_nls with_pgport -enable_shared enable_rpath enable_spinlocks enable_debug @@ -1490,7 +1488,6 @@ Optional Features: disable 64-bit integer date/time support --enable-nls[=LANGUAGES] enable Native Language Support - --disable-shared do not build shared libraries --disable-rpath do not embed shared library search path in executables --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 # diff --git a/configure.in b/configure.in index fa48a2b207..3acefa1797 100644 --- a/configure.in +++ b/configure.in @@ -163,13 +163,6 @@ AC_DEFINE_UNQUOTED(DEF_PGPORT_STR, "${default_port}", [Define to the default TCP port number as a string constant.]) 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 # diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 5b438193f9..1e3b401147 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -165,7 +165,6 @@ with_libxml = @with_libxml@ with_libxslt = @with_libxslt@ with_system_tzdata = @with_system_tzdata@ with_zlib = @with_zlib@ -enable_shared = @enable_shared@ enable_rpath = @enable_rpath@ enable_nls = @enable_nls@ enable_debug = @enable_debug@ @@ -397,13 +396,6 @@ endif # isn't created with the same link flags as libpq, it can't be used.) 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. # We force clients to pull symbols from the non-shared library libpgport # rather than pulling some libpgport symbols from libpq just because diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 294d10f618..4da2f10444 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -81,20 +81,16 @@ LINK.static = $(AR) $(AROPT) ifdef SO_MAJOR_VERSION # 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_major = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) shlib_bare = lib$(NAME)$(DLSUFFIX) -endif # Testing the soname variable is a reliable way to determine whether a # linkable library is being built. soname = $(shlib_major) else # Naming convention for dynamically loadable modules -ifeq ($(enable_shared), yes) shlib = $(NAME)$(DLSUFFIX) endif -endif stlib = lib$(NAME).a ifndef soname @@ -321,7 +317,6 @@ $(stlib): $(OBJS) | $(SHLIB_PREREQS) $(RANLIB) $@ endif #haslibarule -ifeq ($(enable_shared), yes) ifeq (,$(filter cygwin win32,$(PORTNAME))) ifneq ($(PORTNAME), aix) @@ -392,8 +387,6 @@ $(stlib): $(shlib) $(DLL_DEFFILE) | $(SHLIB_PREREQS) endif # PORTNAME == cygwin || PORTNAME == win32 -endif # enable_shared - # We need several not-quite-identical variants of .DEF files to build # DLLs for Windows. These are made from the single source file @@ -446,7 +439,6 @@ ifeq ($(PORTNAME), darwin) ranlib $(stlib) endif -ifeq ($(enable_shared), yes) install-lib-shared: $(shlib) installdirs-lib ifdef soname # we don't install $(shlib) on AIX @@ -471,14 +463,6 @@ endif # not aix else # no soname $(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)' 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: @@ -497,11 +481,9 @@ endif uninstall-lib: ifdef soname rm -f '$(DESTDIR)$(libdir)/$(stlib)' -ifeq ($(enable_shared), yes) rm -f '$(DESTDIR)$(libdir)/$(shlib_bare)' \ '$(DESTDIR)$(libdir)/$(shlib_major)' \ '$(DESTDIR)$(libdir)/$(shlib)' -endif # enable_shared else # no soname rm -f '$(DESTDIR)$(pkglibdir)/$(shlib)' endif # no soname diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile index c528be9d53..ac80efeb7d 100644 --- a/src/backend/snowball/Makefile +++ b/src/backend/snowball/Makefile @@ -81,7 +81,6 @@ all: all-shared-lib $(SQLSCRIPT) include $(top_srcdir)/src/Makefile.shlib $(SQLSCRIPT): Makefile snowball_func.sql.in snowball.sql.in -ifeq ($(enable_shared), yes) echo '-- Language-specific snowball dictionaries' > $@ cat $(srcdir)/snowball_func.sql.in >> $@ @set -e; \ @@ -104,9 +103,6 @@ ifeq ($(enable_shared), yes) sed -e "s#_NONASCDICTNAME_#$${nonascdictname}_stem#g" | \ sed -e "s#_STOPWORDS_#$$stop#g" ; \ done >> $@ -else - echo "-- No language-specific snowball dictionaries, for lack of shared library support" > $@ -endif install: all installdirs install-lib $(INSTALL_DATA) $(SQLSCRIPT) '$(DESTDIR)$(datadir)' diff --git a/src/backend/utils/mb/conversion_procs/Makefile b/src/backend/utils/mb/conversion_procs/Makefile index 0848d96335..8481721c25 100644 --- a/src/backend/utils/mb/conversion_procs/Makefile +++ b/src/backend/utils/mb/conversion_procs/Makefile @@ -166,7 +166,6 @@ CONVERSIONS = \ all: $(SQLSCRIPT) $(SQLSCRIPT): Makefile -ifeq ($(enable_shared), yes) @set -e; \ set $(CONVERSIONS) ; \ 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 "COMMENT ON CONVERSION pg_catalog.$$name IS 'conversion for $$se to $$de';"; \ done > $@ -else - echo "-- No conversion support, for lack of shared library support" > $@ -endif $(REGRESSION_SCRIPT): Makefile @set -e; \ -- 2.40.0