move autoconfig.h to the include/asterisk directory so it will get installed

install asterisk.h include the system's default include directory


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32860 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

@@ -635,6 +635,7 @@ bininstall: all
 		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)) ;\

acl.c

@@ -69,7 +69,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/srv.h"
-#include "asterisk/compat.h"
 
 struct ast_ha {
 	/* Host access rule */

configure

@@ -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 @@ test -n "$target_alias" &&
 
 
 # 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 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 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" ;;
 

configure.ac

@@ -17,7 +17,7 @@ AC_CANONICAL_TARGET
 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$)

include/asterisk.h

@@ -18,7 +18,7 @@
 #ifndef _ASTERISK_H
 #define _ASTERISK_H
 
-#include "autoconfig.h"
+#include "asterisk/autoconfig.h"
 
 #include "asterisk/compat.h"
 

include/asterisk/autoconfig.h.in

@@ -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

pbx.c

@@ -58,7 +58,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/musiconhold.h"
 #include "asterisk/app.h"
 #include "asterisk/devicestate.h"
-#include "asterisk/compat.h"
 #include "asterisk/stringfields.h"
 
 /*!

utils/ael_main.c

@@ -1,4 +1,4 @@
-#include "autoconfig.h"
+#include "asterisk/autoconfig.h"
 
 #include <sys/types.h>
 #include <stdio.h>

utils/astman.c

@@ -22,7 +22,7 @@
  *
  */
  
-#include "autoconfig.h"
+#include "asterisk/autoconfig.h"
 
 #include <newt.h>
 #include <stdio.h>

utils/smsq.c

@@ -17,7 +17,7 @@
  * at the top of the source tree.
  */
 
-#include "autoconfig.h"
+#include "asterisk/autoconfig.h"
 
 #include <stdio.h>
 #include <popt.h>