diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Makefile.am | 9 | ||||
-rw-r--r-- | configure.in | 14 |
3 files changed, 27 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Aug 18 14:27:14 CEST 2000 Werner Koch <wk@openit.de> + + * agent/: New. + * Makefile.am, configure.in: Support for the new directory. + Mon Jul 17 16:35:47 CEST 2000 Werner Koch <wk@> * configure.in (mingw32): Changes to allow for mingw32msvc diff --git a/Makefile.am b/Makefile.am index c05fa23d..b9983fd1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,14 @@ else checks = checks endif -SUBDIRS = intl zlib jnlib util mpi cipher ${gcrypt} g10 po tools doc ${checks} +if COMPILE_AGENT +agent = agent +else +agent = +endif + +SUBDIRS = intl zlib jnlib util mpi cipher ${gcrypt} g10 po tools \ + ${agent} doc ${checks} EXTRA_DIST = README-alpha VERSION PROJECTS BUGS # gettext never gets it right, so we take here care of deleting the # symlink. my_clean_gcrypt is just a kludge until we can include diff --git a/configure.in b/configure.in index 9cc324fe..65b6c847 100644 --- a/configure.in +++ b/configure.in @@ -302,6 +302,19 @@ AC_SUBST(USE_NLS) AC_SUBST(USE_INCLUDED_LIBINTL) fi +dnl Where is the GTK+ toolkit +if test "$cross_compiling" = yes ; then + CFLAGS="$CFLAGS -I/home/wk/work/gtk+w32/include/gtk+/gdk/win32 \ + -I/home/wk/work/gtk+w32/include -I/home/wk/work/gtk+w32/include/gtk+" + LIBS="$LIBS -L/home/wk/work/gtk+w32/lib -lgtk -lgdk -lglib" + compile_agent=no +else + AM_PATH_GTK(1.2.1, compile_agent=yes,compile_agent=no) +fi +AM_CONDITIONAL(COMPILE_AGENT, test x$compile_agent = xyes) + + + dnl dnl There are lot of misconfigured systems. We include dnl gdbm support only if the lib and the header is installed. @@ -760,6 +773,7 @@ util/Makefile mpi/Makefile cipher/Makefile g10/Makefile +agent/Makefile doc/Makefile doc/version.sgml tools/Makefile |