From 30e2458ebde96916bbf7406b48f2cb474b1543fd Mon Sep 17 00:00:00 2001
From: Shoichi Tamuki <tamuki@linet.gr.jp>
Date: Tue, 6 Dec 2011 11:30:14 +0000
Subject: [PATCH] In the case of --enable-dynamic=emacs,alsaseq, make install
 timidity.el and enable the long option of ALSA sequencer interface,
 respectively

---
 ChangeLog    |  4 ++++
 configure    | 29 +++++++++++++++++++++++++----
 configure.in |  9 ++++++---
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9ecb0b62..8e48d224 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 	  interface/timidity.pel: Set the absolute path of timidity
 	  in timidity.el automatically; add timidity.pel file to be
 	  preprocessed, and remove timidity.el
+	* configure.in: In the case of --enable-dynamic=emacs and
+	  --enable-dynamic=alsaseq, make install timidity.el and
+	  enable the long option of ALSA sequencer interface,
+	  respectively (in addition, autoreconf)
 
 2011-12-05  Hans de Goede <hdegoede@redhat.com>
 
diff --git a/configure b/configure
index 88700bd0..f37c5363 100755
--- a/configure
+++ b/configure
@@ -17934,7 +17934,17 @@ fi
   ;;
 xdynamic)
   dynamic_targets="$dynamic_targets if_emacs.\$(so)"
-   ELFILES="$ELFILES timidity.el"
+
+
+if true; then
+  ENABLE_EMACS_TRUE=
+  ENABLE_EMACS_FALSE='#'
+else
+  ENABLE_EMACS_TRUE='#'
+  ENABLE_EMACS_FALSE=
+fi
+
+    ELFILES="$ELFILES timidity.el"
   ;;
 *)
 
@@ -19057,7 +19067,8 @@ fi
 # Check whether --enable-alsaseq or --disable-alsaseq was given.
 if test "${enable_alsaseq+set}" = set; then
   enableval="$enable_alsaseq"
-  case "x$enable_alsaseq" in xyes|xdynamic)  ;; esac
+  case "x$enable_alsaseq" in xyes|xdynamic)  INTERFACE_SRCS="$INTERFACE_SRCS alsaseq_c.c"
+   ;; esac
 fi;
 case "x$enable_alsaseq" in
 xyes)
@@ -19075,8 +19086,7 @@ else
   ENABLE_ALSASEQ_FALSE=
 fi
 
-   INTERFACE_SRCS="$INTERFACE_SRCS alsaseq_c.c"
-    alsa_save_CFLAGS="$CFLAGS"
+   alsa_save_CFLAGS="$CFLAGS"
 alsa_save_LDFLAGS="$LDFLAGS"
 alsa_save_LIBS="$LIBS"
 alsa_found=yes
@@ -19426,6 +19436,10 @@ fi
   ;;
 xdynamic)
   dynamic_targets="$dynamic_targets if_alsaseq.\$(so)"
+   cat >> confdefs.h <<EOF
+#define IA_ALSASEQ 1
+EOF
+
 
   ;;
 *)
@@ -20974,6 +20988,13 @@ echo "$as_me: error: conditional \"ENABLE_EMACS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${ENABLE_EMACS_TRUE}" && test -z "${ENABLE_EMACS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_EMACS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"ENABLE_EMACS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${ENABLE_VT100_TRUE}" && test -z "${ENABLE_VT100_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"ENABLE_VT100\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
diff --git a/configure.in b/configure.in
index 3883cf86..1551be80 100644
--- a/configure.in
+++ b/configure.in
@@ -1823,7 +1823,8 @@ CONFIG_INTERFACE(emacs,EMACS,e,
   [ ELFILES="$ELFILES timidity.el"
     INTERFACE_SRCS="$INTERFACE_SRCS emacs_c.c"
   ],
-  [ ELFILES="$ELFILES timidity.el" ])
+  [ AM_CONDITIONAL(ENABLE_EMACS, true)
+    ELFILES="$ELFILES timidity.el" ])
 
 dnl VT100
 AM_CONDITIONAL(ENABLE_VT100, false)
@@ -1943,9 +1944,11 @@ AM_CONDITIONAL(ENABLE_ALSASEQ, false)
 CONFIG_INTERFACE(alsaseq,ALSASEQ,A,
   [  --enable-alsaseq        Enable ALSA sequencer server interface
                                                           (default is no)],
-  ,
   [ INTERFACE_SRCS="$INTERFACE_SRCS alsaseq_c.c"
-    AM_PATH_ALSA
+  ],
+  [ AM_PATH_ALSA
+  ],
+  [ MY_DEFINE(IA_ALSASEQ)
   ])
 
 dnl TiMidity Windows synthesizer server
-- 
2.11.0