From 274ce731e27a395596173f33f1d9f6d178043983 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Wed, 7 Jun 2006 19:05:35 +0000
Subject: [PATCH] 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 | 1 +
acl.c | 1 -
configure | 6 +++---
configure.ac | 2 +-
include/asterisk.h | 2 +-
include/{ => asterisk}/autoconfig.h.in | 2 +-
pbx.c | 1 -
utils/ael_main.c | 2 +-
utils/astman.c | 2 +-
utils/smsq.c | 2 +-
10 files changed, 10 insertions(+), 11 deletions(-)
rename include/{ => asterisk}/autoconfig.h.in (99%)
diff --git a/Makefile b/Makefile
index ac59244d17..12ba2565a6 100644
--- a/Makefile
+++ b/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)) ;\
diff --git a/acl.c b/acl.c
index 7b5850d03e..b3ca903625 100644
--- a/acl.c
+++ b/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 */
diff --git a/configure b/configure
index a8b4e2c239..d606e6b66a 100755
--- a/configure
+++ b/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" ;;
diff --git a/configure.ac b/configure.ac
index fc2b7ef5fa..92bc87ac61 100644
--- a/configure.ac
+++ b/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$)
diff --git a/include/asterisk.h b/include/asterisk.h
index f6a5f1f509..2b979e4883 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -18,7 +18,7 @@
#ifndef _ASTERISK_H
#define _ASTERISK_H
-#include "autoconfig.h"
+#include "asterisk/autoconfig.h"
#include "asterisk/compat.h"
diff --git a/include/autoconfig.h.in b/include/asterisk/autoconfig.h.in
similarity index 99%
rename from include/autoconfig.h.in
rename to include/asterisk/autoconfig.h.in
index a5c34af516..604922ac1f 100644
--- a/include/autoconfig.h.in
+++ b/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
diff --git a/pbx.c b/pbx.c
index c0095787b7..40ec7752e3 100644
--- a/pbx.c
+++ b/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"
/*!
diff --git a/utils/ael_main.c b/utils/ael_main.c
index 69be09f06e..5ac4030079 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -1,4 +1,4 @@
-#include "autoconfig.h"
+#include "asterisk/autoconfig.h"
#include <sys/types.h>
#include <stdio.h>
diff --git a/utils/astman.c b/utils/astman.c
index b6dd9ec57c..733f377b38 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -22,7 +22,7 @@
*
*/
-#include "autoconfig.h"
+#include "asterisk/autoconfig.h"
#include <newt.h>
#include <stdio.h>
diff --git a/utils/smsq.c b/utils/smsq.c
index 20b6d376e6..4954e118bb 100644
--- a/utils/smsq.c
+++ b/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>
--
GitLab