Use sofia's openssl configure checks in the toplevel configure script (OKed by MikeJ)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13814 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/acinclude.m4 b/acinclude.m4
index e74bf468a917c9fdaf33bb8041e478043af3491b..96389b274b7a44dd33b2228259ededaf84b2e340 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -9,4 +9,6 @@ m4_include([build/config/ax_check_java.m4])
 m4_include([build/config/erlang.m4])
 m4_include([build/config/odbc.m4])
 m4_include([libs/apr/build/apr_common.m4])
+m4_include([libs/sofia-sip/m4/sac-pkg-config.m4])
+m4_include([libs/sofia-sip/m4/sac-openssl.m4])
 m4_include([build/config/libcurl.m4])

diff --git a/configure.in b/configure.in
index 3bfa6a374a015fc024b3a9b61973b4f46de625e2..c4fa96805a443e47d49818827dd2377e707afd96 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -611,6 +611,8 @@ if test "$enable_core_libedit_support" = "yes" ; then
           [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])] )] )
 fi
 
+SAC_OPENSSL
+
 AX_CHECK_JAVA
 
 

diff --git a/libs/sofia-sip/acinclude.m4 b/libs/sofia-sip/acinclude.m4
index ca54ef3a9bc2f6dc68f5601e5038a7609a3f6c37..c1ea4f9214948c110f74a8def9aa65cc59b0a0d5 100644 (file)
--- a/libs/sofia-sip/acinclude.m4
+++ b/libs/sofia-sip/acinclude.m4
@@ -1,63 +1,7 @@
+m4_include([m4/sac-pkg-config.m4])
 m4_include([m4/sac-general.m4])
 m4_include([m4/sac-openssl.m4])
 m4_include([m4/sac-su2.m4])
 m4_include([m4/sac-su.m4])
 m4_include([m4/sac-tport.m4])
 m4_include([m4/sac-coverage.m4])
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN([PKG_CHECK_MODULES], [
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        AC_MSG_CHECKING(for $2)
-
-        if $PKG_CONFIG --exists "$2" ; then
-            AC_MSG_RESULT(yes)
-            succeeded=yes
-
-            AC_MSG_CHECKING($1_CFLAGS)
-            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-            AC_MSG_RESULT($$1_CFLAGS)
-
-            AC_MSG_CHECKING($1_LIBS)
-            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-            AC_MSG_RESULT($$1_LIBS)
-        else
-            $1_CFLAGS=""
-            $1_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but 
-            ## do set a variable so people can do so.
-            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-        fi
-
-        AC_SUBST($1_CFLAGS)
-        AC_SUBST($1_LIBS)
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     ifelse([$3], , :, [$3])
-  else
-     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-  fi
-])
-
-

diff --git a/libs/sofia-sip/m4/sac-pkg-config.m4 b/libs/sofia-sip/m4/sac-pkg-config.m4
new file mode 100644 (file)
index 0000000..850e4b1
--- /dev/null
+++ b/libs/sofia-sip/m4/sac-pkg-config.m4
@@ -0,0 +1,56 @@
+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+dnl also defines GSTUFF_PKG_ERRORS on error
+AC_DEFUN([PKG_CHECK_MODULES], [
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        AC_MSG_CHECKING(for $2)
+
+        if $PKG_CONFIG --exists "$2" ; then
+            AC_MSG_RESULT(yes)
+            succeeded=yes
+
+            AC_MSG_CHECKING($1_CFLAGS)
+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+            AC_MSG_RESULT($$1_CFLAGS)
+
+            AC_MSG_CHECKING($1_LIBS)
+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
+            AC_MSG_RESULT($$1_LIBS)
+        else
+            $1_CFLAGS=""
+            $1_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
+        fi
+
+        AC_SUBST($1_CFLAGS)
+        AC_SUBST($1_LIBS)
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     ifelse([$3], , :, [$3])
+  else
+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+  fi
+])
+
+