[asterisk-commits] qwell: branch 1.8 r279658 - in /branches/1.8: ./ include/asterisk/ sounds/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Jul 26 18:03:42 CDT 2010 

Author: qwell
Date: Mon Jul 26 18:03:38 2010
New Revision: 279658

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=279658
Log:
Merged revisions 279657 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r279657 | qwell | 2010-07-26 17:59:52 -0500 (Mon, 26 Jul 2010) | 5 lines
  
  Really fix sounds Makefile (and make it readableish).
  
  There was a rather large syntax error that should have caused ALL versions of GNU make to fail.
  I don't know how it worked.
........

Added:
    branches/1.8/sounds/Makefile
      - copied, changed from r279635, branches/1.8/sounds/Makefile.381
Removed:
    branches/1.8/sounds/Makefile.380
    branches/1.8/sounds/Makefile.381
Modified:
    branches/1.8/   (props changed)
    branches/1.8/configure
    branches/1.8/configure.ac
    branches/1.8/include/asterisk/autoconfig.h.in

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-merged (original)
+++ branch-1.6.2-merged Mon Jul 26 18:03:38 2010
@@ -1,1 +1,1 @@
-/branches/1.6.2:1-279056,279207,279501,279561,279597,279609
+/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657

Modified: branches/1.8/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configure.ac?view=diff&rev=279658&r1=279657&r2=279658
==============================================================================
--- branches/1.8/configure.ac (original)
+++ branches/1.8/configure.ac Mon Jul 26 18:03:38 2010
@@ -175,12 +175,6 @@
 AC_PROG_LN_S
 AC_PROG_RANLIB
 AST_CHECK_GNU_MAKE
-
-if test ${ac_cv_GNU_MAKE_VERSION_MAJOR} -gt 2 -a ${ac_cv_GNU_MAKE_VERSION_MINOR} -gt 80; then
-	$LN_S -f Makefile.381 sounds/Makefile
-else
-	$LN_S -f Makefile.380 sounds/Makefile
-fi
 
 AC_CHECK_TOOLS([STRIP], [strip gstrip], :)
 AC_CHECK_TOOLS([AR], [ar gar], :)

Modified: branches/1.8/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/include/asterisk/autoconfig.h.in?view=diff&rev=279658&r1=279657&r2=279658
==============================================================================
--- branches/1.8/include/asterisk/autoconfig.h.in (original)
+++ branches/1.8/include/asterisk/autoconfig.h.in Mon Jul 26 18:03:38 2010
@@ -803,7 +803,7 @@
 /* Define to 1 if you have the `strtoq' function. */
 #undef HAVE_STRTOQ
 
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
 /* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1074,11 +1074,11 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
-
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -1098,11 +1098,6 @@
 
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
-
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
-   second argument and the buffer pointer as the third, as on System V before
-   release 3. */
-#undef SETVBUF_REVERSED
 
 /* The size of `char *', as computed by sizeof. */
 #undef SIZEOF_CHAR_P
@@ -1133,20 +1128,30 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE
@@ -1163,20 +1168,6 @@
 
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
-
-/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

Copied: branches/1.8/sounds/Makefile (from r279635, branches/1.8/sounds/Makefile.381)
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/sounds/Makefile?view=diff&rev=279658&p1=branches/1.8/sounds/Makefile.381&r1=279635&p2=branches/1.8/sounds/Makefile&r2=279658
==============================================================================
--- branches/1.8/sounds/Makefile.381 (original)
+++ branches/1.8/sounds/Makefile Mon Jul 26 18:03:38 2010
@@ -68,39 +68,42 @@
 DOWNLOAD+=--continue $(WGET_EXTRA_ARGS)
 endif
 
-EMPTY:=
-BS:=$(EMPTY)\$(EMPTY)
-
 ifneq ($(SOUNDS_CACHE_DIR),)
 
 define sound_format_lang_rule
 $$($(1))/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download
-	$(CMD_PREFIX)PACKAGE=$$(subst $$($(1))/.asterisk,asterisk,$$@).tar.gz; $(BS)
-	if test ! -f $$$${PACKAGE}; then $(BS)
-	  if test ! -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}; then $(BS)
-	    (cd $$(SOUNDS_CACHE_DIR); ($$(DOWNLOAD) $$(SOUNDS_URL)/$$$${PACKAGE} && $(BS)
-		   $$(DOWNLOAD) $$(SOUNDS_URL)/$$$${PACKAGE}.sha1 $(BS)
-	       && $$(SHA1SUM) -c --status $$$${PACKAGE}.sha1) || $(BS)
-	     (echo "Bad checksum: $$$${PACKAGE}" 1>&2; exit 1)); $(BS)
-	  fi; $(BS)
-	  $(LN) -sf $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE} .; $(BS)
-	fi; $(BS)
-$(if $($(4)_VERSION),\
-$(EMPTY)	rm -f $$(subst -$$($(4)_VERSION),,$$@)-* && $(BS)
-,)	(cd $$($(1))$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && $(BS)
-	touch $$@
+	$(CMD_PREFIX)PACKAGE=$$(subst $$($(1))/.asterisk,asterisk,$$@).tar.gz; \
+	if test ! -f $$$${PACKAGE}; then \
+	  if test ! -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}; then \
+	    (cd $$(SOUNDS_CACHE_DIR); \
+	      ( \
+	        $$(DOWNLOAD) $$(SOUNDS_URL)/$$$${PACKAGE} && \
+	        $$(DOWNLOAD) $$(SOUNDS_URL)/$$$${PACKAGE}.sha1 && \
+	        $$(SHA1SUM) -c --status $$$${PACKAGE}.sha1 \
+	      ) || \
+	      (echo "Bad checksum: $$$${PACKAGE}" 1>&2; exit 1) \
+	    ); \
+	  fi; \
+	  $(LN) -sf $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE} .; \
+	fi; \
+	$(if $($(4)_VERSION),rm -f $$(subst -$$($(4)_VERSION),,$$@)-*,); \
+	(cd $$($(1))$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@
 endef
 
 define sound_download_rule
 asterisk-$(1)-%.tar.gz: have_download
-	$(CMD_PREFIX)if test ! -f $$@ && test ! -f $$(SOUNDS_DIR)/.$$(subst .tar.gz,,$/$@); then $(BS)
-	  if test ! -f $$(SOUNDS_CACHE_DIR)/$$@; then $(BS)
-	    (cd $$(SOUNDS_CACHE_DIR); ($$(DOWNLOAD) $$(SOUNDS_URL)/$$@ && $(BS)
-		   $$(DOWNLOAD) $$(SOUNDS_URL)/$$@.sha1 $(BS)
-	       && $$(SHA1SUM) -c --status $$@.sha1) || $(BS)
-	     (echo "Bad checksum: $$@" 1>&2; exit 1)); $(BS)
-	  fi; $(BS)
-	  $(LN) -sf $$(SOUNDS_CACHE_DIR)/$$@ .; $(BS)
+	$(CMD_PREFIX)if test ! -f $$@ && test ! -f $$(SOUNDS_DIR)/.$$(subst .tar.gz,,$/$@); then \
+	  if test ! -f $$(SOUNDS_CACHE_DIR)/$$@; then \
+	    (cd $$(SOUNDS_CACHE_DIR); \
+	      ( \
+	        $$(DOWNLOAD) $$(SOUNDS_URL)/$$@ && \
+		$$(DOWNLOAD) $$(SOUNDS_URL)/$$@.sha1 && \
+	        $$(SHA1SUM) -c --status $$@.sha1 \
+	      ) || \
+	      (echo "Bad checksum: $$@" 1>&2; exit 1) \
+	    ); \
+	  fi; \
+	  $(LN) -sf $$(SOUNDS_CACHE_DIR)/$$@ .; \
 	fi
 endef
 
@@ -108,20 +111,18 @@
 
 define sound_format_lang_rule
 $$($(1))/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download
-	$(CMD_PREFIX)PACKAGE=$$(subst $$($(1))/.asterisk,asterisk,$$@).tar.gz; $(BS)
-	if test ! -f $$$${PACKAGE}; then $(BS)
-	  ($$(DOWNLOAD) $$(SOUNDS_URL)/$$$${PACKAGE} || exit 1); $(BS)
-	fi; $(BS)
-$(if $($(4)_VERSION),\
-$(EMPTY)	rm -f $$(subst -$$($(4)_VERSION),,$$@)-* && $(BS)
-,)	(cd $$($(1))$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && $(BS)
-	touch $$@
+	$(CMD_PREFIX)PACKAGE=$$(subst $$($(1))/.asterisk,asterisk,$$@).tar.gz; \
+	if test ! -f $$$${PACKAGE}; then \
+	  ($$(DOWNLOAD) $$(SOUNDS_URL)/$$$${PACKAGE} || exit 1); \
+	fi; \
+	$(if $($(4)_VERSION),rm -f $$(subst -$$($(4)_VERSION),,$$@)-*,); \
+	(cd $$($(1))$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@
 endef
 
 define sound_download_rule
 asterisk-$(1)-%.tar.gz: have_download
-	$(CMD_PREFIX)if test ! -f $$@ && test ! -f $$(SOUNDS_DIR)/.$$(subst .tar.gz,,$$@); then $(BS)
-	  $$(DOWNLOAD) $$(SOUNDS_URL)/$$@; $(BS)
+	$(CMD_PREFIX)if test ! -f $$@ && test ! -f $$(SOUNDS_DIR)/.$$(subst .tar.gz,,$$@); then \
+	  $$(DOWNLOAD) $$(SOUNDS_URL)/$$@; \
 	fi
 endef

More information about the asterisk-commits mailing list