allow building without libmoonshot

diff --git a/acinclude.m4 b/acinclude.m4
index a626e8a..ff06090 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -328,13 +328,16 @@ fi
 AC_DEFUN([AX_CHECK_LIBMOONSHOT],
 [AC_MSG_CHECKING(for Moonshot identity selector implementation)
 LIBMOONSHOT_DIR=
+LIBMOONSHOT_CFLAGS=
+LIBMOONSHOT_LDFLAGS=
+LIBMOONSHOT_LIBS=
 found_libmoonshot="no"
 AC_ARG_WITH(libmoonshot,
     AC_HELP_STRING([--with-libmoonshot],
        [Use libmoonshot (in specified installation directory)]),
     [check_libmoonshot_dir="$withval"],
     [check_libmoonshot_dir=])
-for dir in $check_libmoonshot_dir $prefix /usr /usr/local ../../moonshot-ui/libmoonshot ; do
+for dir in $check_libmoonshot_dir $prefix /usr /usr/local ; do
    libmoonshotdir="$dir"
    if test -f "$dir/include/libmoonshot.h"; then
      found_libmoonshot="yes";
@@ -344,23 +347,15 @@ for dir in $check_libmoonshot_dir $prefix /usr /usr/local ../../moonshot-ui/libm
    fi
 done
 AC_MSG_RESULT($found_libmoonshot)
-if test x_$found_libmoonshot != x_yes; then
-   AC_MSG_ERROR([
-----------------------------------------------------------------------
-  Cannot find Moonshot identity selector libraries.
-
-  Please install wpa_supplicant or specify installation directory with
-  --with-libmoonshot=(dir).
-----------------------------------------------------------------------
-])
-else
-       printf "libmoonshot found in $libmoonshotdir\n";
-       LIBMOONSHOT_LIBS="-lmoonshot";
-       LIBMOONSHOT_LDFLAGS="-L$libmoonshot/lib";
-       AC_SUBST(LIBMOONSHOT_CFLAGS)
-       AC_SUBST(LIBMOONSHOT_LDFLAGS)
-       AC_SUBST(LIBMOONSHOT_LIBS)
-       AC_CHECK_LIB(moonshot, moonshot_get_identity, [AC_DEFINE_UNQUOTED([HAVE_MOONSHOT_GET_IDENTITY], 1, [Define if Moonshot identity selector is available])], [], "$LIBMOONSHOT_LIBS")
+if test x_$found_libmoonshot = x_yes; then
+    printf "libmoonshot found in $libmoonshotdir\n";
+    LIBMOONSHOT_LIBS="-lmoonshot";
+    LIBMOONSHOT_LDFLAGS="-L$libmoonshot/lib";
+    AC_CHECK_LIB(moonshot, moonshot_get_identity, [AC_DEFINE_UNQUOTED([HAVE_MOONSHOT_GET_IDENTITY], 1, [Define if Moonshot identity selector is available])], [], "$LIBMOONSHOT_LIBS")
 fi
+    AC_SUBST(LIBMOONSHOT_CFLAGS)
+    AC_SUBST(LIBMOONSHOT_LDFLAGS)
+    AC_SUBST(LIBMOONSHOT_LIBS)
+    AM_CONDITIONAL(LIBMOONSHOT, test "x$found_libmoonshot" != "xno")
 ])dnl
 

diff --git a/mech_eap/Makefile.am b/mech_eap/Makefile.am
index cb66fe8..608f339 100644 (file)
--- a/mech_eap/Makefile.am
+++ b/mech_eap/Makefile.am
@@ -33,9 +33,9 @@ mech_eap_la_DEPENDENCIES = $(GSSEAP_EXPORTS)
 
 mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
 mech_eap_la_CFLAGS   += \
-                       @KRB5_CFLAGS@  @RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
+                       @KRB5_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
 mech_eap_la_CXXFLAGS += \
-                       @KRB5_CFLAGS@  @RADSEC_CFLAGS@ \
+                       @KRB5_CFLAGS@ @RADSEC_CFLAGS@ \
                        @OPENSAML_CXXFLAGS@ @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ \
                        @TARGET_CFLAGS@ $(EAP_CFLAGS)
 mech_eap_la_LDFLAGS  = -avoid-version -module \
@@ -102,7 +102,6 @@ mech_eap_la_SOURCES =                       \
        util_krb.c                              \
        util_lucid.c                            \
        util_mech.c                             \
-       util_moonshot.c                         \
        util_name.c                             \
        util_oid.c                              \
        util_ordering.c                         \
@@ -124,6 +123,12 @@ mech_eap_la_SOURCES =                      \
        util_saml.h \
        util_shib.h
 
+if LIBMOONSHOT
+mech_eap_la_SOURCES += util_moonshot.c
+mech_eap_la_CFLAGS  += @LIBMOONSHOT_CFLAGS@
+mech_eap_la_LDFLAGS += @LIBMOONSHOT_LDFLAGS@
+mech_eap_la_LIBADD  += @LIBMOONSHOT_LIBS@
+endif
 
 if GSSEAP_ENABLE_ACCEPTOR