Cleaned up the configuration and build system quite a bit
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 21 Jul 2007 02:09:44 +0000 (04:09 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 21 Jul 2007 02:09:44 +0000 (04:09 +0200)
acinclude.m4 [new file with mode: 0644]
clients/gaim/Makefile.am
clients/gnome-trans-applet/Makefile.am
clients/gtk2/Makefile.am
config/util/Makefile.am
configure.in
daemon/Makefile.am
lib/Makefile.am

diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644 (file)
index 0000000..714a850
--- /dev/null
@@ -0,0 +1,59 @@
+AC_DEFUN([DOLDA_AC_GROUP],
+[AC_MSG_NOTICE([ -- $1 -- ])])
+
+m4_defun([_DOLDA_PKG_LOOP],[dnl
+if test -z "$[]$1"; then
+       $2
+fi
+ifelse(m4_eval([$# > 2]), 1, [_DOLDA_PKG_LOOP($1, m4_shift(m4_shift($@)))])
+])
+
+# DOLDA_PKG(VARIABLE-NAME, COMMANDS...)
+#
+# Evaluate COMMANDS in sequence as long as ${VARIABLE-NAME} is empty
+
+AC_DEFUN([DOLDA_PKG],[dnl
+$1=""
+_DOLDA_PKG_LOOP($1, m4_shift($@))
+if test "$[]$1" != no; then $1=yes; fi
+])
+
+# DOLDA_CHECK_HEADER(FILE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND,
+#       [EXTRA-CFLAGS])
+#
+# Augmented version of AC_CHECK_HEADER that overrides CPPFLAGS
+
+AC_DEFUN([DOLDA_CHECK_HEADER],[dnl
+cpp_bak="$CPPFLAGS"
+ifelse([$4], , , [CPPFLAGS="$CPPFLAGS $4"])
+AC_CHECK_HEADER($1, $2, $3)
+CPPFLAGS="$cpp_bak"
+])
+
+# DOLDA_ENABLE(NAME, HELP, DEFAULT, DEPS)
+#
+# DEPS is a space-separated listing of required variables that must be
+# `yes'
+
+AC_DEFUN([DOLDA_ENABLE],[dnl
+AC_ARG_ENABLE([$1], [$2])
+if test "[$enable_][$1]" = yes; then
+       for var in [$4]; do
+               if test "${!var}" != yes; then
+                       AC_MSG_ERROR([*** cannot enable $1 without $var])
+               fi
+       done
+else
+       ifelse([$3], yes, [dnl
+       [enable_][$1]=yes
+       for var in [$4]; do
+               if test "${!var}" != yes; then
+                       [enable_][$1]=no
+                       break
+               fi
+       done
+], [dnl
+       [enable_][$1]=no
+])
+fi
+])
index 113c078..8421e67 100644 (file)
@@ -20,9 +20,9 @@ gaim-dolcon.c purple-dolcon.c: gp-dolcon.c
        basename="$${target%-dolcon.c}"; \
        ./mksrc "$$basename" <$< >$@
 
-libdolcon_gaim_la_LDFLAGS=-module -avoid-version $(shell pkg-config --libs gaim glib)
+libdolcon_gaim_la_LDFLAGS=-module -avoid-version @GAIM_LIBS@
 libdolcon_gaim_la_LIBADD=$(top_srcdir)/lib/libdcui.la
-libdolcon_gaim_la_CPPFLAGS=$(shell pkg-config --cflags gaim glib) -DGAIM_PLUGINS
-libdolcon_purple_la_LDFLAGS=-module -avoid-version $(shell pkg-config --libs purple glib)
+libdolcon_gaim_la_CPPFLAGS=@GAIM_CFLAGS@ -DGAIM_PLUGINS
+libdolcon_purple_la_LDFLAGS=-module -avoid-version @PURPLE_LIBS@
 libdolcon_purple_la_LIBADD=$(top_srcdir)/lib/libdcui.la
-libdolcon_purple_la_CPPFLAGS=$(shell pkg-config --cflags purple glib) -DPURPLE_PLUGINS
+libdolcon_purple_la_CPPFLAGS=@PURPLE_CFLAGS@ -DPURPLE_PLUGINS
index cf46b3f..3b24d8d 100644 (file)
@@ -10,9 +10,9 @@ dolcon_trans_applet_SOURCES=  dolcon-trans-applet.c \
                                conduit.h
 
 localedir=$(datadir)/locale
-dolcon_trans_applet_LDFLAGS=$(shell pkg-config --libs libpanelapplet-2.0)
+dolcon_trans_applet_LDFLAGS=@PANELAPPLET_LIBS@
 dolcon_trans_applet_LDADD=$(top_srcdir)/lib/libdcui.la
-dolcon_trans_applet_CPPFLAGS=$(shell pkg-config --cflags libpanelapplet-2.0) -DLOCALEDIR=\"$(localedir)\"
+dolcon_trans_applet_CPPFLAGS=@PANELAPPLET_CFLAGS@ -DLOCALEDIR=\"$(localedir)\"
 
 BUILT_SOURCES=Dolcon_Transferapplet_Factory.server
 
index 8c75120..b79d524 100644 (file)
@@ -14,7 +14,7 @@ BUILT_SOURCES=mainwnd.gtk inpdialog.gtk pref.gtk reslist.gtk
 main.c: mainwnd.gtk inpdialog.gtk pref.gtk reslist.gtk
 
 localedir=$(datadir)/locale
-dolcon_LDFLAGS=        @GTK2_LDADD@ @LIBXML_LDADD@
+dolcon_LDFLAGS=        @GTK2_LIBS@ @LIBXML_LIBS@
 dolcon_LDADD=$(top_srcdir)/lib/libdcui.la
 dolcon_CPPFLAGS=@GTK2_CFLAGS@ @LIBXML_CFLAGS@ \
                -DLOCALEDIR=\"$(localedir)\"
index d2830e5..08fe0c4 100644 (file)
@@ -17,7 +17,7 @@ baseconv_LDADD=$(top_srcdir)/common/libcommon.a
 
 dolconf.c: dolconf-assistant.desc dolconf-wnd.desc
 localedir=$(datadir)/locale
-dolconf_LDFLAGS=       @GTK2_LDADD@
+dolconf_LDFLAGS=       @GTK2_LIBS@
 dolconf_CPPFLAGS=      @GTK2_CFLAGS@ \
                        -DLOCALEDIR=\"$(localedir)\"
 dolconf_LDADD=         $(top_srcdir)/common/libcommon.a $(top_srcdir)/lib/libdcui.la
index 1725964..6e4d737 100644 (file)
@@ -2,19 +2,27 @@ AC_INIT(daemon/main.c)
 AM_INIT_AUTOMAKE([doldaconnect], [0.5])
 AM_CONFIG_HEADER(config.h)
 
+DOLDA_AC_GROUP([Checking build chain])
+
 AC_PROG_CC
 AC_PROG_CC_C_O
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
 
+DOLDA_AC_GROUP([Configuring gettext])
+
 AM_GNU_GETTEXT_VERSION(0.12.1)
 AM_GNU_GETTEXT([external])
 
+DOLDA_AC_GROUP([Configuring libtool])
+
 # Temporary hack to make libtool not check for g++ or g77
 m4_defun([_LT_AC_LANG_CXX_CONFIG], true)
 m4_defun([_LT_AC_LANG_F77_CONFIG], true)
 AC_PROG_LIBTOOL
 
+DOLDA_AC_GROUP([Checking required libraries])
+
 AC_CHECK_LIB(pam, pam_start, , AC_MSG_ERROR([*** must have PAM]))
 AC_CHECK_LIB(z, deflate, , AC_MSG_ERROR([*** must have zlib]))
 AC_CHECK_LIB(bz2, BZ2_bzWriteOpen, , AC_MSG_ERROR([*** must have bzlib]))
@@ -23,152 +31,99 @@ AC_CHECK_LIB(gdbm, gdbm_open, , AC_MSG_ERROR([*** must have gdbm]))
 extlibs=
 experimental=no
 
-AC_CHECK_PROG([PKG_CONFIG], pkg-config, yes, no)
+DOLDA_AC_GROUP([Checking optional libraries])
 
 # Gtk 2.0 check
 AC_ARG_WITH(gtk2, [  --with-gtk2             Enable GTK2 support])
-if test "$with_gtk2" = no; then
-       HAS_GTK2=no
-fi
-if test "$HAS_GTK2" != no; then
-       if test "$PKG_CONFIG" = yes; then
-               AC_MSG_CHECKING([for GTK2 package information])
-               if pkg-config --modversion gtk+-2.0 >/dev/null 2>&1; then
-                       AC_MSG_RESULT(yes)
-               else
-                       AC_MSG_RESULT(no)
-                       HAS_GTK2=no
-               fi
-               GTK2_LDADD="`pkg-config --libs gtk+-2.0`"
-               GTK2_CFLAGS="`pkg-config --cflags gtk+-2.0`"
-               if test "$HAS_GTK2" != no; then
-                       AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [HAS_GTK2=yes], [HAS_GTK2=no], "$GTK2_LDADD")
-               fi
-               if test "$HAS_GTK2" = yes; then
-                       cpp_bak="$CPPFLAGS"
-                       CPPFLAGS="$CPPFLAGS $GTK2_CFLAGS"
-                       AC_CHECK_HEADER(gtk/gtk.h, [], [HAS_GTK2=no])
-                       CPPFLAGS="$cpp_bak"
-               fi
-       else
-               HAS_GTK2=no
-        fi
-fi
+DOLDA_PKG([HAS_GTK2], [test "$with_gtk2" = no && HAS_GTK2=no],
+                     [PKG_CHECK_MODULES(GTK2, gtk+-2.0, [], [HAS_GTK2=no])],
+                     [AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [:], [HAS_GTK2=no], $GTK2_LIBS)],
+                     [DOLDA_CHECK_HEADER(gtk/gtk.h, [], [HAS_GTK2=no], $GTK2_CFLAGS)])
 if test "$with_gtk2" = yes -a "$HAS_GTK2" = no; then
        AC_MSG_ERROR([*** cannot find GTK2 on this system])
 fi
-AC_SUBST([GTK2_LDADD GTK2_CFLAGS])
 
 # libxml2 check
-AC_MSG_CHECKING([for libxml2 package information])
-if test "$PKG_CONFIG" = yes; then
-       if pkg-config --modversion libxml-2.0 >/dev/null 2>&1; then
-               AC_MSG_RESULT(yes)
-       else
-               AC_MSG_RESULT(no)
-               HAS_LIBXML=no
-       fi
-       LIBXML_LDADD="`pkg-config --libs libxml-2.0`"
-       LIBXML_CFLAGS="`pkg-config --cflags libxml-2.0`"
-       if test "$HAS_LIBXML" != no; then
-               AC_CHECK_LIB(xml2, xmlReadFile, [HAS_LIBXML=yes], [HAS_LIBXML=no], "$LIBXML_LDADD")
-       fi
-else
-       AC_MSG_RESULT(no)
-       HAS_LIBXML=no
+AC_ARG_WITH(libxml2, [  --with-libxml2          Enable libxml2 support])
+DOLDA_PKG([HAS_LIBXML], [test "$with_libxml2" = no && HAS_LIBXML=no],
+                       [PKG_CHECK_MODULES(LIBXML, libxml-2.0, [], [HAS_LIBXML=no])],
+                       [AC_CHECK_LIB(xml2, xmlReadFile, [:], [HAS_LIBXML=no], $LIBXML_LIBS)],
+                       [DOLDA_CHECK_HEADER(libxml/parser.h, [], [HAS_LIBXML=no], $LIBXML_CFLAGS)])
+if test "$with_libxml" = yes -a "$HAS_LIBXML" = no; then
+       AC_MSG_ERROR([*** cannot find libxml2 on this system])
 fi
-AC_SUBST([LIBXML_LDADD LIBXML_CFLAGS])
 
 # libnotify check
-AC_MSG_CHECKING([for libnotify package information])
-if test "$PKG_CONFIG" = yes; then
-       if pkg-config --modversion libnotify >/dev/null 2>&1; then
-               AC_MSG_RESULT(yes)
-       else
-               AC_MSG_RESULT(no)
-               HAS_LIBNOTIFY=no
-       fi
-else
-       AC_MSG_RESULT(no)
-       HAS_LIBNOTIFY=no
-fi
-if test "$HAS_LIBNOTIFY" != no; then
-       AC_CHECK_LIB(notify, notify_init, [HAS_LIBNOTIFY=yes], [HAS_LIBNOTIFY=no], `pkg-config --libs libnotify`)
+AC_ARG_WITH(libnotify, [  --with-libnotify        Enable libnotify support])
+DOLDA_PKG([HAS_LIBNOTIFY], [test "$with_libnotify" = no && HAS_LIBNOTIFY=no],
+                          [PKG_CHECK_MODULES(LIBNOTIFY, libnotify, [], [HAS_LIBNOTIFY=no])],
+                          [AC_CHECK_LIB(notify, notify_init, [:], [HAS_LIBNOTIFY=no], $LIBNOTIFY_LIBS)])
+if test "$with_libnotify" = yes -a "$HAS_LIBNOTIFY" = no; then
+       AC_MSG_ERROR([*** cannot find libnotify on this system])
 fi
 
+# libpanelapplet check
+DOLDA_PKG([HAS_LIBPANELAPPLET], [PKG_CHECK_MODULES(PANELAPPLET, libpanelapplet-2.0, [], [HAS_LIBPANELAPPLET=no])])
+
+# Gaim/Pidgin check
+DOLDA_PKG([HAS_LIBGAIM], [PKG_CHECK_MODULES(GAIM, gaim, [], [HAS_LIBGAIM=no])],
+                        [DOLDA_CHECK_HEADER(plugin.h, [], [HAS_LIBGAIM=no], $GAIM_CFLAGS)])
+DOLDA_PKG([HAS_LIBPURPLE], [PKG_CHECK_MODULES(PURPLE, purple, [], [HAS_LIBPURPLE=no])],
+                          [DOLDA_CHECK_HEADER(plugin.h, [], [HAS_LIBPURPLE=no], $PURPLE_CFLAGS)])
+
 # Gtk GUI check
-gtk2ui_msg=No
-AC_ARG_ENABLE(gtk2ui, [  --enable-gtk2ui         Enable the GTK2 user interface])
-if test "$enable_gtk2ui" = yes; then
-       if test "$HAS_GTK2" = no; then
-               AC_MSG_ERROR([*** cannot build the GTK2 UI without a GTK2 library])
-       fi
-       if test "$HAS_LIBXML" = no; then
-               AC_MSG_ERROR([*** the GTK2 UI needs libxml2])
-       fi
-fi
-if test "$enable_gtk2ui" != no -a "$HAS_GTK2" = yes -a "$HAS_LIBXML" = yes; then
-       gtk2ui_msg=Yes
-fi
-AM_CONDITIONAL(CLI_GTK2, test "$gtk2ui_msg" = Yes)
+DOLDA_ENABLE(gtk2ui, [  --enable-gtk2ui         Enable the GTK2 user interface], yes,
+                    [HAS_GTK2 HAS_LIBXML])
+AM_CONDITIONAL(CLI_GTK2, test "$enable_gtk2ui" = yes)
 
 # Dolconf check
-dolconf_msg=No
-AC_ARG_ENABLE(dolconf, [  --enable-dolconf        Build the configuration helper])
-if test "$enable_dolconf" = yes -a "$HAS_GTK2" = no; then
-       AC_MSG_ERROR([*** cannot build dolconf without GTK2])
-fi
-if test "$enable_dolconf" != no -a "$HAS_GTK2" = yes; then
-       dolconf_msg=Yes
-fi
-AM_CONDITIONAL(DOLCONF, test "$dolconf_msg" = Yes)
+DOLDA_ENABLE(dolconf, [  --enable-dolconf        Build the configuration helper], yes,
+                     [HAS_GTK2])
+AM_CONDITIONAL(DOLCONF, test "$enable_dolconf" = yes)
 
 # Gtk progress bar check
-gtk2pbar_msg=No
 AH_TEMPLATE(ENABLE_GTK2PBAR, [define to compile GTK2 progress bars (experimental)])
-AC_ARG_ENABLE(gtk2pbar, [  --enable-gtk2pbar       Enable GTK2 progress bars (experimental)])
+DOLDA_ENABLE(gtk2pbar, [  --enable-gtk2pbar       Enable GTK2 progress bars (experimental)], no,
+                      [HAS_GTK2 enable_gtk2ui])
 if test "$enable_gtk2pbar" = yes; then
-       if test "$HAS_GTK2" = no; then
-               AC_MSG_ERROR([*** cannot build GTK2 progress bars without GTK2])
-       fi
        experimental=yes
-       gtk2pbar_msg=Yes
        AC_DEFINE(ENABLE_GTK2PBAR)
 fi
 
 # Gnome applet check
-gnometrapplet_msg=No
-AC_ARG_ENABLE(gnomeapplet, [  --enable-gnomeapplet    Enable GNOME transfer applet (experimental)])
+DOLDA_ENABLE(gnomeapplet, [  --enable-gnomeapplet    Enable GNOME transfer applet (experimental)], no,
+                         [HAS_LIBPANELAPPLET])
 if test "$enable_gnomeapplet" = yes; then
        experimental=yes
-       gnometrapplet_msg=Yes
 fi
-AM_CONDITIONAL(CLI_GNOMEAPPLET, test "$gnometrapplet_msg" = Yes)
+AM_CONDITIONAL(CLI_GNOMEAPPLET, test "$enable_gnomeapplet" = yes)
 
 # Gaim plugin check
 gaimplugin_msg=
-AC_ARG_ENABLE(gaimplugin, [  --enable-gaimplugin     Enable Gaim chat plugin (experimental)])
+DOLDA_ENABLE(gaimplugin, [  --enable-gaimplugin     Enable Gaim chat plugin (experimental)], no,
+                        [HAS_LIBGAIM])
 if test "$enable_gaimplugin" = yes; then
        experimental=yes
        gaimplugin_msg="Gaim $gaimplugin_msg"
 fi
 AM_CONDITIONAL(CLI_GAIM, test "$enable_gaimplugin" = yes)
-AC_ARG_ENABLE(pidginplugin, [  --enable-pidginplugin   Enable Pidgin chat plugin (experimental)])
+DOLDA_ENABLE(pidginplugin, [  --enable-pidginplugin   Enable Pidgin chat plugin (experimental)], no,
+                          [HAS_LIBPURPLE])
 if test "$enable_pidginplugin" = yes; then
        experimental=yes
        gaimplugin_msg="Pidgin $gaimplugin_msg"
 fi
 AM_CONDITIONAL(CLI_PIDGIN, test "$enable_pidginplugin" = yes)
 if test -z "$gaimplugin_msg"; then
-       gaimplugin_msg=No
+       gaimplugin_msg=none
 fi
 
 # Guile check (XXX: Shouldn't have to be enabled manually)
-guile_msg=No
+guile_msg=no
 if test "$with_guile" = yes; then
        GUILE_FLAGS
        extlibs="$extlibs guile"
-       guile_msg=Yes
+       guile_msg=yes
 fi
 
 # Check whether to install baseconv
@@ -176,41 +131,30 @@ AC_ARG_ENABLE(baseconv, [  --enable-baseconv       Install the baseconv utility]
 AM_CONDITIONAL(BASECONV, test "$enable_baseconv" = yes)
 
 # Kerberos check
-krb_msg=No
-AH_TEMPLATE(HAVE_KRB5, [define to compile support for Kerberos 5 (not GSS-API) authentication])
+krb_msg=no
+AH_TEMPLATE(HAVE_KRB5, [define to compile support for Kerberos 5 (not GSSAPI) authentication])
 AC_ARG_WITH(krb5, [  --with-krb5[=PATH]        Enable Kerberos 5 (not GSSAPI) authentication])
-if test "$with_krb5" != no; then
-       cpp_bak="$CPPFLAGS"
-       ld_bak="$LDFLAGS"
-       if test "$with_krb5" != yes; then
-               CPPFLAGS="$CPPFLAGS -I${with_krb5}/include"
-               LDFLAGS="$LDFLAGS -L${with_krb5}/lib"
-       fi
-       AC_CHECK_LIB(krb5, krb5_init_context, [HAS_KRB5=yes], [HAS_KRB5=no])
-       if test "$HAS_KRB5" = yes; then
-               AC_CHECK_HEADER(com_err.h, [HAS_COMERR=yes], [HAS_COMERR=no])
-               if test "$HAS_COMERR" = no; then
-                       AC_CHECK_HEADER(et/com_err.h, [HAS_COMERR=yes; CPPFLAGS="$CPPFLAGS -I/usr/include/et"], [])
-               fi
-       fi
-       if test "$HAS_COMERR" = no; then
-               HAS_KRB5=no
-       fi
-       if test "$HAS_KRB5" = no; then
-               CPPFLAGS="$cpp_bak"
-               LDFLAGS="$ld_bak"
-       fi
-fi
-KRB5_LDADD=
-if test -n "$with_krb5" -a "$with_krb5" != no -a "$HAS_KRB5" != yes; then
-       AC_MSG_ERROR([*** cannot find Kerberos 5 on this system - try passing --with-krb5=/path/to/kerberos])
+AC_CHECK_PROG(KRBCONF, krb5-config, yes, no)
+DOLDA_PKG([HAS_COMERR], [AC_CHECK_HEADER(com_err.h, [COMERR_CFLAGS=""; HAS_COMERR=yes], [])],
+                       [AC_CHECK_HEADER(et/com_err.h, [COMERR_CFLAGS="-I/usr/include/et"; HAS_COMERR=yes], [])],
+                       [HAS_COMERR=no])
+DOLDA_PKG([HAS_KRB5], [test "$with_krb5" = no && HAS_KRB5=no],
+                     [test "$KRBCONF" != yes && HAS_KRB5=no],
+                     [test "$HAS_COMERR" = no && HAS_KRB5=no],
+                     [KRB5_LIBS="`krb5-config --libs krb5`"
+                      KRB5_CFLAGS="`krb5-config --cflags krb5` $COMERR_CFLAGS"]
+                     [AC_CHECK_LIB(krb5, krb5_init_context, [:], [HAS_KRB5=no], $KRB5_LIBS)],
+                     [DOLDA_CHECK_HEADER(krb5.h, [], [HAS_KRB5=no], $KRB5_CFLAGS)])
+if test -n "$with_krb5" -a "$with_krb5" != no -a "$HAS_KRB5" = no; then
+       AC_MSG_ERROR([*** cannot find Kerberos 5 on this system])
 fi
 if test "$with_krb5" != no -a "$HAS_KRB5" = yes; then
        AC_DEFINE(HAVE_KRB5)
-       KRB5_LDADD=-lkrb5
-       krb_msg=Yes
+       krb_msg=yes
 fi
-AC_SUBST([KRB5_LDADD])
+AC_SUBST([KRB5_LIBS KRB5_CFLAGS])
+
+DOLDA_AC_GROUP([Checking operating system features])
 
 # Misc. functions checks
 AC_CHECK_FUNC(vswprintf, , AC_MSG_ERROR([*** must have vswprintf]))
@@ -245,6 +189,8 @@ else
        AC_MSG_RESULT(none)
 fi
 
+DOLDA_AC_GROUP([Checking standard headers])
+
 AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
@@ -256,6 +202,8 @@ AC_TYPE_SIGNAL
 
 CPPFLAGS="-I\$(top_srcdir)/include $CPPFLAGS"
 
+DOLDA_AC_GROUP([Writing output])
+
 AC_SUBST([extlibs])
 AC_OUTPUT([
 Makefile
@@ -288,11 +236,11 @@ echo
 echo "Dolda Connect has been configured with the following settings:"
 echo
 echo "    Kerberos 5 support:      $krb_msg"
-echo "    GTK2 user interface:     $gtk2ui_msg"
-echo "    GTK2 progress bars:      $gtk2pbar_msg"
-echo "    Dolconf configurator:    $dolconf_msg"
+echo "    GTK2 user interface:     $enable_gtk2ui"
+echo "    GTK2 progress bars:      $enable_gtk2pbar"
+echo "    Dolconf configurator:    $enable_dolconf"
 echo "    Guile extension library: $guile_msg"
-echo "    GNOME transfer applet:   $gnometrapplet_msg"
+echo "    GNOME transfer applet:   $enable_gnomeapplet"
 echo "    Gaim chat plugin:        $gaimplugin_msg"
 echo
 
index e4f0ea2..0f240d7 100644 (file)
@@ -24,8 +24,7 @@ doldacond_SOURCES=    main.c \
                        conf.c \
                        conf.h
 
-AM_CPPFLAGS=-I$(top_srcdir)/include -DDAEMON
-
 EXTRA_DIST=emacs-local
 doldacond_LDADD=$(top_srcdir)/common/libcommon.a \
-               @KRB5_LDADD@ -lbz2 -lz
+               @KRB5_LIBS@ -lbz2 -lz
+doldacond_CPPFLAGS=-I$(top_srcdir)/include -DDAEMON @KRB5_CFLAGS@
index 7e507c3..01c8cfa 100644 (file)
@@ -6,8 +6,9 @@ DIST_SUBDIRS=guile
 lib_LTLIBRARIES = libdcui.la
 
 libdcui_la_SOURCES = uilib.c uimisc.c
-libdcui_la_LIBADD = @KRB5_LDADD@ $(top_srcdir)/common/libcommon.a
+libdcui_la_LIBADD = @KRB5_LIBS@ $(top_srcdir)/common/libcommon.a
 libdcui_la_LDFLAGS = -version-info 2:0:1
+libdcui_la_CPPFLAGS = @KRB5_CFLAGS@
 
 BUILT_SOURCES = initcmds.h