Changeset 389 for trunk

Timestamp:

Feb 9, 2012, 8:06:13 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #286 (Combination of --with-gpg and --enable-nocl incorrectly handled by configure).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)

trunk/configure.ac

@@ -2307 +2307 @@
                           mychk0=`${sampre} -H ${withval} 2>/dev/null`
                           if test "x$?" != "x0"; then
-                            :
+                            if test "x${nocl_code}" != "x"; then
+                               mychk0=`echo -H ${withval} | ${sampre} ${nocl_code} 2>/dev/null`
+                               if test "x$?" != "x0"; then
+                                  :
+                               else
+                                  mychk="${mychk0}"
+                                  mychktest=yes
+                               fi 
+                            fi
                           else
                             mychk="${mychk0}"

trunk/docs/Changelog

@@ -1 +1 @@
 3.0.2:
+        * fixed configure.ac for the case that --with-gpg and --enable-nocl are
+          used (./samhain for gpg checksum; problem report by Andy Jack)
         * fixed a potential NULL pointer dereference in sh_inotify.c on
           systems where inotify is not available (reported by <anonymous>)