Changeset 79516

Timestamp:

06/16/11 04:28:13 (4 years ago)

Author:

jmr@…

Message:

add a configure arg to allow using an unsupported prefix (see #18602)

Location:

trunk/base

Files:

• configure (modified) (3 diffs)
• configure.ac (modified) (1 diff)

trunk/base/configure

@@ -794 +794 @@
 with_objc_runtime
 with_objc_foundation
+with_unsupported_prefix
 with_ports_dir
 with_no_root_privileges
@@ -1467 +1468 @@
   --with-objc-runtime     Specify either "GNU" or "apple"
   --with-objc-foundation  Specify either "GNUstep" or "apple"
+  --with-unsupported-prefix
+                          Acknowledge that you accept the consequences of
+                          using an unsupported prefix.
   --with-ports-dir=DIR    Specify alternate ports directory
   --with-no-root-privileges
@@ -7634 +7638 @@
 # Check for paths
 
-if test x$prefix = x/usr/local; then
-    as_fn_error $? "Installing MacPorts into /usr/local is not supported" "$LINENO" 5
+
+# Check whether --with-unsupported-prefix was given.
+if test "${with_unsupported_prefix+set}" = set; then :
+  withval=$with_unsupported_prefix; with_unsupported_prefix=$withval
+else
+  with_unsupported_prefix=no
+fi
+
+if test x$prefix = x/usr/local -a x$with_unsupported_prefix != xyes; then
+    as_fn_error $? "Installing MacPorts into /usr/local is not supported. If \
+you understand this and wish to do so anyway, pass --with-unsupported-prefix \
+to configure." "$LINENO" 5
 fi
 

trunk/base/configure.ac

@@ -171 +171 @@
 # Check for paths
 AC_PREFIX_DEFAULT(/opt/local)
-if test x$prefix = x/usr/local; then
-    AC_MSG_ERROR([Installing MacPorts into /usr/local is not supported])
+AC_ARG_WITH(
+                unsupported-prefix,
+                AS_HELP_STRING([--with-unsupported-prefix],
+                [Acknowledge that you accept the consequences of using an unsupported prefix.]),
+                [with_unsupported_prefix=$withval],
+                [with_unsupported_prefix=no])
+if test x$prefix = x/usr/local -a x$with_unsupported_prefix != xyes; then
+    AC_MSG_ERROR([Installing MacPorts into /usr/local is not supported. If \
+you understand this and wish to do so anyway, pass --with-unsupported-prefix \
+to configure.])
 fi
 MP_PATH_PORTSDIR([$PORTS_DIR_DEFAULT])