Fix autoconf config for radcli

configure.ac

@@ -997,24 +997,23 @@ if test "${radcli_path}" = "yes" ; then
     for d in $radclidirs
     do
             if test -f $d/include/radcli/radcli.h; then
-                    RADCLI_INCLUDES="-I$d/include"
+                    RADCLI_CFLAGS="-I$d/include"
                     RADCLI_LIBS="-L$d/lib -L$d/lib64"
                     break
             fi
     done
 elif test "${radcli_path}" != "no" ; then
-    RADCLI_INCLUDES="-I${radcli_path}/include"
+    RADCLI_CFLAGS="-I${radcli_path}/include"
     RADCLI_LIBS="-L${radcli_path}/lib"
 fi
 
-if test "${RADCLI_INCLUDES}" != "" ; then
+if test "${RADCLI_CFLAGS}" != "" ; then
     RADCLI_LIBS="$RADCLI_LIBS -lradcli"
-    AC_SUBST(RADCLI_INCLUDES)
+    AC_SUBST(RADCLI_CFLAGS)
     AC_SUBST(RADCLI_LIBS)
-    AC_DEFINE([HAVE_RADCLI], 1, [Define to 1 to use radcli.])
 
     CPPFLAGS_SAVED=$CPPFLAGS
-    CPPFLAGS="$RADCLI_INCLUDES $CPPFLAGS"
+    CPPFLAGS="$RADCLI_CFLAGS $CPPFLAGS"
     LIBS_SAVED="$LIBS"
     LIBS="$RADCLI_LIBS $LIBS"
 
@@ -1026,10 +1025,11 @@ if test "${RADCLI_INCLUDES}" != "" ; then
                               rh = rc_new();
                              ])],
             [AC_MSG_RESULT([checking for radcli library... yes])
-             AM_CONDITIONAL(HAVE_RADCLI, 1)],
+             AC_DEFINE([HAVE_RADCLI], 1, [radcli is present])],
             [AC_MSG_RESULT([checking for radcli library... no])]
     )
 fi
+AM_CONDITIONAL(HAVE_RADCLI, test "${RADCLI_CFLAGS}" != "")
 
 # Check for MySql.  The path to the mysql_config program is given with
 # the --with-mysql-config (default to /usr/bin/mysql-config).  By default,