[svn-commits] dlee: branch dlee/ari-authn r393055 - in /team/dlee/ari-authn: ./ main/

[SVN commits to the Digium repositories]

Author: dlee
Date: Thu Jun 27 10:54:48 2013
New Revision: 393055

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=393055
Log:
Handle CRYPT_INCLUDE

Modified:
    team/dlee/ari-authn/configure
    team/dlee/ari-authn/configure.ac
    team/dlee/ari-authn/main/Makefile
    team/dlee/ari-authn/makeopts.in

Modified: team/dlee/ari-authn/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-authn/configure.ac?view=diff&rev=393055&r1=393054&r2=393055
==============================================================================
--- team/dlee/ari-authn/configure.ac (original)
+++ team/dlee/ari-authn/configure.ac Thu Jun 27 10:54:48 2013
@@ -2157,13 +2157,16 @@
 
 if test "x$LIBCRYPT_LIB" != "x" ; then
     CRYPT_LIB="$LIBCRYPT_LIB"
+    CRYPT_INCLUDE="$LIBCRYPT_INCLUDE"
     AC_DEFINE([HAVE_CRYPT], [1], [Define to 1 if you have the `crypt' function.])
 elif test "x$SYSCRYPT" != "x" ; then
     CRYPT_LIB=""
+    CRYPT_INCLUDE=""
     AC_DEFINE([HAVE_CRYPT], [1], [Define to 1 if you have the `crypt' function.])
 fi
 
 AC_SUBST(CRYPT_LIB)
+AC_SUBST(CRYPT_INCLUDE)
 
 # Find crypt_r support
 AC_CHECK_LIB([crypt], [crypt_r],

Modified: team/dlee/ari-authn/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-authn/main/Makefile?view=diff&rev=393055&r1=393054&r2=393055
==============================================================================
--- team/dlee/ari-authn/main/Makefile (original)
+++ team/dlee/ari-authn/main/Makefile Thu Jun 27 10:54:48 2013
@@ -154,6 +154,7 @@
 asterisk.o: _ASTCFLAGS+=$(LIBEDIT_INCLUDE)
 cli.o: _ASTCFLAGS+=$(LIBEDIT_INCLUDE)
 json.o: _ASTCFLAGS+=$(JANSSON_INCLUDE)
+util.o: _ASTCFLAGS+=$(CRYPT_INCLUDE)
 uuid.o: _ASTCFLAGS+=$(UUID_INCLUDE)
 
 ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)

Modified: team/dlee/ari-authn/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-authn/makeopts.in?view=diff&rev=393055&r1=393054&r2=393055
==============================================================================
--- team/dlee/ari-authn/makeopts.in (original)
+++ team/dlee/ari-authn/makeopts.in Thu Jun 27 10:54:48 2013
@@ -281,6 +281,7 @@
 OPENSSL_INCLUDE=@OPENSSL_INCLUDE@
 OPENSSL_LIB=@OPENSSL_LIB@
 
+CRYPT_INCLUDE=@CRYPT_INCLUDE@
 CRYPT_LIB=@CRYPT_LIB@
 
 CRYPTO_INCLUDE=@CRYPTO_INCLUDE@