fix configure.ac
authorChristoph Hohmann <reboot@gmx.ch>
Sat, 2 Aug 2003 23:38:54 +0000 (23:38 +0000)
committerChristoph Hohmann <reboot@gmx.ch>
Sat, 2 Aug 2003 23:38:54 +0000 (23:38 +0000)
clean up src/Makefile.am a little bit

configure.ac
src/Makefile.am

index d211cd6c18690e62f9f3dd3ac8440ea1e5634c48..0bbb469318998bb574b4b68dd8ed224f696d4637 100644 (file)
@@ -394,7 +394,7 @@ if test x"$ac_cv_enable_trayicon_plugin" = xyes; then
 fi
 AM_CONDITIONAL(BUILD_TRAYICON_PLUGIN, test x"$ac_cv_enable_trayicon_plugin" = xyes)
 
-dnl --- SpamAssassin
+dnl --- SpamAssassin ---
 AC_ARG_ENABLE(spamassassin-plugin,
        [  --enable-spamassassin-plugin    Build SpamAssassin plugin [default=no]],
        [ac_cv_enable_spamassassin_plugin=$enableval], [ac_cv_enable_spamassassin_plugin=no])
@@ -409,7 +409,7 @@ AC_ARG_ENABLE(mathml-viewer-plugin,
        [  --enable-mathml-viewer-plugin    Build MathML-Viewer plugin [default=no]],
        [ac_cv_enable_mathml_viewer_plugin=$enableval], [ac_cv_enable_mathml_viewer_plugin=yes])
 if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
-       PKG_CHECK_MODULES(GTK_MATH_VIEW, gtkmathview >= 0.4.2, :, $ac_cv_enable_mathml_viewer_plugin=no)
+       PKG_CHECK_MODULES(GTK_MATH_VIEW, gtkmathview >= 0.4.2, :, ac_cv_enable_mathml_viewer_plugin=no)
 
        if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
                AC_SUBST(GTK_MATH_VIEW_CFLAGS)
index 16b25d25a732ef40f41dfc5a8a1e36a414f5a929..58868df7d5c301027fb706263d2cc0daab087919 100644 (file)
@@ -213,20 +213,15 @@ EXTRA_DIST = \
 INCLUDES = \
        -Icommon \
        -Igtk \
-       -DG_LOG_DOMAIN=\"Sylpheed\" \
        -I$(top_srcdir)/intl \
-       $(ASPELL_CFLAGS) \
-       $(GTK_CFLAGS) \
-       $(GPGME_CFLAGS) \
-       $(OPENSSL_CFLAGS) \
        -I$(includedir)
 
 sylpheed_LDFLAGS = \
        -export-dynamic
 
 sylpheed_LDADD = \
-       $(ASPELL_LIBS) \
        gtk/libsylpheedgtk.la \
+       $(ASPELL_LIBS) \
        $(INTLLIBS) \
        $(GTK_LIBS) \
        $(GPGME_LIBS) \
@@ -235,10 +230,15 @@ sylpheed_LDADD = \
        $(LIBICONV)
 
 CPPFLAGS = \
+       -DG_LOG_DOMAIN=\"Sylpheed\" \
        -DLOCALEDIR=\""$(localedir)"\" \
        -DMANUALDIR=\""$(manualdir)"\" \
        -DFAQDIR=\""$(faqdir)"\" \
        -DTARGET_ALIAS=\""$(target_triplet)"\" \
        -DSYSCONFDIR=\""$(sysconfdir)"\"
+       $(ASPELL_CFLAGS) \
+       $(GTK_CFLAGS) \
+       $(GPGME_CFLAGS) \
+       $(OPENSSL_CFLAGS)
 
 YFLAGS = -d