[asterisk-commits] branch group/autoconf_and_menuselect r11045 -
/team/group/autoconf_and_menuse...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Feb 24 19:11:51 MST 2006
Author: kpfleming
Date: Fri Feb 24 20:11:50 2006
New Revision: 11045
URL: http://svn.digium.com/view/asterisk?rev=11045&view=rev
Log:
update configure script to actually allow user to specify where some libraries are located, and to disable their use if they would prefer to skip them
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
team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in
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=11045&r1=11044&r2=11045&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/autoconf/autoconfig.h.in (original)
+++ team/group/autoconf_and_menuselect/autoconf/autoconfig.h.in Fri Feb 24 20:11:50 2006
@@ -112,9 +112,6 @@
/* Define to 1 if you have the `newt' library (-lnewt). */
#undef HAVE_LIBNEWT
-/* Define to 1 if you have the `odbc' library (-lodbc). */
-#undef HAVE_LIBODBC
-
/* Define to 1 if you have the `osptk' library (-losptk). */
#undef HAVE_LIBOSPTK
@@ -124,9 +121,6 @@
/* Define to 1 if you have the `popt' library (-lpopt). */
#undef HAVE_LIBPOPT
-/* Define to 1 if you have the `pq' library (-lpq). */
-#undef HAVE_LIBPQ
-
/* Define to 1 if you have the `pri' library (-lpri). */
#undef HAVE_LIBPRI
@@ -145,7 +139,8 @@
/* Define to 1 if you have the `sqlite' library (-lsqlite). */
#undef HAVE_LIBSQLITE
-/* Define to 1 if you have the `ssl' library (-lssl). */
+/* Define to indicate the OpenSSL libraries should be used for cryptographic
+ operations. */
#undef HAVE_LIBSSL
/* Define to 1 if you have the `tds' library (-ltds). */
@@ -212,6 +207,10 @@
/* 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
@@ -355,6 +354,10 @@
/* 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
@@ -394,9 +397,6 @@
/* Define according to your operating system type. */
#undef OpenBSD
-
-/* Name of package */
-#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
@@ -468,9 +468,6 @@
/* Define according to your operating system type. */
#undef Unix
-/* Version number of package */
-#undef VERSION
-
/* Define according to your operating system type. */
#undef Win32
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=11045&r1=11044&r2=11045&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/autoconf/configure.ac (original)
+++ team/group/autoconf_and_menuselect/autoconf/configure.ac Fri Feb 24 20:11:50 2006
@@ -3,12 +3,11 @@
AC_PREREQ(2.59)
-# get version from VERSION file
m4_define([PBX_VERSION],
- m4_bpatsubst(m4_esyscmd([cat ../.version]),
+ m4_bpatsubst(m4_esyscmd([../build_tools/make_version ..]),
[\([0-9.]*\)\(\w\|\W\)*],
[\1]))
-AC_INIT(asterisk, PBX_VERSION, bugs at asterisk.com)
+AC_INIT(asterisk, PBX_VERSION, www.asterisk.org)
# cross-compile macros
AC_CANONICAL_BUILD
@@ -19,12 +18,11 @@
AC_CONFIG_SRCDIR([../dnsmgr.c])
# specifiy output header file
-AC_CONFIG_HEADER([autoconfig.h])
-
-AM_INIT_AUTOMAKE(asterisk, 1.2)
+AC_CONFIG_HEADER(autoconfig.h)
+
+# AM_INIT_AUTOMAKE(asterisk, 1.2)
AC_COPYRIGHT("Asterisk")
AC_REVISION($Revision: 1.0 $)
-
### ** Platform.
AC_DEFINE_UNQUOTED(PBX_PLATFORM, "${host}",
@@ -118,7 +116,7 @@
# setup cross compilation root..
AC_ARG_WITH(cross_prefix,
- [--with-cross-prefix=PATH directory where cross tools are installed],
+ [ --with-cross-prefix=PATH directory where cross tools are installed],
[ if test "$withval" != no; then
if test "$withval" != yes; then
crossPrefix=$withval
@@ -220,23 +218,6 @@
AC_SUBST(PBX_ZAPTEL)
#######################
-# turn on unix ODBC..
-PBX_UNIXODBC=1
-AC_CHECK_HEADER([${xInclude}/odbcinst.h], [],
- [AC_CHECK_HEADER([${xLInclude}/odbcinst.h], [], [PBX_UNIXODBC=0])])
-AC_CHECK_LIB([odbc], [SQLInstallODBC], [], [PBX_UNIXODBC=0])
-AC_SUBST(PBX_UNIXODBC)
-
-#######################
-# turn on postgresql..
-PBX_PGSQL=1
-AC_CHECK_HEADER([${xInclude}/libpq-fe.h], [],
- [AC_CHECK_HEADER([${xLInclude}/libpq-fe.h], [], [PBX_PGSQL=0])])
-AC_CHECK_LIB([pq], [PQexec], [], [PBX_PGSQL=0])
-AC_SUBST(PBX_PGSQL)
-
-
-#######################
# turn on sqlite..
PBX_SQLITE=1
AC_CHECK_HEADER([${xInclude}/sqlite.h], [],
@@ -454,9 +435,115 @@
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])
+AC_ARG_WITH([ssl], AC_HELP_STRING([--with-ssl=PATH],[use OpenSSL files in PATH]),[
+case ${withval} in
+ n|no)
+ USE_SSL=no
+ ;;
+ y|ye|yes)
+ ;;
+ *)
+ SSL_DIR="${withval}"
+ ;;
+esac
+])
+
+if test "${USE_SSL}" != "no"; then
+ AC_CHECK_LIB([ssl], [ssl2_connect], AC_DEFINE([HAVE_LIBSSL], [], [Define to indicate the OpenSSL libraries should be used for cryptographic operations.]), [], -L${SSL_DIR}/lib -lcrypto)
+ if test "${ac_cv_lib_ssl_ssl2_connect}" = "yes"; then
+ SSL_LIB="-lssl -lcrypto"
+ if test "${SSL_DIR}" != ""; then
+ SSL_LIB="-L${SSL_DIR}/lib ${SSL_LIB}"
+ SSL_INCLUDE="-I${SSL_DIR}/include"
+ AC_SUBST([SSL_INCLUDE])
+ fi
+ AC_SUBST([SSL_LIB])
+ HAVE_LIBSSL=1
+ else
+ echo "***"
+ echo "*** The ssl installation on this system appears to be broken."
+ echo "*** Either correct the installation, or run configure"
+ echo "*** including --without-ssl."
+ fi
+else
+ HAVE_LIBSSL=0
+fi
+
+AC_SUBST([HAVE_LIBSSL])
+
+AC_ARG_WITH([odbc], AC_HELP_STRING([--with-odbc=PATH],[use unixODBC files in PATH]),[
+case ${withval} in
+ n|no)
+ USE_ODBC=no
+ ;;
+ y|ye|yes)
+ ;;
+ *)
+ ODBC_DIR="${withval}"
+ ;;
+esac
+])
+
+if test "${USE_ODBC}" != "no"; then
+ AC_CHECK_LIB([odbc], [SQLConnect], AC_DEFINE([HAVE_UNIXODBC], [], [Define to indicate the unixODBC libraries should be used for database operations.]), [], -L${ODBC_DIR}/lib)
+ if test "${ac_cv_lib_odbc_SQLConnect}" = "yes"; then
+ ODBC_LIB="-lodbc"
+ if test "${ODBC_DIR}" != ""; then
+ ODBC_LIB="-L${ODBC_DIR}/lib ${ODBC_LIB}"
+ ODBC_INCLUDE="-I${ODBC_DIR}/include"
+ AC_SUBST([ODBC_INCLUDE])
+ fi
+ AC_SUBST([ODBC_LIB])
+ HAVE_UNIXODBC=1
+ else
+ echo "***"
+ echo "*** The unixODBC installation on this system appears to be broken."
+ echo "*** Either correct the installation, or run configure"
+ echo "*** including --without-unixodbc."
+ fi
+else
+ HAVE_UNIXODBC=0
+fi
+
+AC_SUBST([HAVE_UNIXODBC])
+
+AC_ARG_WITH([pgsql], AC_HELP_STRING([--with-pgsql=PATH],[use PostgreSQL files in PATH]),[
+case ${withval} in
+ n|no)
+ USE_PGSQL=no
+ ;;
+ y|ye|yes)
+ ;;
+ *)
+ PGSQL_DIR="${withval}"
+ ;;
+esac
+])
+
+if test "${USE_PGSQL}" != "no"; then
+ AC_CHECK_LIB([pq], [PQexec], AC_DEFINE([HAVE_PGSQL], [], [Define to indicate the PostgreSQL libraries should be used for database operations.]), [], -L${PGSQL_DIR}/lib)
+ if test "${ac_cv_lib_pq_PQexec}" = "yes"; then
+ PGSQL_LIB="-lpq"
+ if test "${PGSQL_DIR}" != ""; then
+ PGSQL_LIB="-L${PGSQL_DIR}/lib ${PGSQL_LIB}"
+ PGSQL_INCLUDE="-I${PGSQL_DIR}/include"
+ AC_SUBST([PGSQL_INCLUDE])
+ fi
+ AC_SUBST([PGSQL_LIB])
+ HAVE_PGSQL=1
+ else
+ echo "***"
+ echo "*** The PostgreSQL installation on this system appears to be broken."
+ echo "*** Either correct the installation, or run configure"
+ echo "*** including --without-pgsql."
+ fi
+else
+ HAVE_PGSQL=0
+fi
+
+AC_SUBST([HAVE_PGSQL])
# Checks for header files.
AC_FUNC_ALLOCA
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=11045&r1=11044&r2=11045&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/autoconf/makeopts.in (original)
+++ team/group/autoconf_and_menuselect/autoconf/makeopts.in Fri Feb 24 20:11:50 2006
@@ -50,3 +50,12 @@
CROSS_COMPILE_ROOT = @CROSS_COMPILE_ROOT@
CROSS_COMPILE_BIN = @CROSS_COMPILE_BIN@
CROSS_COMPILE_TARGET = @CROSS_COMPILE_TARGET@
+
+SSL_LIB = @SSL_LIB@
+SSL_INCLUDE = @SSL_INCLUDE@
+
+ODBC_LIB = @ODBC_LIB@
+ODBC_INCLUDE = @ODBC_INCLUDE@
+
+PGSQL_LIB = @PGSQL_LIB@
+PGSQL_INCLUDE = @PGSQL_INCLUDE@
Modified: team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in?rev=11045&r1=11044&r2=11045&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in (original)
+++ team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in Fri Feb 24 20:11:50 2006
@@ -14,11 +14,12 @@
NBS=@PBX_NBS@
OGGVORBIS=@PBX_OGGVORBIS@
OSSAUDIO=@PBX_OSSAUDIO@
-PGSQL=@PBX_PGSQL@
+PGSQL=@HAVE_PGSQL@
POLL=@PBX_POLL@
PTLIB=@PBX_PTLIB@
QT=@PBX_QT@
SQLITE=@PBX_SQLITE@
-UNIXODBC=@PBX_UNIXODBC@
+UNIXODBC=@HAVE_UNIXODBC@
VPBAPI=@PBX_VPBAPI@
ZAPTEL=@PBX_ZAPTEL@
+SSL=@HAVE_LIBSSL@
More information about the asterisk-commits
mailing list