Re: [Mlterm-dev-ja] mlconfig or mlterm-menu ?

[Nobuyoshi N. <nob...@so...>]

なかだです。

At Sat, 08 Mar 2003 18:16:57 +0900 (JST),
Tomohiro KUBOTA wrote:
> # mlconfig のコンパイルやインストールをする/しない、という configure
> # オプションって、ありましたっけ? --with-menu とは独立に、
> # --with-mlconfig (=true/false) というのを加えてもいいかもしれませんね。

それよりも、--with-contrib (=dir...)というのはどうでしょうか。
今はscrollbar/extraだけ特別扱いになってますが。


Index: configure.in
===================================================================
RCS file: /cvsroot/mlterm/mlterm/configure.in,v
retrieving revision 1.17
diff -u -2 -p -r1.17 configure.in
--- configure.in	8 Mar 2003 12:18:21 -0000	1.17
+++ configure.in	8 Mar 2003 13:21:02 -0000
@@ -177,11 +177,33 @@ fi
 AC_SUBST(GTK_CONFIG)
 
+
+contrib=contrib/scrollbar/extra
+test "${gtk_config}" = "yes" && contrib="$contrib contrib/tool/mlterm-menu"
+AC_ARG_WITH(contrib,
+	[  --with-contrib[=DIRS]   build contributed stuff[contrib/scrollbar/extra]],
+	[if test "$withval" = yes; then
+	  contrib=`cd $srcdir; find contrib -name Makefile.in | sed 's:/[[^/]]*$::'`
+	else
+	  contrib=`echo "$withval" | tr , ' '`
+	fi])
+
+makedirs=
+for m in $contrib; do
+	if test -f $srcdir/$m/configure; then
+		SUBDIRS="$SUBDIRS $m"
+	else
+		OUTPUT_FILES="$OUTPUT_FILES $m/Makefile"
+	fi
+	makedirs="${makedirs} $m"
+done
+MAKE_DIRS="${makedirs} ${MAKE_DIRS}"
+
 if test "${gtk_config}" = "yes" ; then
-	MAKE_DIRS="tool/mlconfig contrib/tool/mlterm-menu ${MAKE_DIRS}"
-	OUTPUT_FILES="tool/mlconfig/Makefile tool/mlconfig/po/Makefile.in contrib/tool/mlterm-menu/Makefile ${OUTPUT_FILES}"
+	MAKE_DIRS="tool/mlconfig ${MAKE_DIRS}"
+	OUTPUT_FILES="tool/mlconfig/Makefile tool/mlconfig/po/Makefile.in ${OUTPUT_FILES}"
 fi
 
-MAKE_DIRS="mlterm xwindow tool/mlclient man etc scrollbar/sample contrib/scrollbar/extra ${MAKE_DIRS}"
-OUTPUT_FILES="Makefile mlterm/Makefile xwindow/Makefile tool/mlclient/Makefile man/Makefile etc/Makefile scrollbar/sample/Makefile contrib/scrollbar/extra/Makefile ${OUTPUT_FILES}"
+MAKE_DIRS="mlterm xwindow tool/mlclient man etc scrollbar/sample ${MAKE_DIRS}"
+OUTPUT_FILES="Makefile mlterm/Makefile xwindow/Makefile tool/mlclient/Makefile man/Makefile etc/Makefile scrollbar/sample/Makefile ${OUTPUT_FILES}"
 
 AC_SUBST(MAKE_DIRS)
Index: contrib/tool/mlcc/Makefile.in
===================================================================
RCS file: /cvsroot/mlterm/mlterm/contrib/tool/mlcc/Makefile.in,v
retrieving revision 1.2
diff -u -2 -p -r1.2 Makefile.in
--- contrib/tool/mlcc/Makefile.in	15 Jun 2002 09:23:09 -0000	1.2
+++ contrib/tool/mlcc/Makefile.in	8 Mar 2003 12:58:27 -0000
@@ -2,4 +2,6 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
+SRCDIR = @srcdir@
+VPATH = $(SRCDIR)
 
 CC = @CC@
@@ -25,5 +27,5 @@ main.o: comm.h data.h
 
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+	$(CC) $(CFLAGS) -I. -I$(SRCDIR) -c $<
 
 clean:
@@ -31,8 +33,8 @@ clean:
 
 install:
-	$(INSTALL) -m 755 $(PROG) $(bindir)
+	$(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir)
 
 uninstall:
-	rm -f $(bindir)/$(PROG)
+	rm -f $(DESTDIR)$(bindir)/$(PROG)
 
 mostlyclean:
Index: contrib/tool/mlcc/comm.c
===================================================================
RCS file: /cvsroot/mlterm/mlterm/contrib/tool/mlcc/comm.c,v
retrieving revision 1.8
diff -u -2 -p -r1.8 comm.c
--- contrib/tool/mlcc/comm.c	14 Dec 2002 11:16:29 -0000	1.8
+++ contrib/tool/mlcc/comm.c	8 Mar 2003 12:58:27 -0000
@@ -217,4 +217,5 @@ void display_str(window_t *window, int x
 		break;
 	default:
+		break;
 	}
 }
@@ -249,4 +250,5 @@ void display_numeric(window_t *window, i
 		break;
 	case DC_NORMAL:
+		break;
 	}
 }


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦