mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-19 19:52:48 +00:00
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
This commit is contained in:
1
Makefile
1
Makefile
@@ -635,6 +635,7 @@ bininstall: all
|
|||||||
chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
|
chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
|
||||||
fi
|
fi
|
||||||
$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
|
$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
|
||||||
|
$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
|
||||||
$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
|
$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
|
||||||
if [ -n "$(OLDHEADERS)" ]; then \
|
if [ -n "$(OLDHEADERS)" ]; then \
|
||||||
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
|
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
|
||||||
|
1
acl.c
1
acl.c
@@ -69,7 +69,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|||||||
#include "asterisk/utils.h"
|
#include "asterisk/utils.h"
|
||||||
#include "asterisk/lock.h"
|
#include "asterisk/lock.h"
|
||||||
#include "asterisk/srv.h"
|
#include "asterisk/srv.h"
|
||||||
#include "asterisk/compat.h"
|
|
||||||
|
|
||||||
struct ast_ha {
|
struct ast_ha {
|
||||||
/* Host access rule */
|
/* Host access rule */
|
||||||
|
6
configure
vendored
6
configure
vendored
@@ -1,5 +1,5 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# From configure.ac Revision: 30458 .
|
# From configure.ac Revision: 32846 .
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.59e.
|
# Generated by GNU Autoconf 2.59e.
|
||||||
#
|
#
|
||||||
@@ -2015,7 +2015,7 @@ test -n "$target_alias" &&
|
|||||||
|
|
||||||
|
|
||||||
# specify output header file
|
# 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
|
for ac_config_target in $ac_config_targets
|
||||||
do
|
do
|
||||||
case $ac_config_target in
|
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" ;;
|
"build_tools/menuselect-deps") CONFIG_FILES="$CONFIG_FILES build_tools/menuselect-deps" ;;
|
||||||
"makeopts") CONFIG_FILES="$CONFIG_FILES makeopts" ;;
|
"makeopts") CONFIG_FILES="$CONFIG_FILES makeopts" ;;
|
||||||
|
|
||||||
|
@@ -17,7 +17,7 @@ AC_CANONICAL_TARGET
|
|||||||
AC_CONFIG_SRCDIR([asterisk.c])
|
AC_CONFIG_SRCDIR([asterisk.c])
|
||||||
|
|
||||||
# specify output header file
|
# specify output header file
|
||||||
AC_CONFIG_HEADER(include/autoconfig.h)
|
AC_CONFIG_HEADER(include/asterisk/autoconfig.h)
|
||||||
|
|
||||||
AC_COPYRIGHT("Asterisk")
|
AC_COPYRIGHT("Asterisk")
|
||||||
AC_REVISION($Revision$)
|
AC_REVISION($Revision$)
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
#ifndef _ASTERISK_H
|
#ifndef _ASTERISK_H
|
||||||
#define _ASTERISK_H
|
#define _ASTERISK_H
|
||||||
|
|
||||||
#include "autoconfig.h"
|
#include "asterisk/autoconfig.h"
|
||||||
|
|
||||||
#include "asterisk/compat.h"
|
#include "asterisk/compat.h"
|
||||||
|
|
||||||
|
@@ -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
|
#ifndef ASTERISK_AUTOCONFIG_H
|
||||||
#define ASTERISK_AUTOCONFIG_H
|
#define ASTERISK_AUTOCONFIG_H
|
1
pbx.c
1
pbx.c
@@ -58,7 +58,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|||||||
#include "asterisk/musiconhold.h"
|
#include "asterisk/musiconhold.h"
|
||||||
#include "asterisk/app.h"
|
#include "asterisk/app.h"
|
||||||
#include "asterisk/devicestate.h"
|
#include "asterisk/devicestate.h"
|
||||||
#include "asterisk/compat.h"
|
|
||||||
#include "asterisk/stringfields.h"
|
#include "asterisk/stringfields.h"
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
#include "autoconfig.h"
|
#include "asterisk/autoconfig.h"
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@@ -22,7 +22,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "autoconfig.h"
|
#include "asterisk/autoconfig.h"
|
||||||
|
|
||||||
#include <newt.h>
|
#include <newt.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@@ -17,7 +17,7 @@
|
|||||||
* at the top of the source tree.
|
* at the top of the source tree.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "autoconfig.h"
|
#include "asterisk/autoconfig.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <popt.h>
|
#include <popt.h>
|
||||||
|
Reference in New Issue
Block a user