Revert "configure: Implement --enable-host-pie"

This reverts commit 251c72a68af3a8b0638705b73ef120ffdf0053eb.

3 files changed, 5 insertions, 40 deletions

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 5beebdc..409d693 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -54,7 +54,7 @@ CTAGS = @CTAGS@
 ETAGS = @ETAGS@
 MKID = @MKID@
 
-COMPILE = $(CC) -c $(CPPFLAGS) $(CFLAGS) @PICFLAG@ $(DEFS) $(DEFS-$@) $(INCLUDES)
+COMPILE = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(DEFS-$@) $(INCLUDES)
 
 HEADERS = \
   gmo.h \
diff --git a/intl/configure b/intl/configure
index 79bb583..03f4048 100755
--- a/intl/configure
+++ b/intl/configure
@@ -623,8 +623,6 @@ ac_header_list=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 PICFLAG
-enable_host_pie
-enable_host_shared
 BISON3_NO
 BISON3_YES
 INCINTL
@@ -733,7 +731,6 @@ with_libintl_prefix
 with_libintl_type
 enable_maintainer_mode
 enable_host_shared
-enable_host_pie
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1359,7 +1356,6 @@ Optional Features:
   --disable-rpath         do not hardcode runtime library paths
   --enable-maintainer-mode enable rules only needed by maintainers
   --enable-host-shared    build host code as shared libraries
-  --enable-host-pie       build host code as PIE
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -6856,31 +6852,15 @@ fi
 
 
 
-# Enable --enable-host-shared.
 # Check whether --enable-host-shared was given.
 if test "${enable_host_shared+set}" = set; then :
-  enableval=$enable_host_shared;
-fi
-
-
-
-# Enable --enable-host-pie.
-# Check whether --enable-host-pie was given.
-if test "${enable_host_pie+set}" = set; then :
-  enableval=$enable_host_pie;
-fi
-
-
-
-if test x$enable_host_shared = xyes; then
-  PICFLAG=-fPIC
-elif test x$enable_host_pie = xyes; then
-  PICFLAG=-fPIE
+  enableval=$enable_host_shared; PICFLAG=-fPIC
 else
   PICFLAG=
 fi
 
 
+
 ac_config_files="$ac_config_files Makefile config.intl"
 
 cat >confcache <<\_ACEOF
diff --git a/intl/configure.ac b/intl/configure.ac
index 81aa831..16a740a 100644
--- a/intl/configure.ac
+++ b/intl/configure.ac
@@ -83,25 +83,10 @@ fi
 AC_SUBST(BISON3_YES)
 AC_SUBST(BISON3_NO)
 
-# Enable --enable-host-shared.
 AC_ARG_ENABLE(host-shared,
 [AS_HELP_STRING([--enable-host-shared],
-       [build host code as shared libraries])])
-AC_SUBST(enable_host_shared)
-
-# Enable --enable-host-pie.
-AC_ARG_ENABLE(host-pie,
-[AS_HELP_STRING([--enable-host-pie],
-       [build host code as PIE])])
-AC_SUBST(enable_host_pie)
-
-if test x$enable_host_shared = xyes; then
-  PICFLAG=-fPIC
-elif test x$enable_host_pie = xyes; then
-  PICFLAG=-fPIE
-else
-  PICFLAG=
-fi
+		[build host code as shared libraries])],
+[PICFLAG=-fPIC], [PICFLAG=])
 AC_SUBST(PICFLAG)
 
 AC_CONFIG_FILES(Makefile config.intl)