]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
Corrected check of usage of local libopts when autogen isn't present
authorNikos Mavrogiannopoulos <nmav@gnutls.org>
Sat, 23 Nov 2013 09:12:23 +0000 (10:12 +0100)
committerNikos Mavrogiannopoulos <nmav@gnutls.org>
Sat, 23 Nov 2013 09:51:16 +0000 (10:51 +0100)
configure.ac

index 6b582e8670b05588196e041c499570cf147cf037..39278d83b08f2827b0ca9ed12511e36814c8a6df 100644 (file)
@@ -50,7 +50,7 @@ if test x"$AUTOGEN" = "x/bin/true"; then
 ***
 *** autogen not found. Will not link against libopts.
 *** ]])
-NEED_LIBOPTS_DIR=true
+enable_local_libopts=yes
 fi
 
 # For includes/gnutls/gnutls.h.in.
@@ -347,9 +347,8 @@ fi
 
 AM_CONDITIONAL(ENABLE_TROUSERS, test "$with_tpm" != "no")
 
-ac_enable_local_libopts=yes
 LIBOPTS_CHECK([src/libopts])
-if test "$NEED_LIBOPTS_DIR" != "true";then
+if test "$NEED_LIBOPTS_DIR" == "true";then
        dnl delete libopts-generated files
        for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
                nam=`echo $i|sed 's/.bak//g'`
@@ -358,8 +357,11 @@ if test "$NEED_LIBOPTS_DIR" != "true";then
                fi
        done
        AC_SUBST([AUTOGEN], [/bin/true])
-       ac_enable_local_libopts=no
+       enable_local_libopts=yes
+else
+       enable_local_libopts=no
 fi
+AM_CONDITIONAL(NEED_LIBOPTS, test "$enable_local_libopts" = "yes")
 
 AC_CHECK_TYPE(ssize_t,
   [
@@ -717,7 +719,7 @@ if features are disabled)
 AC_MSG_NOTICE([Optional applications:
 
   crywrap app:          $libidn
-  local libopts:        ${ac_enable_local_libopts}
+  local libopts:        ${enable_local_libopts}
   local libtasn1:       ${included_libtasn1}
 ])