[Nagiosplug-checkins] nagiosplug configure.in,1.127,1.128

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29436

Modified Files:
	configure.in 
Log Message:
Fix compile errors when looking for openssl


Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- configure.in	17 Dec 2004 18:14:18 -0000	1.127
+++ configure.in	20 Dec 2004 21:26:41 -0000	1.128
@@ -293,12 +293,12 @@
   dnl Check usual areas for openssl
   if test "$PKGTEST" = "yes"; then
     AC_PATH_PROG(OPENSSL,openssl)
-    # Don't think 2 tests below are necessary because /usr is always included
-    # if test "$OPENSSL" = "/usr/bin/openssl"; then
-    #  OPENSSL=/usr
-    #elif test "$OPENSSL" = "/usr/sbin/openssl"; then
-    #  OPENSSL=/usr
-    if test "$OPENSSL" = "/opt/bin/openssl"; then
+    dnl The /usr checks need to be done so that the right area is include'd
+    if test "$OPENSSL" = "/usr/bin/openssl"; then
+      OPENSSL=/usr
+    elif test "$OPENSSL" = "/usr/sbin/openssl"; then
+      OPENSSL=/usr
+    elif test "$OPENSSL" = "/opt/bin/openssl"; then
       OPENSSL=/opt
     elif test "$OPENSSL" = "/opt/openssl/bin/openssl"; then
       OPENSSL=/opt/openssl
@@ -386,7 +386,11 @@
   fi
 
   if test "$OPENSSL_ENABLED" != "1"; then
-    AC_MSG_WARN([OpenSSL libs and/or directories were not found where specified!])
+    if test "$PKGTEST" ="yes"; then
+      AC_MSG_WARN([OpenSSL libs could not be found])
+    else
+      AC_MSG_WARN([OpenSSL libs and/or directories were not found where specified!])
+    fi
     with_openssl="no"
   else
     check_tcp_ssl="check_simap check_spop check_jabber check_nntps"