[asterisk-commits] trunk r32860 - in /trunk: ./ include/ include/asterisk/ utils/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed Jun  7 14:05:35 2006
New Revision: 32860

URL: http://svn.digium.com/view/asterisk?rev=32860&view=rev
Log:
move autoconfig.h to the include/asterisk directory so it will get installed
install asterisk.h include the system's default include directory

Added:
    trunk/include/asterisk/autoconfig.h.in
      - copied, changed from r32846, trunk/include/autoconfig.h.in
Removed:
    trunk/include/autoconfig.h.in
Modified:
    trunk/Makefile
    trunk/acl.c
    trunk/configure
    trunk/configure.ac
    trunk/include/   (props changed)
    trunk/include/asterisk/   (props changed)
    trunk/include/asterisk.h
    trunk/pbx.c
    trunk/utils/ael_main.c
    trunk/utils/astman.c
    trunk/utils/smsq.c

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jun  7 14:05:35 2006
@@ -635,6 +635,7 @@
 		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
 	fi
 	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
+	$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
 	$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\

Modified: trunk/acl.c
URL: http://svn.digium.com/view/asterisk/trunk/acl.c?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- trunk/acl.c (original)
+++ trunk/acl.c Wed Jun  7 14:05:35 2006
@@ -69,7 +69,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/srv.h"
-#include "asterisk/compat.h"
 
 struct ast_ha {
 	/* Host access rule */

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Wed Jun  7 14:05:35 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 30458 .
+# From configure.ac Revision: 32846 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59e.
 #
@@ -2015,7 +2015,7 @@
 
 
 # specify output header file
-ac_config_headers="$ac_config_headers include/autoconfig.h"
+ac_config_headers="$ac_config_headers include/asterisk/autoconfig.h"
 
 
 
@@ -26855,7 +26855,7 @@
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "include/autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS include/autoconfig.h" ;;
+    "include/asterisk/autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS include/asterisk/autoconfig.h" ;;
     "build_tools/menuselect-deps") CONFIG_FILES="$CONFIG_FILES build_tools/menuselect-deps" ;;
     "makeopts") CONFIG_FILES="$CONFIG_FILES makeopts" ;;
 

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Jun  7 14:05:35 2006
@@ -17,7 +17,7 @@
 AC_CONFIG_SRCDIR([asterisk.c])
 
 # specify output header file
-AC_CONFIG_HEADER(include/autoconfig.h)
+AC_CONFIG_HEADER(include/asterisk/autoconfig.h)
 
 AC_COPYRIGHT("Asterisk")
 AC_REVISION($Revision$)

Propchange: trunk/include/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jun  7 14:05:35 2006
@@ -1,1 +1,1 @@
-autoconfig.h
+

Propchange: trunk/include/asterisk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jun  7 14:05:35 2006
@@ -1,3 +1,4 @@
 build.h
 version.h
 buildopts.h
+autoconfigh

Modified: trunk/include/asterisk.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk.h?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- trunk/include/asterisk.h (original)
+++ trunk/include/asterisk.h Wed Jun  7 14:05:35 2006
@@ -18,7 +18,7 @@
 #ifndef _ASTERISK_H
 #define _ASTERISK_H
 
-#include "autoconfig.h"
+#include "asterisk/autoconfig.h"
 
 #include "asterisk/compat.h"
 

Copied: trunk/include/asterisk/autoconfig.h.in (from r32846, trunk/include/autoconfig.h.in)
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/autoconfig.h.in?p2=trunk/include/asterisk/autoconfig.h.in&p1=trunk/include/autoconfig.h.in&r1=32846&r2=32860&rev=32860&view=diff
==============================================================================
--- trunk/include/autoconfig.h.in (original)
+++ trunk/include/asterisk/autoconfig.h.in Wed Jun  7 14:05:35 2006
@@ -1,4 +1,4 @@
-/* include/autoconfig.h.in.  Generated from configure.ac by autoheader.  */
+/* include/asterisk/autoconfig.h.in.  Generated from configure.ac by autoheader.  */
 
 #ifndef ASTERISK_AUTOCONFIG_H
 #define ASTERISK_AUTOCONFIG_H

Modified: trunk/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx.c?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- trunk/pbx.c (original)
+++ trunk/pbx.c Wed Jun  7 14:05:35 2006
@@ -58,7 +58,6 @@
 #include "asterisk/musiconhold.h"
 #include "asterisk/app.h"
 #include "asterisk/devicestate.h"
-#include "asterisk/compat.h"
 #include "asterisk/stringfields.h"
 
 /*!

Modified: trunk/utils/ael_main.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/ael_main.c?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- trunk/utils/ael_main.c (original)
+++ trunk/utils/ael_main.c Wed Jun  7 14:05:35 2006
@@ -1,4 +1,4 @@
-#include "autoconfig.h"
+#include "asterisk/autoconfig.h"
 
 #include <sys/types.h>
 #include <stdio.h>

Modified: trunk/utils/astman.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/astman.c?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- trunk/utils/astman.c (original)
+++ trunk/utils/astman.c Wed Jun  7 14:05:35 2006
@@ -22,7 +22,7 @@
  *
  */
  
-#include "autoconfig.h"
+#include "asterisk/autoconfig.h"
 
 #include <newt.h>
 #include <stdio.h>

Modified: trunk/utils/smsq.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/smsq.c?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- trunk/utils/smsq.c (original)
+++ trunk/utils/smsq.c Wed Jun  7 14:05:35 2006
@@ -17,7 +17,7 @@
  * at the top of the source tree.
  */
 
-#include "autoconfig.h"
+#include "asterisk/autoconfig.h"
 
 #include <stdio.h>
 #include <popt.h>