/[monit]/monit/configure.ac
ViewVC logotype

Diff of /monit/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.40 by rory, Sat Aug 16 00:12:19 2003 UTC revision 1.41 by chopp, Wed Sep 3 15:29:29 2003 UTC
# Line 288  AC_SUBST(PROCARCH) Line 288  AC_SUBST(PROCARCH)
288    
289  # Check for ssl includes (take from the stunnel project)  # Check for ssl includes (take from the stunnel project)
290  checksslincldir() { :  checksslincldir() { :
291      if test -f "$1/include/openssl/ssl.h"; then      if test -f "$1/openssl/ssl.h"; then
292          sslincldir="$1"          sslincldir="$1"
293          return 0          return 0
294      fi      fi
# Line 333  if test "$use_ssl" = "1"; then Line 333  if test "$use_ssl" = "1"; then
333          [  --with-ssl-dir=DIR       location of SSL installation],          [  --with-ssl-dir=DIR       location of SSL installation],
334          [          [
335              dnl Check the specified location only              dnl Check the specified location only
336                for dir in "$withval" "$withval/include"; do
337              checksslincldir "$withval"                  checksslincldir "$dir"
338              checkssllibdir "$withval"              done
339                for dir in "$withval" "$withval/lib"; do
340                    checkssllibdir "$dir" && break 2
341                done
342          ]          ]
343      )      )
344    
# Line 348  if test "$use_ssl" = "1"; then Line 351  if test "$use_ssl" = "1"; then
351              checksslincldir "$withval"              checksslincldir "$withval"
352          ],          ],
353          [          [
354              dnl Search default locations of SSL includes              if test -z "$sslincldir"; then      
355              for maindir in /usr /usr/local /usr/lib /usr/pkg /var /opt; do                  dnl Search default locations of SSL includes
356                  for dir in $maindir $maindir/openssl $maindir/ssl; do                  for maindir in /usr /usr/local /usr/lib /usr/pkg /var /opt; do
357                      checksslincldir $dir && break 2                      for dir in "$maindir/include"\
358                                   "$maindir/include/openssl"\
359                                   "$maindir/include/ssl"\
360                                   "$maindir/ssl/include"; do
361                            checksslincldir $dir && break 2
362                        done
363                  done                  done
364              done              fi
365          ]          ]
366      )      )
367    
# Line 378  if test "$use_ssl" = "1"; then Line 386  if test "$use_ssl" = "1"; then
386              checkssllibdir "$withval"              checkssllibdir "$withval"
387          ],          ],
388          [          [
389              dnl Search default locations of SSL libraries              if test -z "$ssllibdir"; then      
390              for maindir in /usr /usr/local /usr/pkg /var /opt; do                  dnl Search default locations of SSL libraries
391                  for dir in $maindir $maindir/openssl $maindir/ssl \                  for maindir in /usr /usr/local /usr/pkg /var /opt; do
392                             $maindir/lib $maindir/lib/openssl \                      for dir in $maindir $maindir/openssl $maindir/ssl \
393                             $maindir/lib/ssl; do                                 $maindir/lib $maindir/lib/openssl \
394                      checkssllibdir $dir && break 2                                 $maindir/lib/ssl $maindir/sss/lib; do
395                            checkssllibdir $dir && break 2
396                        done
397                  done                  done
398              done              fi
399          ]          ]
400      )      )
401            
   
402      if test -z "$ssllibdir"; then      if test -z "$ssllibdir"; then
403          AC_MSG_RESULT([Not found])          AC_MSG_RESULT([Not found])
404          echo          echo
# Line 410  fi Line 419  fi
419  # Add SSL includes and libraries  # Add SSL includes and libraries
420  if test "$sslincldir" -a "$ssllibdir"  if test "$sslincldir" -a "$ssllibdir"
421  then  then
422      CFLAGS="$CFLAGS -I$sslincldir/include"      CFLAGS="$CFLAGS -I$sslincldir"
423      LIBS="$LIBS -L$ssllibdir -lssl -lcrypto"          LIBS="$LIBS -L$ssllibdir -lssl -lcrypto"    
424      # Redhat 9 compilation fix:      # Redhat 9 compilation fix:
425      if test -f "/usr/kerberos/include/krb5.h"      if test -f "/usr/kerberos/include/krb5.h"
# Line 433  echo "monit has been configured with the Line 442  echo "monit has been configured with the
442  echo "                Architecture: ${ARCH}"  echo "                Architecture: ${ARCH}"
443  if test "$use_ssl" = "1"; then  if test "$use_ssl" = "1"; then
444      echo "                 SSL support: enabled"      echo "                 SSL support: enabled"
445      echo "       SSL include directory: ${sslincldir}/include/openssl"      echo "       SSL include directory: ${sslincldir}"
446      echo "       SSL library directory: ${ssllibdir}"      echo "       SSL library directory: ${ssllibdir}"
447  else  else
448      echo "                 SSL support: disabled"      echo "                 SSL support: disabled"

Legend:
Removed from v.1.40  
changed lines
  Added in v.1.41

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26