Few configure.ac adjustments

- Use the extensions autoconf finds for object and executable files.
- Remove the sorev variable, and replace SOREV definition with sorev's.
- Default to je_ prefix on win32.
This commit is contained in:
Mike Hommey 2012-04-30 12:38:27 +02:00 committed by Jason Evans
parent a14bce85e8
commit 7cdea3973c
3 changed files with 9 additions and 15 deletions

View File

@ -4,6 +4,6 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
@LD_PRELOAD_VAR@=${libdir}/libjemalloc.@sorev@
@LD_PRELOAD_VAR@=${libdir}/libjemalloc.@SOREV@
export @LD_PRELOAD_VAR@
exec "$@"

View File

@ -195,14 +195,13 @@ AC_DEFINE_UNQUOTED([CPU_SPINWAIT], [$CPU_SPINWAIT])
LD_PRELOAD_VAR="LD_PRELOAD"
so="so"
o="o"
o="$ac_objext"
a="a"
exe=
exe="$ac_exeext"
libprefix="lib"
DSO_LDFLAGS='-shared -Wl,-soname,$(@F)'
RPATH='-Wl,-rpath,$(1)'
SOREV='$(SO).$(REV)'
sorev="${so}.${rev}"
SOREV="${so}.${rev}"
PIC_CFLAGS='-fPIC -DPIC'
dnl Heap profiling uses the log(3) function.
@ -226,8 +225,7 @@ case "${host}" in
so="dylib"
force_tls="0"
DSO_LDFLAGS='-shared -Wl,-dylib_install_name,$(@F)'
SOREV='$(REV).$(SO)'
sorev="${rev}.${so}"
SOREV="${rev}.${so}"
;;
*-*-freebsd*)
CFLAGS="$CFLAGS"
@ -281,12 +279,9 @@ case "${host}" in
RPATH=""
so="dll"
DSO_LDFLAGS="-shared"
o="obj"
a="lib"
libprefix=""
exe=".exe"
SOREV='$(SO)'
sorev="${so}"
SOREV="${so}"
PIC_CFLAGS=""
;;
*)
@ -304,7 +299,6 @@ AC_SUBST([exe])
AC_SUBST([libprefix])
AC_SUBST([DSO_LDFLAGS])
AC_SUBST([SOREV])
AC_SUBST([sorev])
AC_SUBST([PIC_CFLAGS])
JE_COMPILABLE([__attribute__ syntax],
@ -419,7 +413,7 @@ dnl Do not prefix public APIs by default.
AC_ARG_WITH([jemalloc_prefix],
[AS_HELP_STRING([--with-jemalloc-prefix=<prefix>], [Prefix to prepend to all public APIs])],
[JEMALLOC_PREFIX="$with_jemalloc_prefix"],
[if test "x$abi" != "xmacho" ; then
[if test "x$abi" != "xmacho" -a "x$abi" != "xpecoff"; then
JEMALLOC_PREFIX=""
else
JEMALLOC_PREFIX="je_"

View File

@ -161,9 +161,9 @@ get_errno(void)
{
#ifdef _WIN32
return GetLastError();
return (GetLastError());
#else
return errno;
return (errno);
#endif
}
#endif