CVS gsasl/lib/src

[gsasl-commit]

Update of /home/cvs/gsasl/lib/src
In directory dopio:/tmp/cvs-serv2800/src

Modified Files:
        Makefile.am saslprep.c stringprep.c 
Removed Files:
        stringprep-no.c 
Log Message:
Add copy of libidn, so we always have SASLprep functionality.

--- /home/cvs/gsasl/lib/src/Makefile.am 2004/11/30 02:12:08     1.17
+++ /home/cvs/gsasl/lib/src/Makefile.am 2004/11/30 02:51:30     1.18
@@ -22,6 +22,9 @@
 
 AM_CPPFLAGS = -I$(srcdir)/../gl -I../gl -I$(srcdir)/.. \
        -I$(srcdir)/../crypto -I../crypto
+if MINILIBIDN
+AM_CPPFLAGS += -I$(srcdir)/../libidn
+endif
 DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@
 
 include_HEADERS = gsasl.h gsasl-mech.h gsasl-compat.h
@@ -29,18 +32,16 @@
 libgsasl_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
        -export-symbols-regex '^(gsasl|GSASL).*'
 libgsasl_la_LIBADD = @LTLIBINTL@ ../gl/libgl.la ../crypto/libgc.la
+if MINILIBIDN
+libgsasl_la_LIBADD += ../libidn/libminilibidn.la
+endif
 libgsasl_la_SOURCES = gsasl.h.in internal.h \
        init.c done.c register.c error.c version.c \
        callback.c property.c \
        supportp.c suggest.c listmech.c \
        xstart.c xstep.c xfinish.c xcode.c \
-       base64.c md5pwd.c crypto.c obsolete.c
-
-if STRINGPREP
-libgsasl_la_SOURCES += stringprep.c saslprep.c
-else
-libgsasl_la_SOURCES += stringprep-no.c
-endif
+       base64.c md5pwd.c crypto.c obsolete.c \
+       stringprep.c saslprep.c
 
 # Plugins:
 if EXTERNAL
--- /home/cvs/gsasl/lib/src/saslprep.c  2004/11/30 02:12:00     1.1
+++ /home/cvs/gsasl/lib/src/saslprep.c  2004/11/30 02:51:30     1.2
@@ -21,9 +21,7 @@
 
 #include "internal.h"
 
-#if WITH_STRINGPREP
-# include <stringprep.h>
-#endif
+#include <stringprep.h>
 
 /**
  * gsasl_saslprep:
@@ -42,7 +40,6 @@
 int
 gsasl_saslprep (const char *in, int allowunassigned, char **out)
 {
-#if WITH_STRINGPREP
   int rc;
 
   rc = stringprep_profile (in, out, "SASLprep",
@@ -54,7 +51,4 @@
     }
 
   return GSASL_OK;
-#else
-  return GSASL_SASLPREP_ERROR;
-#endif
 }
--- /home/cvs/gsasl/lib/src/stringprep.c        2004/04/15 22:02:50     1.2
+++ /home/cvs/gsasl/lib/src/stringprep.c        2004/11/30 02:51:30     1.3
@@ -19,11 +19,6 @@
  *
  */
 
-/*
- * Note: this file is only used when --with-stringprep is specified (default).
- * See also stringprep-no.c.
- */
-
 #include "internal.h"
 
 #include <stringprep.h>