[gmime: 3/4] minor fixups

[Jeffrey Stedfast <fejj src gnome org>]

commit 2f91a9dc1025928e5b0c1c8be1c245d9ef72443e
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Sat Apr 8 10:46:05 2017 -0400

    minor fixups

 configure.ac      |    5 ++++-
 gmime/Makefile.am |    3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b042e14..8b4d85a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -613,6 +613,9 @@ fi
 if test "x$GPGME_PTHREAD_LIBS" != "x"; then
        EXTRA_LIBS="$EXTRA_LIBS $GPGME_PTHREAD_LIBS"
 fi
+if test "x$LIBIDN_LIBS" != "x"; then
+       EXTRA_LIBS="$EXTRA_LIBS $LIBIDN_LIBS"
+fi
 
 CFLAGS="$CFLAGS -fno-strict-aliasing"
 LIBS="$LIBS $EXTRA_LIBS"
@@ -620,7 +623,7 @@ LIBS="$LIBS $EXTRA_LIBS"
 AC_SUBST(CFLAGS)
 AC_SUBST(LIBS)
 
-GMIME_CFLAGS="$LFS_CFLAGS $GPGME_PTHREAD_CFLAGS"
+GMIME_CFLAGS="$LFS_CFLAGS $GPGME_PTHREAD_CFLAGS $LIBIDN_CFLAGS"
 GMIME_LIBDIR="-L${libdir}"
 GMIME_INCLUDEDIR="-I${includedir}/gmime-$GMIME_API_VERSION"
 GMIME_LIBS_PRIVATE="$EXTRA_LIBS"
diff --git a/gmime/Makefile.am b/gmime/Makefile.am
index 6fc6daf..d9accb1 100644
--- a/gmime/Makefile.am
+++ b/gmime/Makefile.am
@@ -11,8 +11,7 @@ AM_CPPFLAGS =                                 \
        -I$(top_builddir)/util          \
        -DG_LOG_DOMAIN=\"gmime\"        \
        $(GMIME_CFLAGS)                 \
-       $(GLIB_CFLAGS)                  \
-       $(LIBIDN_CFLAGS)
+       $(GLIB_CFLAGS)
 
 noinst_PROGRAMS = gen-table charset-map