[GNUnet-SVN] r5264 - in GNUnet: . m4 src/applications

[gnunet]

Author: grothoff
Date: 2007-07-07 02:23:57 -0600 (Sat, 07 Jul 2007)
New Revision: 5264

Modified:
   GNUnet/bootstrap
   GNUnet/configure.ac
   GNUnet/m4/Makefile.in
   GNUnet/src/applications/Makefile.am
Log:
mysqle

Modified: GNUnet/bootstrap
===================================================================
--- GNUnet/bootstrap    2007-07-07 08:19:01 UTC (rev 5263)
+++ GNUnet/bootstrap    2007-07-07 08:23:57 UTC (rev 5264)
@@ -1,5 +1,6 @@
 #!/bin/sh
 export WANT_AUTOMAKE="1.8"
+export MKDIR_P="mkdir -p"
 automake -fi
 cd libltdl
 autoreconf -f -i

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2007-07-07 08:19:01 UTC (rev 5263)
+++ GNUnet/configure.ac 2007-07-07 08:23:57 UTC (rev 5264)
@@ -27,9 +27,6 @@
 
 AH_TOP([#define _GNU_SOURCE  1])
 
-# Hack for automake 1.10
-export MKDIR_P="mkdir -p"
-
 # Checks for programs.
 AC_PROG_AWK
 AC_PROG_CC

Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in       2007-07-07 08:19:01 UTC (rev 5263)
+++ GNUnet/m4/Makefile.in       2007-07-07 08:23:57 UTC (rev 5264)
@@ -48,6 +48,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -246,9 +248,9 @@
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  m4/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps 
m4/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  m4/Makefile
+         $(AUTOMAKE) --gnu  --ignore-deps m4/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \

Modified: GNUnet/src/applications/Makefile.am
===================================================================
--- GNUnet/src/applications/Makefile.am 2007-07-07 08:19:01 UTC (rev 5263)
+++ GNUnet/src/applications/Makefile.am 2007-07-07 08:23:57 UTC (rev 5264)
@@ -1,3 +1,6 @@
+if HAVE_MYSQLE
+ MYSQLE_DIR = sqstore_mysql_embedded
+endif
 
 if HAVE_MYSQL
  MYSQL_DIR = sqstore_mysql
@@ -30,6 +33,7 @@
  pingpong \
  session \
  $(MYSQL_DIR) \
+ $(MYSQLE_DIR) \
  $(SQLITE_DIR) \
  tbench \
  template \