Updated pandora-build.

[awesomized/libmemcached] / m4 / pandora_with_python.m4

diff --git a/m4/pandora_with_python.m4 b/m4/pandora_with_python.m4
index 97aa57f8d0df4b3a6b26975e599fd550bce82362..5b28c8ed0e233e28652bcdc0cb3d150a9ea9ddf2 100644 (file)
--- a/m4/pandora_with_python.m4
+++ b/m4/pandora_with_python.m4
@@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
 dnl   
 dnl pandora-build: A pedantic build system
 dnl Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; the Free Software Foundation
+dnl This file is free software; Sun Microsystems
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
@@ -15,8 +15,12 @@ AC_DEFUN([PANDORA_WITH_PYTHON], [
   AC_ARG_WITH([python], 
     [AS_HELP_STRING([--with-python],
       [Build Python Bindings @<:@default=yes@:>@])],
-    [with_python=$withval], 
-    [with_python=yes])
+    [with_python=$withval
+     python_requested=$withval
+    ], 
+    [with_python=yes
+     python_requested=no
+    ])
 
   AS_IF([test "x$with_python" != "xno"],[
     AS_IF([test "x$with_python" != "xyes"],[PYTHON=$with_python])
@@ -24,5 +28,10 @@ AC_DEFUN([PANDORA_WITH_PYTHON], [
     AC_PYTHON_DEVEL()
     AS_IF([test "x$pythonexists" = "xno"],[with_python="no"])
   ])
+  AS_IF([test "x$with_python" = "xno" -a "$python_requested" = "yes"],[
+    AC_MSG_ERROR([Python support was explicity requested, but Python support
+                  was not found. Please correct your build environment and try
+                  again])
+  ])
   AM_CONDITIONAL(BUILD_PYTHON, [test "$with_python" = "yes"])
 ])