[asterisk-commits] branch group/autoconf_and_menuselect r18399 -
/team/group/autoconf_and_menuse...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Apr 7 13:11:31 MST 2006
Author: kpfleming
Date: Fri Apr 7 15:11:30 2006
New Revision: 18399
URL: http://svn.digium.com/view/asterisk?rev=18399&view=rev
Log:
various cleanups, and remove unneeded files
Added:
team/group/autoconf_and_menuselect/autoconf/acinclude.m4
- copied, changed from r18342, team/group/autoconf_and_menuselect/autoconf/aclocal.m4
Removed:
team/group/autoconf_and_menuselect/autoconf/Makefile.am
team/group/autoconf_and_menuselect/autoconf/aclocal.m4
team/group/autoconf_and_menuselect/autoconf/install-sh
team/group/autoconf_and_menuselect/autoconf/missing
Modified:
team/group/autoconf_and_menuselect/autoconf/autoconfig.h.in
team/group/autoconf_and_menuselect/autoconf/configure.ac
team/group/autoconf_and_menuselect/autoconf/makeopts.in
Copied: team/group/autoconf_and_menuselect/autoconf/acinclude.m4 (from r18342, team/group/autoconf_and_menuselect/autoconf/aclocal.m4)
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/autoconf/acinclude.m4?p2=team/group/autoconf_and_menuselect/autoconf/acinclude.m4&p1=team/group/autoconf_and_menuselect/autoconf/aclocal.m4&r1=18342&r2=18399&rev=18399&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/autoconf/aclocal.m4 (original)
+++ team/group/autoconf_and_menuselect/autoconf/acinclude.m4 Fri Apr 7 15:11:30 2006
@@ -1,58 +1,8 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# AST_EXT_LIB([NAME], [FUNCTION], [package name], [additional LIB data])
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 7
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-
-
-# AST_EXT_LIB([NAME], [FUNCTION], [package name])
-
-# -------------------------------------
-# Define a conditional.
AC_DEFUN([AST_EXT_LIB],
[
-AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1=PATH],[use AS_TR_CPP($3) files in PATH]),[
+AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1=PATH],[use $3 files in PATH]),[
case ${withval} in
n|no)
USE_$1=no
@@ -70,22 +20,22 @@
PBX_LIB$1=0
if test "${USE_$1}" != "no"; then
-
- AC_CHECK_LIB([$1], [$2], AC_DEFINE([AS_TR_CPP(HAVE_LIB$1)], [], [Define to indicate the $3 library]), [], -L${$1_DIR}/lib)
+ AC_CHECK_LIB([$1], [$2], AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_LIB$1]), 1,
+ [Define to indicate the $3 library]), [], -L${$1_DIR}/lib $4)
if test "${ac_cv_lib_$1_$2}" = "yes"; then
- $1_LIB="-l$1"
+ $1_LIB="-l$1 $4"
if test "x${$1_DIR}" != "x"; then
$1_LIB="-L${$1_DIR}/lib ${$1_LIB}"
- $1_INCLUDE="-I${$1_DIR}/include"
- AC_SUBST([$1_INCLUDE])
+ $1_INCLUDE="-I${$1_DIR}/include"
+ AC_SUBST([$1_INCLUDE])
fi
AC_SUBST([$1_LIB])
PBX_LIB$1=1
elif test ! -z "${$1_MANDATORY}";
then
echo "***"
- echo "*** The AS_TR_CPP($3) installation on this system appears to be broken."
+ echo "*** The $3 installation on this system appears to be broken."
echo "*** Either correct the installation, or run configure"
echo "*** including --without-$1"
exit 1
@@ -93,4 +43,3 @@
fi
AC_SUBST([PBX_LIB$1])
])
-
Modified: team/group/autoconf_and_menuselect/autoconf/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/autoconf/autoconfig.h.in?rev=18399&r1=18398&r2=18399&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/autoconf/autoconfig.h.in (original)
+++ team/group/autoconf_and_menuselect/autoconf/autoconfig.h.in Fri Apr 7 15:11:30 2006
@@ -36,6 +36,9 @@
/* Define to 1 if your system has a working `chown' function. */
#undef HAVE_CHOWN
+/* Define if your system has the curl libraries. */
+#undef HAVE_CURL
+
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H
@@ -76,6 +79,9 @@
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
+/* Define if your system has the GTK libraries. */
+#undef HAVE_GTK
+
/* Define to 1 if you have the `inet_ntoa' function. */
#undef HAVE_INET_NTOA
@@ -85,99 +91,68 @@
/* Define to 1 if you have the `isascii' function. */
#undef HAVE_ISASCII
-/* Define to indicate the ALSA sound libraries should be used */
+/* Define if your system has the KDE libraries. */
+#undef HAVE_KDE
+
+/* Define to indicate the ALSA library */
#undef HAVE_LIBASOUND
-/* Define to 1 if you have the `c' library (-lc). */
-#undef HAVE_LIBC
-
-/* Define to 1 if you have the `crypto' library (-lcrypto). */
-#undef HAVE_LIBCRYPTO
-
-/* Define to 1 if you have the `curses' library (-lcurses). */
-#undef HAVE_LIBCURSES
-
-/* Define to 1 if you have the `dl' library (-ldl). */
-#undef HAVE_LIBDL
-
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
-/* Define to indicate the MFCR2 libraries should be used */
+/* Define to indicate the MFCR2 library */
#undef HAVE_LIBMFCR2
-/* Define to indicate the NBS (Network Broadcast Sound) libraries should be
- used for sound operations. */
+/* Define to indicate the NBS library */
#undef HAVE_LIBNBS
-/* Define to 1 if you have the `ncurses' library (-lncurses). */
-#undef HAVE_LIBNCURSES
-
-/* Define to indicate the newt libraries should be used for GUI operations. */
+/* Define to indicate the newt library */
#undef HAVE_LIBNEWT
-/* Define to indicate the Qt libraries should be used for GUI operations. */
-#undef HAVE_QT
-
-/* Define to indicate the KDE libraries should be used for GUI operations. */
-#undef HAVE_KDE
-
-/* Define to indicate the GTK libraries should be used for GUI operations. */
-#undef HAVE_GTK
-
-/* Define to indicate the CURL libraries */
-#undef HAVE_CURL
-
-
-/* Define to indicate the Ogg libraries */
+/* Define to indicate the unixODBC library */
+#undef HAVE_LIBODBC
+
+/* Define to indicate the OGG library */
#undef HAVE_LIBOGG
-/* Define to indicate the OSPTK libraries should be used for audio operations.
- */
+/* Define to indicate the OSP Toolkit library */
#undef HAVE_LIBOSPTK
-/* Define to indicate the OSS audio libraries should be used for sound
- operations. */
+/* Define to indicate the OSS library */
#undef HAVE_LIBOSSAUDIO
-/* Define to indicate the popt libraries should be used for GUI operations. */
+/* Define to indicate the popt library */
#undef HAVE_LIBPOPT
-/* Define to indicate the PRI libraries should be used */
+/* Define to indicate the PostgresQL library */
+#undef HAVE_LIBPQ
+
+/* Define to indicate the ISDN PRI library */
#undef HAVE_LIBPRI
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-#undef HAVE_LIBPTHREAD
-
-/* Define to 1 if you have the `resolv' library (-lresolv). */
-#undef HAVE_LIBRESOLV
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
-/* Define to indicate the SPEEX libraries should be used for audio operations.
- */
+/* Define if your system has the pwlib libraries. */
+#undef HAVE_LIBPWLIB
+
+/* Define to indicate the Speex library */
#undef HAVE_LIBSPEEX
-/* Define to indicate the sqlite libraries should be used for database
- operations. */
+/* Define to indicate the SQLite library */
#undef HAVE_LIBSQLITE
-/* Define to indicate the OpenSSL libraries should be used for cryptographic
- operations. */
+/* Define to indicate the OpenSSL library */
#undef HAVE_LIBSSL
-/* Define to indicate the FreeTDS libraries should be used */
+/* Define to indicate the FreeTDS library */
#undef HAVE_LIBTDS
-/* Define to indicate the vorbis libraries should be used. */
+/* Define to indicate the Zaptel library */
+#undef HAVE_LIBTONEZONE
+
+/* Define to indicate the Vorbis library */
#undef HAVE_LIBVORBIS
-/* Define to 1 if you have the `z' library (-lz). */
+/* Define if your system has the VoiceTronix (vpb) libraries. */
+#undef HAVE_LIBVPB
+
+/* Define to indicate the zlib library */
#undef HAVE_LIBZ
-
-/* Define to indicate the Zaptel libraries */
-#undef HAVE_LIBZAPTEL
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
@@ -225,10 +200,6 @@
/* Define to 1 if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
-/* Define to indicate the PostgreSQL libraries should be used for database
- operations. */
-#undef HAVE_PGSQL
-
/* Define to 1 if you have the `pow' function. */
#undef HAVE_POW
@@ -237,6 +208,9 @@
/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
+
+/* Define if your system has the QT libraries. */
+#undef HAVE_QT
/* Define to 1 if your system has a GNU libc compatible `realloc' function,
and to 0 otherwise. */
@@ -372,10 +346,6 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define to indicate the unixODBC libraries should be used for database
- operations. */
-#undef HAVE_UNIXODBC
-
/* Define to 1 if you have the `utime' function. */
#undef HAVE_UTIME
@@ -399,10 +369,6 @@
/* Define to 1 if `vfork' works. */
#undef HAVE_WORKING_VFORK
-
-/* Define to indicate the Z libraries should be used for compression
- operations. */
-#undef HAVE_Z
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
@@ -493,10 +459,6 @@
/* Define according to your operating system type. */
#undef Win32
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
- `char[]'. */
-#undef YYTEXT_POINTER
-
/* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES
Modified: team/group/autoconf_and_menuselect/autoconf/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/autoconf/configure.ac?rev=18399&r1=18398&r2=18399&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/autoconf/configure.ac (original)
+++ team/group/autoconf_and_menuselect/autoconf/configure.ac Fri Apr 7 15:11:30 2006
@@ -1,4 +1,3 @@
- -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
@@ -15,9 +14,9 @@
AC_CANONICAL_TARGET
# check existence of the package
-AC_CONFIG_SRCDIR([../dnsmgr.c])
-
-# specifiy output header file
+AC_CONFIG_SRCDIR([../asterisk.c])
+
+# specify output header file
AC_CONFIG_HEADER(autoconfig.h)
AC_COPYRIGHT("Asterisk")
@@ -33,16 +32,15 @@
AC_DEFINE_UNQUOTED(PBX_OS, "${host_os}",
[Define this to be the name of the OS of your system.])
-# esport some useful defines
-zPBX_PLATFORM=${host}
-zPBX_CPU=${host_cpu}
-zPBX_VENDOR=${host_vendor}
-zPBX_OS=${host_os}
-AC_SUBST(zPBX_PLATFORM)
-AC_SUBST(zPBX_CPU)
-AC_SUBST(zPBX_VENDOR)
-AC_SUBST(zPBX_OS)
-
+# export some useful defines
+PBX_PLATFORM=${host}
+PBX_CPU=${host_cpu}
+PBX_VENDOR=${host_vendor}
+PBX_OS=${host_os}
+AC_SUBST(PBX_PLATFORM)
+AC_SUBST(PBX_CPU)
+AC_SUBST(PBX_VENDOR)
+AC_SUBST(PBX_OS)
# check for uname
AC_PATH_TOOL([UNAME], [uname], No)
@@ -51,7 +49,6 @@
fi
AC_SUBST(PBX_OSREV)
-
# guest OS type
case "${host}" in
cygwin*|mingw*|windows*|winnt)
@@ -91,7 +88,6 @@
;;
esac
AC_SUBST(PBX_OSTYPE)
-
# cross-compile checks
if test x"${build}" != x"${host}";
@@ -114,13 +110,10 @@
AC_PROG_CC
AC_PROG_CXX
AC_PROG_AWK
-AC_PROG_YACC
-AC_PROG_LEX
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_RANLIB
-AC_PROG_INSTALL
AC_PATH_PROG([GREP], [grep], :)
AC_PATH_PROG([MAKE], [make], :)
@@ -132,6 +125,7 @@
AC_PATH_PROG([SHELL], [sh], :)
AC_PATH_PROG([LN], [ln], :)
+AC_LANG(C)
# turn on/off developer mode...
AC_ARG_ENABLE(debug,
@@ -142,64 +136,33 @@
*) AC_MSG_ERROR(bad value ${enableval} for --enable-developer-mode) ;;
esac])
-
-AC_LANG(C)
-
-#######################
-#
-# check for the existance of external libraries..
-#
-#######################
-
-#######################
-# non mandatory library..
-#######################
-
-echo "->> cheking external libraries..."
-
-#######################
-# Audio/Voice codecs...
-#######################
-# OGG/Vorbis
-# check for ogg lib
AST_EXT_LIB([ogg], [ogg_sync_init], [OGG] )
-
-#######################
-# check for vorbis libs
AST_EXT_LIB([vorbis], [vorbis_info_init], [Vorbis])
-
-#######################
-# turn on asound..
-AST_EXT_LIB([asound], [snd_spcm_init], [ALSASound])
-
-#######################
-# turn on nbs.. xxx
+AST_EXT_LIB([asound], [snd_spcm_init], [ALSA])
AST_EXT_LIB([nbs], [nbs_setup], [NBS])
-
-#######################
-# turn on oss.. xxx
-AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [OSS Audio])
-
-#######################
-# turn on libspeex.. xxx
+AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [OSS])
AST_EXT_LIB([speex], [speex_encode], [Speex])
-
-#######################
-# Drivers/Protocols..
-#######################
-# Zaptel drivers..
AST_EXT_LIB([tonezone], [tone_zone_find], [Zaptel])
-
-#######################
-# turn on QuickNet driver(ixjuser)..
-HAVE_QUICKNET=1
+AST_EXT_LIB([pri], [pri_call], [ISDN PRI])
+AST_EXT_LIB([mfcr2], [mfcr2_MakeCall], [MFCR2])
+AST_EXT_LIB([osptk], [OSPPCryptoDecrypt], [OSP Toolkit])
+AST_EXT_LIB([odbc], [SQLConnect], [unixODBC])
+AST_EXT_LIB([pq], [PQexec], [PostgresQL])
+AST_EXT_LIB([sqlite], [sqlite_exec], [SQLite])
+AST_EXT_LIB([tds], [tds_version], [FreeTDS])
+AST_EXT_LIB([popt], [poptStrerror], [popt])
+AST_EXT_LIB([newt], [newtBell], [newt])
+AST_EXT_LIB([ssl], [ssl2_connect], [OpenSSL], [-lcrypto])
+AST_EXT_LIB([z], [compress], [zlib])
+
+PBX_H323=0
+AC_CHECK_HEADER([h323.h], [PBX_H323=1], [])
+AC_SUBST(PBX_H323)
+
+HAVE_QUICKNET=0
AC_CHECK_HEADER([ixjuser.h], [HAVE_QUICKNET=1],[])
AC_SUBST(HAVE_QUICKNET)
-
-AC_LANG(C++)
-#######################
-# turn on vpb..
AC_ARG_WITH([vpb], AC_HELP_STRING([--with-vpb=PATH],[use vpb files in PATH]),[
case ${withval} in
n|no)
@@ -215,18 +178,15 @@
esac
])
if test "${USE_VPB}" != "no"; then
-
- echo "checking for vpb_open in -lvpb..."
-
- saved_ldflags="${LDFLAGS}"
- LDFLAGS="${LDFLAGS} -L${VPB_DIR} -lvpb"
-
- AC_LINK_IFELSE(
+ echo -n "checking for vpb_open in -lvpb..."
+ saved_ldflags="${LDFLAGS}"
+ LDFLAGS="${LDFLAGS} -L${VPB_DIR} -lvpb"
+ AC_LINK_IFELSE(
[
AC_LANG_PROGRAM(
[#include "${VPB_DIR}/vpbapi.h"],
[
- int q = vpb_open(0,0);])
+ int q = vp b_open(0,0);])
],
[ AC_MSG_RESULT(yes)
ac_cv_lib_vpb_vpb_open="yes"
@@ -238,20 +198,20 @@
LDFLAGS="${saved_ldflags}"
PBX_LIBvpb=0
- if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then
- VPB_LIB="-lvpb"
- if test "${VPB_DIR}" != ""; then
- VPB_LIB="-L${VPB_DIR}/lib ${VPB_LIB}"
- VPB_INCLUDE="-I${VPB_DIR}/include"
- AC_SUBST([VPB_INCLUDE])
- fi
- AC_SUBST([VPB_LIB])
- PBX_LIBvpb=1
- AC_DEFINE([HAVE_LIBVPB])
+ if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then
+ VPB_LIB="-lvpb"
+ if test "${VPB_DIR}" != ""; then
+ VPB_LIB="-L${VPB_DIR}/lib ${VPB_LIB}"
+ VPB_INCLUDE="-I${VPB_DIR}/include"
+ AC_SUBST([VPB_INCLUDE])
+ fi
+ AC_SUBST([VPB_LIB])
+ PBX_LIBvpb=1
+ AC_DEFINE([HAVE_LIBVPB], 1, [Define if your system has the VoiceTronix (vpb) libraries.])
elif test ! -z "${VPB_MANDATORY}";
then
echo "***"
- echo "*** The Voice-Tronix installation on this system appears to be broken."
+ echo "*** The VoiceTronix (vpb) installation on this system appears to be broken."
echo "*** Either correct the installation, or run configure"
echo "*** including --without-vpb."
exit 1
@@ -259,61 +219,6 @@
fi
AC_SUBST([PBX_LIBvpb])
-AC_LANG(C)
-
-
-#######################
-# turn on libpri..(ISDN)
-AST_EXT_LIB([pri], [pri_cal], [ISDN PRI])
-
-#######################
-# turn on libmfcr2.. (zapata)
-AST_EXT_LIB([mfcr2], [mfcr2_MakeCall], [MFCR2])
-
-#######################
-# turn on libosptk.. xxx
-AST_EXT_LIB([osptk], [OSPPCryptoDecrypt], [OSPTK])
-
-#######################
-# turn on h323.. xxx
-PBX_H323=1
-AC_CHECK_HEADER([h323.h], [], [PBX_H323=0])
-AC_SUBST(PBX_H323)
-
-#######################
-# Database...
-#######################
-# ODBC checks
-AST_EXT_LIB([odbc], [SQLConnect], [Unix ODBC])
-
-#######################
-# pgsql checks
-AST_EXT_LIB([pq], [PQexec], [PostgresQL])
-
-#######################
-# turn on sqlite..
-AST_EXT_LIB([sqlite], [sqlite_exec], [SQLite])
-
-#######################
-# turn on tds..
-# 1TODO: check lib version..
-AST_EXT_LIB([tds], [tds_version], [FreeTDS])
-
-#######################
-# GUI toolkits..
-#######################
-# turn on libpopt..
-AST_EXT_LIB([popt], [poptStrerror], [Popt])
-
-#######################
-# turn on libnewt.. xxx
-AST_EXT_LIB([newt], [newtBell], [newt])
-
-
-AC_LANG(C++)
-
-#######################
-# turn on Qt.. xxx
PBX_QT=0
AC_PATH_TOOL(QTMOC, moc, No)
if test ! x"${QTMOC}" = xNo; then
@@ -324,14 +229,12 @@
[${QTDIR}/include/qapplication.h],
[
PBX_QT=1
- AC_DEFINE([HAVE_QT])
+ AC_DEFINE([HAVE_QT], 1, [Define if your system has the QT libraries.])
])
fi
AC_SUBST(PBX_QT)
AC_SUBST(QTDIR)
-#######################
-# turn on KDE.. xxx
PBX_KDE=0
AC_PATH_TOOL(KDEINIT, kdeinit, No)
if test ! x"${KDEINIT}" = xNo; then
@@ -344,40 +247,28 @@
[${KDEDIR}/include/kdebug.h],
[
PBX_KDE=1
- AC_DEFINE([HAVE_KDE])
+ AC_DEFINE([HAVE_KDE], 1, [Define if your system has the KDE libraries.])
])
fi
-echo "KDE = ${PBX_KDE}"
AC_SUBST(PBX_KDE)
AC_SUBST(KDEDIR)
AC_SUBST(KDE_INCLUDE)
AC_SUBST(KDE_LIBS)
-
-#######################
-# setup GTK
PBX_GTK=0
AC_CHECK_TOOL(GTKCONFIG, gtk-config, No)
if test ! "x${GTKCONFIG}" = xNo; then
GTK_INCLUDE=$(${GTKCONFIG} --cflags gthread)
GTK_LIBS=$(${GTKCONFIG} --libs gthread)
PBX_GTK=1
- AC_DEFINE([HAVE_GTK])
+ AC_DEFINE([HAVE_GTK], 1, [Define if your system has the GTK libraries.])
fi
AC_SUBST(PBX_GTK)
AC_SUBST(GTK_INCLUDE)
AC_SUBST(GTK_LIBS)
-
-
-
-#######################
-# Miscelanious libs..
-#######################
-# turn on pwlib..
PLATFORM_PTLIB="ptlib_${OSTYPE}_${MACHTYPE}_r"
-#PLATFORM_PTLIB="ptlib_linux_x86_r"
AC_ARG_WITH([pwlib], AC_HELP_STRING([--with-pwlib=PATH],[use PWLib files in PATH]),[
case ${withval} in
@@ -392,7 +283,7 @@
esac
])
if test "${USE_PWLIB}" != "no"; then
- echo "checking for existence of pwlib..."
+ echo -n "checking for existence of pwlib..."
saved_ldflags="${LDFLAGS}"
LDFLAGS="${LDFLAGS} -L${PWLIB_DIR} -l${PLATFORM_PTLIB}"
@@ -424,7 +315,7 @@
fi
AC_SUBST([PWLIB_LIB])
PBX_LIBPWLIB=1
- AC_DEFINE([HAVE_LIBPWLIB])
+ AC_DEFINE([HAVE_LIBPWLIB], 1, [Define if your system has the pwlib libraries.])
elif test ! -z "${PWLIB_DIR}";
then
echo "***"
@@ -436,49 +327,17 @@
fi
AC_SUBST([PBX_LIBPWLIB])
-
-
-#######################
-# turn on CURL library.. xxx
PBX_CURL=0
AC_PATH_TOOL([CURL], [curl-config], No)
if test ! x"${CURL}" = xNo; then
# check for version
CURLLIBS=$(${CURL} --libs)
PBX_CURL=1
- AC_DEFINE([HAVE_CURL])
+ AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.])
fi
AC_SUBST(PBX_CURL)
AC_SUBST(CURLLIBS)
-
-# SSL checks
-AST_EXT_LIB([ssl], [ssl2_connect], [OpenSSL])
-
-# Z lib checks
-AST_EXT_LIB([z], [compress], [GZip])
-
-
-#######################
-# mandatory libraries..
-#######################
-AC_CHECK_LIB([c], [memcpy], [], [AC_MSG_ERROR("you need c library to compile asterisk")])
-AC_CHECK_LIB([crypto], [CRYPTO_malloc], [], [AC_MSG_ERROR("you need crypto library to compile asterisk")])
-AC_CHECK_LIB([dl], [dlopen], [], [AC_MSG_ERROR("you need dl library to compile asterisk")])
-#AC_CHECK_LIB([expat], [XML_SetBase], [], [AC_MSG_ERROR("you need expat library to compile asterisk")])
-AC_CHECK_LIB([m], [powl], [], [AC_MSG_ERROR("you need m library to compile asterisk")])
-AC_CHECK_LIB([curses], [wclear], [],
- [AC_CHECK_LIB([ncurses], [wclear], [],[AC_MSG_ERROR("you need ncurses library to compile asterisk")])])
-#AC_CHECK_LIB([nsl], [nis_perror], [], [AC_MSG_ERROR("you need nsl library to compile asterisk")])
-AC_CHECK_LIB([pthread], [pthread_create], [], [AC_MSG_ERROR("you need pthread library to compile asterisk")])
-AC_CHECK_LIB([resolv], [inet_neta], [], [AC_MSG_ERROR("you need resolv library to compile asterisk")])
-#AC_CHECK_LIB([rt], [mq_send], [], [AC_MSG_ERROR("you need rt library to compile asterisk")])
-AC_CHECK_LIB([socket], [socket])
-
-
-
-
-# Checks for header files.
AC_FUNC_ALLOCA
AC_HEADER_DIRENT
AC_HEADER_STDC
@@ -505,7 +364,6 @@
AC_FUNC_CLOSEDIR_VOID
AC_FUNC_ERROR_AT_LINE
AC_FUNC_FORK
-#AC_FUNC_GETLOADAVG
AC_PROG_GCC_TRADITIONAL
AC_FUNC_MALLOC
AC_FUNC_MEMCMP
@@ -523,7 +381,6 @@
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([atexit bzero dup2 endpwent floor ftruncate getcwd gethostbyname gethostname gettimeofday inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap pow putenv re_comp regcomp rint select setenv socket sqrt strcasecmp strchr strcspn strdup strerror strncasecmp strndup strrchr strspn strstr strtol utime])
-
AC_CONFIG_FILES([menuselect-deps makeopts])
AC_OUTPUT
Modified: team/group/autoconf_and_menuselect/autoconf/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/autoconf/makeopts.in?rev=18399&r1=18398&r2=18399&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/autoconf/makeopts.in (original)
+++ team/group/autoconf_and_menuselect/autoconf/makeopts.in Fri Apr 7 15:11:30 2006
@@ -14,10 +14,9 @@
LN=@LN@
QTMOC=@QTMOC@
-
CROSS_ARCH=@PBX_OSTYPE@
-CROSS_PROC=@zPBX_CPU@
-PROC=@zPBX_CPU@
+CROSS_PROC=@PBX_CPU@
+PROC=@PBX_CPU@
OSARCH=@PBX_OSTYPE@
OSREV=@PBX_OSREV@
@@ -85,7 +84,6 @@
Z_LIB=@z_LIB@
Z_INCLUDE=@z_INCLUDE@
-
QTDIR = @QTDIR@
KDEDIR=@KDEDIR@
@@ -94,4 +92,3 @@
GTK_INCLUDE=@GTK_INCLUDE@
GTK_LIBS=@GTK_LIBS@
-
More information about the asterisk-commits
mailing list