aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure50
1 files changed, 30 insertions, 20 deletions
diff --git a/configure b/configure
index 939cd864..aa97a93b 100755
--- a/configure
+++ b/configure
@@ -660,7 +660,6 @@ MSGFMT
GETTEXT_MACRO_VERSION
USE_NLS
SED
-pkgextensiondir
acl_shlibext
RANLIB
LN_S
@@ -694,6 +693,7 @@ build_os
build_vendor
build_cpu
build
+pkgextensiondir
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -766,6 +766,7 @@ enable_silent_rules
enable_lint
enable_builtin_intdiv0
enable_mpfr
+enable_versioned_extension_dir
enable_dependency_tracking
enable_largefile
enable_nls
@@ -1413,6 +1414,8 @@ Optional Features:
--enable-builtin-intdiv0
enable built-in intdiv0 function
--disable-mpfr do not check for MPFR
+ --enable-versioned-extension-dir
+ use a versioned directory for extensions
--enable-dependency-tracking
do not reject slow dependency extractors
--disable-dependency-tracking
@@ -2589,7 +2592,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# With Autoconf 2.5x, this needs to come very early on, but *after*
# the INIT macro. Sigh.
-if test "x$INSTALL" = "x"
+if test "$INSTALL" = ""
then
INSTALL="$srcdir/install-sh -c"
export INSTALL
@@ -3245,6 +3248,25 @@ if test "${enable_mpfr+set}" = set; then :
fi
+EXTENSIONDIR=
+# Check whether --enable-versioned-extension-dir was given.
+if test "${enable_versioned_extension_dir+set}" = set; then :
+ enableval=$enable_versioned_extension_dir; if test "$enableval" = yes
+ then
+ MAJOR=`awk '/define gawk_api_major_version/ { print $3 }' < $srcdir/gawkapi.h`
+ MINOR=`awk '/define gawk_api_minor_version/ { print $3 }' < $srcdir/gawkapi.h`
+
+ # note leading slash on the value
+ export EXTENSIONDIR=/ext-$MAJOR.$MINOR
+ fi
+
+fi
+
+
+# set default shared library location
+pkgextensiondir='${pkglibdir}'${EXTENSIONDIR}
+
+
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -5406,9 +5428,6 @@ fi
# shared library suffix for dynamic loading:
-# default shared library location
-pkgextensiondir='${pkglibdir}'
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for z/OS USS compilation" >&5
@@ -8326,7 +8345,7 @@ done
fi
- if test "x$build_alias" != "x$host_alias"; then
+ if test "$build_alias" != "$host_alias"; then
TEST_CROSS_COMPILE_TRUE=
TEST_CROSS_COMPILE_FALSE='#'
else
@@ -8840,7 +8859,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
done
- if test "x$rsync_cv_socklen_t_equiv" = x
+ if test "$rsync_cv_socklen_t_equiv" = ""
then
rsync_cv_socklen_t_equiv=int
fi
@@ -9974,7 +9993,7 @@ if test "${enable_extensions+set}" = set; then :
enableval=$enable_extensions;
fi
-if test "x$enable_extensions" != "xno"
+if test "$enable_extensions" != "no"
then
extensions_supported=no
@@ -10054,15 +10073,6 @@ fi
$as_echo "#define DYNAMIC 1" >>confdefs.h
- # Add -export-dynamic for old extensions. Only works for GCC
- if test "$GCC" = yes
- then
- case $host_os in
- linux*|freebsd*)
- LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
- ;;
- esac
- fi
fi
fi
@@ -10071,13 +10081,13 @@ fi
;;
esac
- if test "x$enable_extensions$extensions_supported" = "xyesno"
+ if test "$enable_extensions$extensions_supported" = "yesno"
then
as_fn_error $? "extension support requested, but unavailable" "$LINENO" 5
fi
enable_extensions=$extensions_supported
fi
- if test "x$enable_extensions" = "xyes"; then
+ if test "$enable_extensions" = "yes"; then
ENABLE_EXTENSIONS_TRUE=
ENABLE_EXTENSIONS_FALSE='#'
else
@@ -10988,7 +10998,7 @@ esac
ac_config_files="$ac_config_files Makefile support/Makefile awklib/Makefile doc/Makefile extras/Makefile po/Makefile.in test/Makefile"
-if test "x$enable_extensions" = "xyes"
+if test "$enable_extensions" = "yes"
then