Drop ARCH pseudo-check, its result is never used (so it seems). Default offset-prefi...

svn path=/main/branches/prefix/; revision=8320

diff --git a/cnf/Makefile.in b/cnf/Makefile.in
index 2dfd6893ab3d68bed25c0a95529df841e0a7bd8b..111deea28307f3c234262259a21adc8337c0c707 100644 (file)
--- a/cnf/Makefile.in
+++ b/cnf/Makefile.in
@@ -2,7 +2,6 @@ prefix = @prefix@
 sysconfdir = @sysconfdir@
 datadir = @datadir@
 DEFAULT_PATH = @DEFAULT_PATH@
-ARCH = @ARCH@
 
 srcdir=@srcdir@
 top_builddir=@top_builddir@

diff --git a/configure.in b/configure.in
index 64a4ae1bebb172e232a1787e03bd67fdcb7ba7ea..cca0e438d5e5674c973d1a069edb28a6bdfd8fea 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -194,9 +194,10 @@ else
 fi
 
 AC_ARG_WITH(offset-prefix, 
-AC_HELP_STRING([--with-offset-prefix], [specify the installation prefix for all packages , defaults to /]),
-[DOMAIN_PREFIX=$withval],
-[DOMAIN_PREFIX='/'])
+AC_HELP_STRING([--with-offset-prefix],
+                          [specify the installation prefix for all packages, defaults to an empty string]),
+                          [DOMAIN_PREFIX=$withval],
+                          [DOMAIN_PREFIX=''])
 
 DEFAULT_PATH="${DOMAIN_PREFIX}/usr/bin:${DOMAIN_PREFIX}/usr/sbin:${DOMAIN_PREFIX}/bin:${DOMAIN_PREFIX}/sbin:${prefix}/bin"
 AC_ARG_WITH(default-path, 
@@ -204,21 +205,6 @@ AC_HELP_STRING([--with-default-path], [specify additional PATHs available to the
 [DEFAULT_PATH="${DEFAULT_PATH}":$withval],
 [DEFAULT_PATH="${DEFAULT_PATH}"])
 
-
-AC_MSG_CHECKING([for ARCH to be used])
-dnl detect ARCH from target_cpu
-case "${target_cpu}" in
-i?86) ARCH=x86 ;;
-sparc*) ARCH=sparc ;;
-hppa*) ARCH=hppa ;;
-powerpc*) ARCH=ppc ;;
-dnl don't know more target_cpus yet...
-*) AC_MSG_RESULT([unknown])
-   AC_MSG_CHECKING([for default ARCH to be used])
-   ARCH=${target_cpu} ;;
-esac
-AC_MSG_RESULT([${ARCH}])
-
 AC_CONFIG_FILES([ Makefile ])
 AC_CONFIG_FILES([ subst-install ])
 AC_CONFIG_FILES([ subst-install.vars.in ])
@@ -235,7 +221,6 @@ AC_SUBST(rootuid)
 AC_SUBST(rootgid)
 AC_SUBST(DOMAIN_PREFIX)
 AC_SUBST(DEFAULT_PATH)
-AC_SUBST(ARCH)
 AC_SUBST(PORTAGE_BASE,['${exec_prefix}/lib/portage'])
 AM_CONDITIONAL(INSTALL_PYTHON_SOURCES, test x$enable_py_sources = xtrue)
 AM_CONDITIONAL(BUILD_TBZ2TOOL, test x$enable_tbz2tool = xtrue)