<p>Alexander Traud has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/8425">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: In NetBSD, the Python Programming Language is python-2.7.<br><br>ASTERISK-27717<br><br>Change-Id: If90ddf9c396c32e7402a894f42dce215c30049d1<br>---<br>M configure<br>M configure.ac<br>2 files changed, 103 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/25/8425/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/configure b/configure<br>index bbd6297..0fe54f8 100755<br>--- a/configure<br>+++ b/configure<br>@@ -6770,8 +6770,10 @@<br> fi<br> <br> <br>-# Extract the first word of "python", so it can be a program name with args.<br>-set dummy python; ac_word=$2<br>+for ac_prog in python2.7 python<br>+do<br>+  # Extract the first word of "$ac_prog", so it can be a program name with args.<br>+set dummy $ac_prog; ac_word=$2<br> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5<br> $as_echo_n "checking for $ac_word... " >&6; }<br> if ${ac_cv_path_PYTHON+:} false; then :<br>@@ -6797,7 +6799,6 @@<br>   done<br> IFS=$as_save_IFS<br> <br>-  test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON=":"<br>   ;;<br> esac<br> fi<br>@@ -6810,6 +6811,10 @@<br> $as_echo "no" >&6; }<br> fi<br> <br>+<br>+  test -n "$PYTHON" && break<br>+done<br>+test -n "$PYTHON" || PYTHON=":"<br> <br> # Extract the first word of "find", so it can be a program name with args.<br> set dummy find; ac_word=$2<br>@@ -25624,6 +25629,95 @@<br>     pkg_cv_PYTHONDEV_CFLAGS="$PYTHONDEV_CFLAGS"<br>  elif test -n "$PKG_CONFIG"; then<br>     if test -n "$PKG_CONFIG" && \<br>+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-2.7\""; } >&5<br>+  ($PKG_CONFIG --exists --print-errors "python-2.7") 2>&5<br>+  ac_status=$?<br>+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5<br>+  test $ac_status = 0; }; then<br>+  pkg_cv_PYTHONDEV_CFLAGS=`$PKG_CONFIG --cflags "python-2.7" 2>/dev/null`<br>+                test "x$?" != "x0" && pkg_failed=yes<br>+else<br>+  pkg_failed=yes<br>+fi<br>+ else<br>+    pkg_failed=untried<br>+fi<br>+if test -n "$PYTHONDEV_LIBS"; then<br>+    pkg_cv_PYTHONDEV_LIBS="$PYTHONDEV_LIBS"<br>+ elif test -n "$PKG_CONFIG"; then<br>+    if test -n "$PKG_CONFIG" && \<br>+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-2.7\""; } >&5<br>+  ($PKG_CONFIG --exists --print-errors "python-2.7") 2>&5<br>+  ac_status=$?<br>+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5<br>+  test $ac_status = 0; }; then<br>+  pkg_cv_PYTHONDEV_LIBS=`$PKG_CONFIG --libs "python-2.7" 2>/dev/null`<br>+               test "x$?" != "x0" && pkg_failed=yes<br>+else<br>+  pkg_failed=yes<br>+fi<br>+ else<br>+    pkg_failed=untried<br>+fi<br>+<br>+<br>+<br>+if test $pkg_failed = yes; then<br>+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>+$as_echo "no" >&6; }<br>+<br>+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then<br>+        _pkg_short_errors_supported=yes<br>+else<br>+        _pkg_short_errors_supported=no<br>+fi<br>+        if test $_pkg_short_errors_supported = yes; then<br>+               PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-2.7" 2>&1`<br>+        else<br>+           PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-2.7" 2>&1`<br>+        fi<br>+    # Put the nasty error message in config.log where it belongs<br>+ echo "$PYTHONDEV_PKG_ERRORS" >&5<br>+<br>+<br>+            PBX_PYTHONDEV=0<br>+<br>+<br>+elif test $pkg_failed = untried; then<br>+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>+$as_echo "no" >&6; }<br>+<br>+            PBX_PYTHONDEV=0<br>+<br>+<br>+else<br>+      PYTHONDEV_CFLAGS=$pkg_cv_PYTHONDEV_CFLAGS<br>+    PYTHONDEV_LIBS=$pkg_cv_PYTHONDEV_LIBS<br>+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5<br>+$as_echo "yes" >&6; }<br>+<br>+            PBX_PYTHONDEV=1<br>+            PYTHONDEV_INCLUDE="$PYTHONDEV_CFLAGS"<br>+            PYTHONDEV_LIB="$PYTHONDEV_LIBS"<br>+<br>+$as_echo "#define HAVE_PYTHONDEV 1" >>confdefs.h<br>+<br>+<br>+fi<br>+   fi<br>+<br>+if test "${PBX_PYTHONDEV}" != 1; then<br>+<br>+   if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then<br>+<br>+pkg_failed=no<br>+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHONDEV" >&5<br>+$as_echo_n "checking for PYTHONDEV... " >&6; }<br>+<br>+if test -n "$PYTHONDEV_CFLAGS"; then<br>+    pkg_cv_PYTHONDEV_CFLAGS="$PYTHONDEV_CFLAGS"<br>+ elif test -n "$PKG_CONFIG"; then<br>+    if test -n "$PKG_CONFIG" && \<br>     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python\""; } >&5<br>   ($PKG_CONFIG --exists --print-errors "python") 2>&5<br>   ac_status=$?<br>@@ -25701,6 +25795,7 @@<br> fi<br>    fi<br> <br>+fi<br> <br> <br> if test "x${PBX_POPT}" != "x1" -a "${USE_POPT}" != "no"; then<br>diff --git a/configure.ac b/configure.ac<br>index 71c70d6..5f94830 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -257,7 +257,7 @@<br> AC_PATH_PROG([CUT], [cut], :)<br> AC_PATH_PROG([FLEX], [flex], :)<br> AC_PATH_PROG([GREP], [grep], :)<br>-AC_PATH_PROG([PYTHON], [python], :)<br>+AC_PATH_PROGS([PYTHON], [python2.7 python], :)<br> AC_PATH_PROG([FIND], [find], :)<br> AC_PATH_PROG([COMPRESS], [compress], :)<br> AC_PATH_PROG([BASENAME], [basename], :)<br>@@ -2248,7 +2248,10 @@<br> <br> AC_SUBST([PYTHONDEV_LIB])<br> AC_SUBST([PYTHONDEV_INCLUDE])<br>-AST_PKG_CONFIG_CHECK([PYTHONDEV], [python])<br>+AST_PKG_CONFIG_CHECK([PYTHONDEV], [python-2.7])<br>+if test "${PBX_PYTHONDEV}" != 1; then<br>+   AST_PKG_CONFIG_CHECK([PYTHONDEV], [python])<br>+fi<br> <br> AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])<br> <br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8425">change 8425</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8425"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If90ddf9c396c32e7402a894f42dce215c30049d1 </div>
<div style="display:none"> Gerrit-Change-Number: 8425 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>