Use the correct branch integrated property when generating the version string.

Update the make_version file to the latest Asterisk version with the
appropriate libpri required chage.


git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.4@705 2fbb986a-6c06-0410-b554-c9c1f0a7f128

build_tools/make_version

@@ -10,7 +10,12 @@ elif [ -d .svn ]; then
 
     REV=`svnversion -c ${1} | cut -d: -f2`
 
-    BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1`
+    INTEGRATED=`LANG=C svn pg automerge-propname ${1}`
+    if [ -z "${INTEGRATED}" ] ; then
+        INTEGRATED=svnmerge-integrated
+    fi
+
+    BASE=`LANG=C svn pg ${INTEGRATED} ${1} | cut -d: -f1`
 
     if [ "${PARTS}" = "trunk" ] ; then
         echo SVN-trunk-r${REV}
@@ -30,7 +35,7 @@ elif [ -d .svn ]; then
         fi
 
         if [ ${BRANCH} != 0 ] ; then
-        if [ -z ${RESULT} ] ; then
+            if [ -z "${RESULT}" ] ; then
                 RESULT="${PART}"
             else
                 RESULT="${RESULT}-${PART}"
@@ -39,7 +44,7 @@ elif [ -d .svn ]; then
         fi
 
         if [ ${TEAM} != 0 ] ; then
-        if [ -z ${RESULT} ] ; then
+            if [ -z "${RESULT}" ] ; then
                 RESULT="${PART}"
             else
                 RESULT="${RESULT}-${PART}"
@@ -69,4 +74,6 @@ elif [ -d .svn ]; then
     else
         echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
     fi
+else
+    echo "UNKNOWN__and_probably_unsupported"
 fi