You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
70 lines
2.2 KiB
70 lines
2.2 KiB
Index: Makefile.in |
|
--- Makefile.in.orig 2012-05-28 19:11:45.000000000 +0200 |
|
+++ Makefile.in 2012-05-29 09:48:13.000000000 +0200 |
|
@@ -1166,7 +1166,7 @@ |
|
top_build_prefix = @top_build_prefix@ |
|
top_builddir = @top_builddir@ |
|
top_srcdir = @top_srcdir@ |
|
-SUBDIRS = lib po gl src examples tests doc gltests |
|
+SUBDIRS = po gl src |
|
EXTRA_DIST = cfg.mk maint.mk .clcopying |
|
ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lib/m4 -I lib/gl/m4 |
|
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-obsolete --with-gssapi-impl=no |
|
Index: src/Makefile.in |
|
--- src/Makefile.in.orig 2012-05-28 19:11:45.000000000 +0200 |
|
+++ src/Makefile.in 2012-05-29 09:48:13.000000000 +0200 |
|
@@ -181,7 +181,7 @@ |
|
callbacks.$(OBJEXT) |
|
gsasl_OBJECTS = $(am_gsasl_OBJECTS) |
|
am__DEPENDENCIES_1 = |
|
-gsasl_DEPENDENCIES = ../lib/src/libgsasl.la ../gl/libgl.la \ |
|
+gsasl_DEPENDENCIES = ../gl/libgl.la \ |
|
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ |
|
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libgsasl_cmd.la |
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
|
@@ -1156,7 +1156,7 @@ |
|
imap.c imap.h smtp.c smtp.h \ |
|
callbacks.h callbacks.c internal.h |
|
|
|
-gsasl_LDADD = ../lib/src/libgsasl.la ../gl/libgl.la \ |
|
+gsasl_LDADD = @LDFLAGS@ @LIBS@ ../gl/libgl.la \ |
|
$(LTLIBREADLINE) $(LTLIBGNUTLS) $(LIBSOCKET) $(LTLIBINTL) \ |
|
libgsasl_cmd.la |
|
|
|
Index: src/callbacks.c |
|
--- src/callbacks.c.orig 2012-05-16 00:35:28.000000000 +0200 |
|
+++ src/callbacks.c 2012-05-29 09:49:34.000000000 +0200 |
|
@@ -83,6 +83,7 @@ |
|
rc = GSASL_OK; |
|
break; |
|
|
|
+#ifdef GSASL_CB_TLS_UNIQUE |
|
case GSASL_CB_TLS_UNIQUE: |
|
if (!args_info.no_cb_flag && b64cbtlsunique == NULL |
|
&& args_info.hostname_arg == NULL) |
|
@@ -92,6 +93,7 @@ |
|
gsasl_property_set (sctx, prop, b64cbtlsunique); |
|
rc = GSASL_OK; |
|
break; |
|
+#endif |
|
|
|
case GSASL_PASSWORD: |
|
if (args_info.password_arg == NULL) |
|
@@ -227,7 +229,8 @@ |
|
} |
|
break; |
|
|
|
- case GSASL_OPENID20_AUTHENTICATE_IN_BROWSER: |
|
+#ifdef GSASL_OPENID20_AUTHENTICATE_IN_BROWSER |
|
+ case GSASL_OPENID19_AUTHENTICATE_IN_BROWSER: |
|
{ |
|
const char *url = gsasl_property_get (sctx, |
|
GSASL_OPENID20_REDIRECT_URL); |
|
@@ -238,6 +241,7 @@ |
|
rc = GSASL_OK; |
|
} |
|
break; |
|
+#endif |
|
|
|
default: |
|
fprintf (stderr,
|
|
|