diff options
| -rw-r--r-- | config/Tools.mk.in | 6 | ||||
| -rwxr-xr-x | tools/configure | 28 | ||||
| -rw-r--r-- | tools/configure.ac | 4 | ||||
| -rw-r--r-- | tools/m4/default_lib.m4 | 14 |
4 files changed, 4 insertions, 48 deletions
diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 8a52bccda3..b6bdad0915 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -1,7 +1,9 @@ # Prefix and install folder -PREFIX := @prefix@ +prefix := @prefix@ +PREFIX := $(prefix) exec_prefix := @exec_prefix@ -LIBDIR := @libdir@ +libdir := @libdir@ +LIBDIR := $(libdir) # A debug build of tools? debug := @debug@ diff --git a/tools/configure b/tools/configure index aa1d96f90c..6107d88d12 100755 --- a/tools/configure +++ b/tools/configure @@ -606,7 +606,6 @@ libgcrypt libext2fs system_aio zlib -LIB_PATH glib_LIBS glib_CFLAGS PKG_CONFIG_LIBDIR @@ -2311,8 +2310,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) # @@ -6125,31 +6122,6 @@ $as_echo "yes" >&6; } fi -# Check library path -if test "\${exec_prefix}/lib" = "$libdir"; then : - if test "$exec_prefix" = "NONE" && test "$prefix" != "NONE"; then : - exec_prefix=$prefix -fi - if test "$exec_prefix" = "NONE"; then : - exec_prefix=$ac_default_prefix -fi - if test -d "${exec_prefix}/lib64"; then : - - LIB_PATH="lib64" - -else - - LIB_PATH="lib" - -fi - -else - - LIB_PATH="${libdir:`expr length "$exec_prefix" + 1`}" - -fi - - # Checks for libraries. ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default" if test "x$ac_cv_header_bzlib_h" = x""yes; then : diff --git a/tools/configure.ac b/tools/configure.ac index bb497cca92..b41ba9ca71 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -28,7 +28,6 @@ m4_include([m4/path_or_fail.m4]) m4_include([m4/python_version.m4]) m4_include([m4/python_devel.m4]) m4_include([m4/ocaml.m4]) -m4_include([m4/default_lib.m4]) m4_include([m4/set_cflags_ldflags.m4]) m4_include([m4/uuid.m4]) m4_include([m4/pkg.m4]) @@ -121,9 +120,6 @@ esac AX_CHECK_CURSES PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12]) -# Check library path -AX_DEFAULT_LIB - # Checks for libraries. AC_CHECK_HEADER([bzlib.h], [ AC_CHECK_LIB([bz2], [BZ2_bzDecompressInit], [zlib="$zlib -DHAVE_BZLIB -lbz2"]) diff --git a/tools/m4/default_lib.m4 b/tools/m4/default_lib.m4 deleted file mode 100644 index 2e986836d8..0000000000 --- a/tools/m4/default_lib.m4 +++ /dev/null @@ -1,14 +0,0 @@ -AC_DEFUN([AX_DEFAULT_LIB], -[AS_IF([test "\${exec_prefix}/lib" = "$libdir"], - [AS_IF([test "$exec_prefix" = "NONE" && test "$prefix" != "NONE"], - [exec_prefix=$prefix]) - AS_IF([test "$exec_prefix" = "NONE"], [exec_prefix=$ac_default_prefix]) - AS_IF([test -d "${exec_prefix}/lib64"], [ - LIB_PATH="lib64" - ],[ - LIB_PATH="lib" - ]) -], [ - LIB_PATH="${libdir:`expr length "$exec_prefix" + 1`}" -]) -AC_SUBST(LIB_PATH)]) |