[asterisk-commits] branch russell/autoconf_and_menuselect - r8344
/team/russell/autoconf_and_men...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Jan 20 11:16:14 MST 2006
Author: russell
Date: Fri Jan 20 12:16:12 2006
New Revision: 8344
URL: http://svn.digium.com/view/asterisk?rev=8344&view=rev
Log:
updated autoconf related files from Dancho Lazarov
Added:
team/russell/autoconf_and_menuselect/autoconf/makeopts.in
Modified:
team/russell/autoconf_and_menuselect/autoconf/Makefile.am
team/russell/autoconf_and_menuselect/autoconf/autoconfig.h.in
team/russell/autoconf_and_menuselect/autoconf/configure.ac
team/russell/autoconf_and_menuselect/autoconf/menuselect-deps.in
Modified: team/russell/autoconf_and_menuselect/autoconf/Makefile.am
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/autoconf/Makefile.am?rev=8344&r1=8343&r2=8344&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/autoconf/Makefile.am (original)
+++ team/russell/autoconf_and_menuselect/autoconf/Makefile.am Fri Jan 20 12:16:12 2006
@@ -1,1 +1,4 @@
-z = @PBX_OSTYPE@
+CXXFLAGS = @CXXFLAGS@
+CFALSG = @z_CFLAGS@
+LIBS = @LIBS@
+
Modified: team/russell/autoconf_and_menuselect/autoconf/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/autoconf/autoconfig.h.in?rev=8344&r1=8343&r2=8344&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/autoconf/autoconfig.h.in (original)
+++ team/russell/autoconf_and_menuselect/autoconf/autoconfig.h.in Fri Jan 20 12:16:12 2006
@@ -1,4 +1,4 @@
-/* config.h.in. Generated from configure.ac by autoheader. */
+/* autoconfig.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID
@@ -21,6 +21,9 @@
*/
#undef HAVE_ALLOCA_H
+/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
+#undef HAVE_ALSA_ASOUNDLIB_H
+
/* Define to 1 if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
@@ -37,9 +40,6 @@
*/
#undef HAVE_DIRENT_H
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
@@ -84,6 +84,9 @@
/* Define to 1 if you have the `isascii' function. */
#undef HAVE_ISASCII
+
+/* Define to 1 if you have the <ixjuser.h> header file. */
+#undef HAVE_IXJUSER_H
/* Define to 1 if you have the `asound' library (-lasound). */
#undef HAVE_LIBASOUND
@@ -131,6 +134,9 @@
/* Define to 1 if you have the `mfcr2' library (-lmfcr2). */
#undef HAVE_LIBMFCR2
+/* Define to 1 if you have the <libmfcr2.h> header file. */
+#undef HAVE_LIBMFCR2_H
+
/* Define to 1 if you have the `nbs' library (-lnbs). */
#undef HAVE_LIBNBS
@@ -149,6 +155,9 @@
/* Define to 1 if you have the `ogg' library (-logg). */
#undef HAVE_LIBOGG
+/* Define to 1 if you have the `osptk' library (-losptk). */
+#undef HAVE_LIBOSPTK
+
/* Define to 1 if you have the `ossaudio' library (-lossaudio). */
#undef HAVE_LIBOSSAUDIO
@@ -163,6 +172,9 @@
/* Define to 1 if you have the `pri' library (-lpri). */
#undef HAVE_LIBPRI
+
+/* Define to 1 if you have the <libpri.h> header file. */
+#undef HAVE_LIBPRI_H
/* Define to 1 if you have the `pthread' library (-lpthread). */
#undef HAVE_LIBPTHREAD
@@ -194,6 +206,9 @@
/* Define to 1 if you have the `socket' library (-lsocket). */
#undef HAVE_LIBSOCKET
+/* Define to 1 if you have the `speex' library (-lspeex). */
+#undef HAVE_LIBSPEEX
+
/* Define to 1 if you have the `sqlite' library (-lsqlite). */
#undef HAVE_LIBSQLITE
@@ -261,6 +276,9 @@
/* Define to 1 if you have the `munmap' function. */
#undef HAVE_MUNMAP
+/* Define to 1 if you have the <nbs.h> header file. */
+#undef HAVE_NBS_H
+
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
#undef HAVE_NDIR_H
@@ -270,8 +288,17 @@
/* Define to 1 if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
+/* Define to 1 if you have the <newt.h> header file. */
+#undef HAVE_NEWT_H
+
/* Define to 1 if you have the <odbcinst.h> header file. */
#undef HAVE_ODBCINST_H
+
+/* Define to 1 if you have the <osp/ospssl.h> header file. */
+#undef HAVE_OSP_OSPSSL_H
+
+/* Define to 1 if you have the <popt.h> header file. */
+#undef HAVE_POPT_H
/* Define to 1 if you have the `pow' function. */
#undef HAVE_POW
@@ -304,6 +331,9 @@
/* Define to 1 if you have the `socket' function. */
#undef HAVE_SOCKET
+/* Define to 1 if you have the <speex.h> header file. */
+#undef HAVE_SPEEX_H
+
/* Define to 1 if you have the <sqlite.h> header file. */
#undef HAVE_SQLITE_H
@@ -378,6 +408,9 @@
/* Define to 1 if you have the <syslog.h> header file. */
#undef HAVE_SYSLOG_H
+/* Define to 1 if you have the <sys/asoundlib.h> header file. */
+#undef HAVE_SYS_ASOUNDLIB_H
+
/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
*/
#undef HAVE_SYS_DIR_H
@@ -395,6 +428,9 @@
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
+/* Define to 1 if you have the <sys/poll.h> header file. */
+#undef HAVE_SYS_POLL_H
+
/* Define to 1 if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H
@@ -436,6 +472,12 @@
/* Define to 1 if you have the <vfork.h> header file. */
#undef HAVE_VFORK_H
+
+/* Define to 1 if you have the <vorbis/codec.h> header file. */
+#undef HAVE_VORBIS_CODEC_H
+
+/* Define to 1 if you have the <vpbapy.h> header file. */
+#undef HAVE_VPBAPY_H
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
Modified: team/russell/autoconf_and_menuselect/autoconf/configure.ac
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/autoconf/configure.ac?rev=8344&r1=8343&r2=8344&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/autoconf/configure.ac (original)
+++ team/russell/autoconf_and_menuselect/autoconf/configure.ac Fri Jan 20 12:16:12 2006
@@ -1,4 +1,4 @@
- -*- Autoconf -*-
+ -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
@@ -10,7 +10,9 @@
[\1]))
AC_INIT(asterisk, PBX_VERSION, bugs at asterisk.com)
-# cros-compile macros
+# cross-compile macros
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
AC_CANONICAL_TARGET
# check existence of the package
@@ -25,7 +27,7 @@
### ** Platform.
-AC_DEFINE_UNQUOTED(PBX_PLATFORM, "${host}",
+AC_DEFINE_UNQUOTED(PBX_PLATFORM, "${host},
[Define this to be the canonical name (cpu-vendor-os) of your system.])
AC_DEFINE_UNQUOTED(PBX_CPU, "${host_cpu}",
[Define this to be the name of the CPU of your system.])
@@ -39,30 +41,29 @@
AC_SUBST(PBX_VENDOR)
AC_SUBST(PBX_OS)
-
# guest OS type
-case "${host_os}" in
+case "${host}" in
cygwin*|mingw*|windows*|winnt)
AC_DEFINE(Win32, 1,
[Define according to your operating system type.])
PBX_OSTYPE="windows"
;;
- linux)
+ *linux*)
AC_DEFINE(Linux, 1,
[Define according to your operating system type.])
PBX_OSTYPE="Linux"
;;
- netbsd)
+ *netbsd*)
AC_DEFINE(NetBSD, 1,
[Define according to your operating system type.])
PBX_OSTYPE="NetBSD"
;;
- freebsd)
+ *freebsd*)
AC_DEFINE(FreeBSD, 1,
[Define according to your operating system type.])
PBX_OSTYPE="FreeBSD"
;;
- openbsd)
+ *openbsd*)
AC_DEFINE(OpenBSD, 1,
[Define according to your operating system type.])
PBX_OSTYPE="OpenBSD"
@@ -70,10 +71,64 @@
*)
AC_DEFINE(Unix, 1,
[Define according to your operating system type.])
- PBX_OSTYPE="unix"
+ PBX_OSTYPE="Unix"
;;
esac
AC_SUBST(PBX_OSTYPE)
+
+
+# cross-compile checks
+if test x"${build}" != x"${host}";
+then
+ AC_CHECK_TOOL(CC, gcc, :)
+ AC_CHECK_TOOL(CXX, g++, :)
+ AC_CHECK_TOOL(AR, ar)
+ AC_CHECK_TOOL(RANLIB, ranlib, :)
+
+ if test "x${PBX_OSTYPE}" = xWin32;
+ then
+ AC_CHECK_TOOL(NM, nm, :)
+ AC_CHECK_TOOL(WINDRES, windres, :)
+ AC_CHECK_TOOL(DLLWRAP, dllwrap, :)
+ fi
+ crossCompile="Yes"
+fi
+
+# setup cross compilation root..
+AC_ARG_WITH(cross_prefix,
+ [--with-cross-prefix=PATH directory where cross tools are installed],
+ [ if test "$withval" != no; then
+ if test "$withval" != yes; then
+ crossPrefix=$withval
+ fi
+ fi])
+
+if test "x${crossCompile}" = xYes; then
+ if test -z $crossPrefix; then
+# if test "x${crossPrefix}" = x; then
+ AC_MSG_ERROR(You have to specify cross compile prefix!. Set with --with-cross-prefix.)
+ else
+ CROSS_COMPILE_ROOT=$crossPrefix
+ CROSS_COMPILE_BIN=$crossPrefix/bin
+ CROSS_COMPILE_TARGET=$crossPrefix
+
+ AC_SUBST(CROSS_COMPILE_ROOT)
+ AC_SUBST(CROSS_COMPILE_BIN)
+ AC_SUBST(CROSS_COMPILE_TARGET)
+ fi
+fi
+
+
+# Checks for programs.
+AC_PROG_CXX
+AC_PROG_AWK
+AC_PROG_YACC
+AC_PROG_CC
+AC_PROG_LEX
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_RANLIB
# turn on/off debug...
@@ -87,6 +142,19 @@
AM_CONDITIONAL(PBX_DEBUG, test x$debug = xtrue)
+# turn on/off profile...
+AC_ARG_ENABLE(profile,
+ [ --enable-profile Turn on profiling],
+ [case "${enableval}" in
+ yes) profile=true ;;
+ no) profile=false ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-profile) ;;
+ esac])
+AM_CONDITIONAL(PBX_PROFILE, test x$profile = xtrue)
+
+
+
+AC_LANG(C)
#######################
#
@@ -94,25 +162,30 @@
#
#######################
+xInclude=$CROSS_COMPILE_ROOT/usr/include
+xLInclude=$CROSS_COMPILE_ROOT/usr/local/include
+
#######################
# zaptel module
+
PBX_ZAPTEL=1
# check header & lib
-AC_CHECK_HEADERS([zaptel.h linux/zaptel.h], [], [PBX_ZAPTEL=0])
+AC_CHECK_HEADERS([${xInclude}/zaptel.h ${xInclude}/linux/zaptel.h ${xLInclude}/zaptel.h], [], [PBX_ZAPTEL=0])
+AC_CHECK_LIB([tonezone], [tone_zone_register], [], [PBX_ZAPTEL=0])
AC_SUBST(PBX_ZAPTEL)
#######################
# turn on unix ODBC..
PBX_UNIXODBC=1
AC_CHECK_HEADERS([odbcinst.h ${LInclude}/odbcinst.h], [], [PBX_UNIXODBC=0])
-AC_CHECK_LIB([odbc], [main], [], [PBX_UNIXODBC=0])
+AC_CHECK_LIB([odbc], [SQLInstallODBC], [], [PBX_UNIXODBC=0])
AC_SUBST(PBX_UNIXODBC)
#######################
# turn on postgresql..
PBX_PGSQL=1
AC_CHECK_HEADERS([libpq-fe.h ${LInclude}/libpq-fe.h], [], [PBX_PGSQL=0])
-AC_CHECK_LIB([pq], [main], [], [PBX_PGSQL=0])
+AC_CHECK_LIB([pq], [PQexec], [], [PBX_PGSQL=0])
AC_SUBST(PBX_PGSQL)
@@ -120,7 +193,8 @@
# turn on sqlite..
PBX_SQLITE=1
AC_CHECK_HEADERS([sqlite.h ${LInclude}/sqlite.h], [], [PBX_SQLITE=0])
-AC_CHECK_LIB([sqlite], [main], [], [PBX_SQLITE=0])
+#AC_CHECK_LIB([sqlite], [sqlite3_exec], [], [PBX_SQLITE=0])
+AC_CHECK_LIB([sqlite], [sqlite_exec], [], [PBX_SQLITE=0])
AC_SUBST(PBX_SQLITE)
@@ -128,14 +202,14 @@
# turn on tds..
PBX_FREETDS=1
#AC_CHECK_HEADERS([tds.h ${LInclude}/tds.h], [], [PBX_FREETDS=0])
-AC_CHECK_HEADERS([tds.h], [], [PBX_FREETDS=0])
-AC_CHECK_LIB([tds], [main], [], [PBX_FREETDS=0])
+AC_CHECK_HEADERS([tds.h ${LInclude}/tds.h] , [], [PBX_FREETDS=0])
+AC_CHECK_LIB([tds], [tds_connect], [], [PBX_FREETDS=0])
AC_SUBST(PBX_FREETDS)
#######################
# turn on ixjuser..
PBX_IXJUSER=1
-AC_CHECK_HEADERS([ixjuser.h], [], [PBX_IXJUSER=0])
+AC_CHECK_HEADERS([ixjuser.h ${LInclude}/ixjuser.h], [], [PBX_IXJUSER=0])
AC_SUBST(PBX_IXJUSER)
#######################
@@ -148,22 +222,22 @@
#######################
# turn on vpb.. xxx
PBX_VPBAPI=1
-AC_CHECK_HEADERS([vpbapy.h], [], [PBX_VPBAPI=0])
-AC_CHECK_LIB([vpb], [main], [], [PBX_VPBAPI=0])
+AC_CHECK_HEADERS([vpbapi.h], [], [PBX_VPBAPI=0])
+AC_CHECK_LIB([vpb], [vpb_open], [], [PBX_VPBAPI=0])
AC_SUBST(PBX_VPBAPI)
#######################
# turn on nbs.. xxx
PBX_NBS=1
AC_CHECK_HEADERS([nbs.h], [], [PBX_NBS=0])
-AC_CHECK_LIB([nbs], [main], [], [PBX_NBS=0])
+AC_CHECK_LIB([nbs], [nbs_setup], [], [PBX_NBS=0])
AC_SUBST(PBX_NBS)
#######################
# turn on oss.. xxx
PBX_OSSAUDIO=1
-#AC_CHECK_HEADERS([.h], [], [PBX_NBS=0])
-AC_CHECK_LIB([ossaudio], [main], [], [PBX_OSSAUDIO=0])
+#AC_CHECK_HEADERS([.h], [], [PBX_OSSAUDIO=0])
+AC_CHECK_LIB([ossaudio], [oss_ioctl_mixer], [], [PBX_OSSAUDIO=0])
AC_SUBST(PBX_OSSAUDIO)
@@ -195,16 +269,17 @@
#######################
# turn on libvorbix.. xxx
PBX_LIBVORBIS=1
-AC_CHECK_HEADERS([vorbis/codec.h], [], [PBX_LIBVORBIS=0])
+AC_CHECK_HEADERS([${xInclude}/vorbis/codec.h ${xLInclude}/vorbis/codec.h], [], [PBX_LIBVORBIS=0])
AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [PBX_LIBVORBIS=0])
+AC_CHECK_LIB([vorbisenc], [vorbis_encode_ctl], [], [PBX_LIBVORBIS=0])
AC_SUBST(PBX_LIBVORBIS)
#######################
# turn on libosptk.. xxx
PBX_LIBOSPTK=1
-AC_CHECK_HEADERS([osp/ospssl.h], [], [PBX_LIBOSPTK=0])
-AC_CHECK_LIB([osptk], [main], [], [PBX_LIBOSPTK=0])
+AC_CHECK_HEADERS([osp/osp.h], [], [PBX_LIBOSPTK=0])
+AC_CHECK_LIB([osptk], [OSPPCryptoDecrypt], [], [PBX_LIBOSPTK=0])
AC_SUBST(PBX_LIBOSPTK)
#######################
@@ -219,7 +294,7 @@
# turn on libnewt.. xxx
PBX_LIBNEWT=1
AC_CHECK_HEADERS([newt.h], [], [PBX_LIBNEWT=0])
-AC_CHECK_LIB([newt], [main], [], [PBX_LIBNEWT=0])
+AC_CHECK_LIB([newt], [newtBell], [], [PBX_LIBNEWT=0])
AC_SUBST(PBX_LIBNEWT)
@@ -230,19 +305,41 @@
AC_SUBST(PBX_POLL)
-# add target for utils directory
-AM_CONDITIONAL(SMSQ_TARGET, [test -f /usr/include/popt.h])
-AM_CONDITIONAL(ASTMAN_TARGET, [test -f /usr/include/newt.h])
-AM_CONDITIONAL(SUN_UTIL_TARGET, [test "x${PBX_OSTYPE}" = xSunOs])
-
-
-
-###############################
-#
-# compiler flags
-#
-##############################
-
+AC_LANG(C++)
+
+#######################
+# turn on Qt.. xxx
+PBX_Qt=1
+AC_CHECK_HEADERS([qapplication.h qt/qapplication.h], [], [PBX_Qt=0])
+AC_SUBST(PBX_Qt)
+
+#######################
+# turn on KDECORE.. xxx
+PBX_KDECORE=1
+AC_CHECK_HEADERS([kdebug.h], [], [PBX_KDECORE=0])
+AC_SUBST(PBX_KDECORE)
+
+#######################
+# turn on KDEUI.. xxx
+PBX_KDEUI=1
+AC_CHECK_HEADERS([kcursor.h], [], [PBX_KDEUI=0])
+AC_SUBST(PBX_KDEUI)
+
+#######################
+# turn on ptlib.. xxx
+PBX_PTLIB=1
+AC_CHECK_HEADERS([ptlib.h ${LInclude}/ptlib.h], [], [PBX_PTLIB=0])
+AC_SUBST(PBX_PTLIB)
+
+#######################
+# turn on h323.. xxx
+PBX_H323=1
+AC_CHECK_HEADERS([h323.h], [], [PBX_H323=0])
+AC_SUBST(PBX_H323)
+
+AC_LANG(C)
+
+# export CFLAGS
if test "x${PBX_OSTYPE}" = xLinux; then
z_CFLAGS_DEFINE="-D_REENTRANT -D_GNU_SOURCE"
z_CFLAGS_WARN="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations"
@@ -261,109 +358,32 @@
AC_SUBST(z_CFLAGS)
-###############################
-#
-# Checks for programs.
-#
-##############################
-
-AC_PROG_CXX
-AC_PROG_AWK
-AC_PROG_YACC
-AC_PROG_CC
-AC_PROG_LEX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-
-###############################
-#
-# Checks for libraries.
-#
-##############################
-
-AC_CHECK_LIB([c], [memcpy])
-AC_CHECK_LIB([crypto], [CRYPTO_malloc])
-
-# FIXME: Replace `main' with a function in `-ldb':
-AC_CHECK_LIB([db], [main])
-# FIXME: Replace `main' with a function in `-ldl':
-AC_CHECK_LIB([dl], [main])
-# FIXME: Replace `main' with a function in `-lexpat':
-AC_CHECK_LIB([expat], [main])
-# FIXME: Replace `main' with a function in `-lh323_FreeBSD_x86_r':
-AC_CHECK_LIB([h323_FreeBSD_x86_r], [main])
-# FIXME: Replace `main' with a function in `-lh323_NetBSD_x86_r':
-AC_CHECK_LIB([h323_NetBSD_x86_r], [main])
-# FIXME: Replace `main' with a function in `-lh323_OpenBSD_x86_r':
-AC_CHECK_LIB([h323_OpenBSD_x86_r], [main])
-# FIXME: Replace `main' with a function in `-lh323_linux_x86_r':
-AC_CHECK_LIB([h323_linux_x86_r], [main])
-# FIXME: Replace `main' with a function in `-lkdecore':
-AC_CHECK_LIB([kdecore], [main])
-# FIXME: Replace `main' with a function in `-lkdeui':
-AC_CHECK_LIB([kdeui], [main])
-# FIXME: Replace `main' with a function in `-lm':
-AC_CHECK_LIB([m], [main])
-# FIXME: Replace `main' with a function in `-lncurses':
-AC_CHECK_LIB([ncurses], [main])
-# FIXME: Replace `main' with a function in `-lnsl':
-AC_CHECK_LIB([nsl], [main])
-# FIXME: Replace `main' with a function in `-logg':
-AC_CHECK_LIB([ogg], [main])
-# FIXME: Replace `main' with a function in `-lpt_FreeBSD_x86_r':
-AC_CHECK_LIB([pt_FreeBSD_x86_r], [main])
-# FIXME: Replace `main' with a function in `-lpt_NetBSD_x86_r':
-AC_CHECK_LIB([pt_NetBSD_x86_r], [main])
-# FIXME: Replace `main' with a function in `-lpt_OpenBSD_x86_r':
-AC_CHECK_LIB([pt_OpenBSD_x86_r], [main])
-# FIXME: Replace `main' with a function in `-lpt_linux_x86_r':
-AC_CHECK_LIB([pt_linux_x86_r], [main])
-# FIXME: Replace `main' with a function in `-lpthread':
-AC_CHECK_LIB([pthread], [main])
-# FIXME: Replace `main' with a function in `-lqt':
-AC_CHECK_LIB([qt], [main])
-# FIXME: Replace `main' with a function in `-lresolv':
-AC_CHECK_LIB([resolv], [main])
-# FIXME: Replace `main' with a function in `-lrt':
-AC_CHECK_LIB([rt], [main])
-# FIXME: Replace `main' with a function in `-lsocket':
-AC_CHECK_LIB([socket], [main])
-# FIXME: Replace `main' with a function in `-lssl':
-AC_CHECK_LIB([ssl], [main])
-# FIXME: Replace `main' with a function in `-lt':
-AC_CHECK_LIB([t], [main])
-# FIXME: Replace `main' with a function in `-ltonezone':
-AC_CHECK_LIB([tonezone], [main])
-# FIXME: Replace `main' with a function in `-lvorbis':
-AC_CHECK_LIB([vorbis], [main])
-# FIXME: Replace `main' with a function in `-lvorbisenc':
-AC_CHECK_LIB([vorbisenc], [main])
-# FIXME: Replace `main' with a function in `-lz':
-AC_CHECK_LIB([z], [main])
-
-
-###############################
-#
+# Checks for prerequisite 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([db], [dbopen], [], [AC_MSG_ERROR("you need db 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([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([ogg], [oggpack_read], [], [AC_MSG_ERROR("you need ogg 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])
+AC_CHECK_LIB([ssl], [ssl2_connect])
+AC_CHECK_LIB([z], [compress])
+
+
# Checks for header files.
-#
-##############################
-
AC_FUNC_ALLOCA
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h])
-
-###############################
-#
# Checks for typedefs, structures, and compiler characteristics.
-#
-##############################
-
AC_HEADER_STDBOOL
AC_C_CONST
AC_TYPE_UID_T
@@ -378,13 +398,7 @@
AC_C_VOLATILE
AC_CHECK_TYPES([ptrdiff_t])
-
-###############################
-#
# Checks for library functions.
-#
-##############################
-
AC_FUNC_CHOWN
AC_FUNC_CLOSEDIR_VOID
AC_FUNC_ERROR_AT_LINE
@@ -408,5 +422,21 @@
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 Makefile])
+AC_CONFIG_FILES([menuselect-deps makeopts Makefile])
AC_OUTPUT
+
+echo "Package configured for: "
+echo " OS type : $PBX_OSTYPE"
+echo " host cpu : $host_cpu"
+echo " CFLAGS : $CFLAGS $z_CFLAGS"
+echo " CXXFLAGS : $CXXFLAGS"
+echo " LIBS : $LIBS"
+
+if test "x${crossCompile}" = xYes; then
+ echo ""
+ echo " Cross Compilation = YES"
+ echo " Target = ${host}"
+ echo " Target root = $CROSS_COMPILE_ROOT"
+ echo " Target bin = $CROSS_COMPILE_BIN"
+fi
+
Added: team/russell/autoconf_and_menuselect/autoconf/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/autoconf/makeopts.in?rev=8344&view=auto
==============================================================================
--- team/russell/autoconf_and_menuselect/autoconf/makeopts.in (added)
+++ team/russell/autoconf_and_menuselect/autoconf/makeopts.in Fri Jan 20 12:16:12 2006
@@ -1,0 +1,9 @@
+CXXFLAGS = @CXXFLAGS@
+CFALSG = @z_CFLAGS@
+LIBS = @LIBS@
+
+
+
+CROSS_COMPILE_ROOT = @CROSS_COMPILE_ROOT@
+CROSS_COMPILE_BIN = @CROSS_COMPILE_BIN@
+CROSS_COMPILE_TARGET = @CROSS_COMPILE_TARGET@
Modified: team/russell/autoconf_and_menuselect/autoconf/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/autoconf/menuselect-deps.in?rev=8344&r1=8343&r2=8344&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/autoconf/menuselect-deps.in (original)
+++ team/russell/autoconf_and_menuselect/autoconf/menuselect-deps.in Fri Jan 20 12:16:12 2006
@@ -27,3 +27,10 @@
<libnewt>@PBX_LIBNEWT@</libnewt>
<poll>@PBX_POLL@</poll>
+
+<qt>@PBX_Qt@</qt>
+<kdecode>@PBX_KDECORE@</kdecode>
+<kdeui>@PBX_KDEUI@</kdeui>
+
+<ptlib>@PBX_PTLIB@</ptlib>
+<h323>@PBX_H323@</h323>
More information about the asterisk-commits
mailing list