[asterisk-commits] kmoore: trunk r378585 - in /trunk: ./ res/pjproject/ res/pjproject/build/

[SVN commits to the Asterisk project]

Author: kmoore
Date: Fri Jan  4 16:19:16 2013
New Revision: 378585

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=378585
Log:
Fix pjproject compilation in certain circumstances

On a fresh checkout of Asterisk 11, running make before ./configure
could cause the pjproject subdirectory to get in an odd state that
would prevent compilation. This patch by Tilghman prevents that from
occurring.

(closes issue ASTERISK-20681)
Patch-by: Tilghman Lesher
........

Merged revisions 378582 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/res/pjproject/aconfigure
    trunk/res/pjproject/aconfigure.ac
    trunk/res/pjproject/build/common.mak

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/res/pjproject/aconfigure
URL: http://svnview.digium.com/svn/asterisk/trunk/res/pjproject/aconfigure?view=diff&rev=378585&r1=378584&r2=378585
==============================================================================
--- trunk/res/pjproject/aconfigure (original)
+++ trunk/res/pjproject/aconfigure Fri Jan  4 16:19:16 2013
@@ -2401,7 +2401,7 @@
   program_prefix=${target_alias}-
 ac_config_headers="$ac_config_headers pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjmedia/include/pjmedia/config_auto.h pjmedia/include/pjmedia-codec/config_auto.h pjsip/include/pjsip/sip_autoconf.h"
 
-ac_config_files="$ac_config_files build.mak build/os-auto.mak build/cc-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/os-auto.mak third_party/build/portaudio/os-auto.mak"
+ac_config_files="$ac_config_files build.mak build/os-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/os-auto.mak third_party/build/portaudio/os-auto.mak"
 
 
 
@@ -7799,7 +7799,6 @@
     "pjsip/include/pjsip/sip_autoconf.h") CONFIG_HEADERS="$CONFIG_HEADERS pjsip/include/pjsip/sip_autoconf.h" ;;
     "build.mak") CONFIG_FILES="$CONFIG_FILES build.mak" ;;
     "build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES build/os-auto.mak" ;;
-    "build/cc-auto.mak") CONFIG_FILES="$CONFIG_FILES build/cc-auto.mak" ;;
     "pjlib/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjlib/build/os-auto.mak" ;;
     "pjlib-util/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjlib-util/build/os-auto.mak" ;;
     "pjmedia/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjmedia/build/os-auto.mak" ;;

Modified: trunk/res/pjproject/aconfigure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/res/pjproject/aconfigure.ac?view=diff&rev=378585&r1=378584&r2=378585
==============================================================================
--- trunk/res/pjproject/aconfigure.ac (original)
+++ trunk/res/pjproject/aconfigure.ac Fri Jan  4 16:19:16 2013
@@ -13,7 +13,6 @@
 		 ])
 AC_CONFIG_FILES([build.mak 
 		 build/os-auto.mak 
-		 build/cc-auto.mak
 		 pjlib/build/os-auto.mak 
 		 pjlib-util/build/os-auto.mak 
 		 pjmedia/build/os-auto.mak

Modified: trunk/res/pjproject/build/common.mak
URL: http://svnview.digium.com/svn/asterisk/trunk/res/pjproject/build/common.mak?view=diff&rev=378585&r1=378584&r2=378585
==============================================================================
--- trunk/res/pjproject/build/common.mak (original)
+++ trunk/res/pjproject/build/common.mak Fri Jan  4 16:19:16 2013
@@ -15,15 +15,6 @@
 # located in this directory.
 #
 -include cc-$(CC_NAME).mak
-
-#
-# Include auto configured compiler specification.
-# This will override the compiler settings above.
-# Currently this is made OPTIONAL, to prevent people
-# from getting errors because they don't re-run ./configure
-# after downloading new PJSIP.
-#
--include $(PJDIR)/build/cc-auto.mak
 
 #
 # Include global machine specific definitions