AC_INIT(daemon/main.c)
-AM_INIT_AUTOMAKE([doldaconnect], [1.0])
+AM_INIT_AUTOMAKE([doldaconnect], [1.1])
AM_CONFIG_HEADER(config.h)
DOLDA_AC_GROUP([Checking build chain])
m4_defun([_LT_AC_LANG_F77_CONFIG], true)
AC_PROG_LIBTOOL
-DOLDA_AC_GROUP([Checking required libraries])
-
-AC_CHECK_LIB(z, deflate, [:], AC_MSG_ERROR([*** must have zlib]))
-AC_CHECK_LIB(bz2, BZ2_bzWriteOpen, [:], AC_MSG_ERROR([*** must have bzlib]))
-AC_CHECK_LIB(gdbm, gdbm_open, [:], AC_MSG_ERROR([*** must have gdbm]))
-
-extlibs=
experimental=no
DOLDA_AC_GROUP([Checking optional libraries])
+# Standard libraries
+AC_CHECK_LIB(z, deflate, [HAS_LIBZ=yes], [HAS_LIBZ=no])
+AC_CHECK_LIB(bz2, BZ2_bzWriteOpen, [HAS_LIBBZ2=yes], [HAS_LIBBZ2=no])
+AC_CHECK_LIB(gdbm, gdbm_open, [HAS_GDBM=yes], [HAS_GDBM=no])
+
# PAM check
pam_msg=no
AH_TEMPLATE(HAVE_PAM, [define to compile support for PAM authentication])
if test "$with_gtk2" = yes -a "$HAS_GTK2" = no; then
AC_MSG_ERROR([*** cannot find GTK2 on this system])
fi
+DOLDA_PKG([HAS_GTK2SI], [test "$HAS_GTK2" = no && HAS_GTK2SI=no],
+ [DOLDA_CHECK_FUNC(gtk_status_icon_new_from_pixbuf, [], [HAS_GTK2SI=no], $GTK2_CFLAGS, $GTK2_LIBS)])
+DOLDA_PKG([HAS_GTK2ASS], [test "$HAS_GTK2" = no && HAS_GTK2ASS=no],
+ [DOLDA_CHECK_FUNC(gtk_assistant_new, [], [HAS_GTK2ASS=no], $GTK2_CFLAGS, $GTK2_LIBS)])
# libxml2 check
AC_ARG_WITH(libxml2, [ --with-libxml2 Enable libxml2 support])
[DOLDA_CHECK_HEADER(plugin.h, [], [HAS_LIBPURPLE=no], $PURPLE_CFLAGS)])
# Daemon check
-DOLDA_ENABLE(daemon, [ --enable-daemon Enable the daemon], yes, [])
+DOLDA_ENABLE(daemon, [ --enable-daemon Enable the daemon], yes,
+ [HAS_LIBZ HAS_LIBBZ2 HAS_GDBM])
AM_CONDITIONAL(DAEMON, test "$enable_daemon" = yes)
# Gtk GUI check
DOLDA_ENABLE(gtk2ui, [ --enable-gtk2ui Enable the GTK2 user interface], yes,
- [HAS_GTK2 HAS_LIBXML])
+ [HAS_GTK2 HAS_LIBBZ2 HAS_LIBXML])
AM_CONDITIONAL(CLI_GTK2, test "$enable_gtk2ui" = yes)
# Dolconf check
DOLDA_ENABLE(dolconf, [ --enable-dolconf Build the configuration helper], yes,
- [HAS_GTK2])
+ [HAS_GTK2], [HAS_GTK2ASS])
AM_CONDITIONAL(DOLCONF, test "$enable_dolconf" = yes)
# GUI shell check
DOLDA_ENABLE(guishell, [ --enable-guishell Build the GUI shell programs], yes,
- [HAS_GTK2])
+ [HAS_GTK2], [HAS_GTK2SI])
AM_CONDITIONAL(GUISHELL, test "$enable_guishell" = yes)
# Gnome applet check
fi
# Guile check (XXX: Shouldn't have to be enabled manually)
-guile_msg=no
+enable_guile=no
if test "$with_guile" = yes; then
GUILE_FLAGS
- extlibs="$extlibs guile"
- guile_msg=yes
+ enable_guile=yes
fi
+AM_CONDITIONAL(ELIB_GUILE, test "$enable_guile" = yes)
# Check whether to install baseconv
AC_ARG_ENABLE(baseconv, [ --enable-baseconv Install the baseconv utility])
AH_TEMPLATE(HAVE_RESOLVER, [define if your system supports the res_* functions to fetch DNS RRs])
AC_CHECK_LIB(resolv, res_query, [ AC_DEFINE(HAVE_RESOLVER)
LDFLAGS="$LDFLAGS -lresolv" ])
+AC_CHECK_LIB(resolv, __res_query, [ AC_DEFINE(HAVE_RESOLVER)
+ LDFLAGS="$LDFLAGS -lresolv" ])
# Unix credentials selector
AH_TEMPLATE(UNIX_AUTH_STYLE, [undefine for no Unix auth, 1 for Linux style, 2 for BSD style])
fi
AC_DEFINE_UNQUOTED([RELEASEINFO], ["$relinfo"])
-AC_SUBST([extlibs])
AC_OUTPUT([
Makefile
autopackage/Makefile
echo " GTK2 user interface: $enable_gtk2ui"
echo " Dolconf configurator: $enable_dolconf"
echo " GUI shell: $enable_guishell"
-echo " Guile extension library: $guile_msg"
+echo " Guile extension library: $enable_guile"
echo " GNOME transfer applet: $enable_gnomeapplet"
echo " Gaim chat plugin: $gaimplugin_msg"
echo