diff -Nurd -x'*~' mlterm-2.9.4.orig/configure.in mlterm-2.9.4/configure.in --- mlterm-2.9.4.orig/configure.in 2007-11-30 04:30:02.000000000 -0500 +++ mlterm-2.9.4/configure.in 2013-07-29 14:39:55.000000000 -0400 @@ -31,6 +31,7 @@ dnl The ugly part should be replaced by: dnl AC_PATH_TOOL(PKG_CONFIG, pkg-config) +m4_ifdef([m4_pattern_allow], [m4_pattern_allow([PKG_CONFIG_.*])]) if test x"${build}" != x"${host}"; then AC_CHECK_TOOL(CC, gcc) AC_CHECK_TOOL(AR, ar) @@ -90,11 +91,8 @@ [ --enable-fribidi bidi[default=disabled]], fribidi=$enable_fribidi, fribidi="no") if test "$fribidi" = "yes" ; then - AC_CHECK_PROG(fribidi_config,fribidi-config,yes,fribidi="no") - if test "$fribidi_config" = "yes" ; then - FRIBIDI_CFLAGS="`fribidi-config --cflags` -DUSE_FRIBIDI" - FRIBIDI_LIBS="`fribidi-config --libs`" - fi + PKG_CHECK_MODULES(FRIBIDI, fribidi) + FRIBIDI_CFLAGS="${FRIBIDI_CFLAGS} -DUSE_FRIBIDI" fi AC_SUBST(FRIBIDI_CFLAGS) AC_SUBST(FRIBIDI_LIBS) diff -Nurd -x'*~' mlterm-2.9.4.orig/contrib/scrollbar/extra/Makefile.in mlterm-2.9.4/contrib/scrollbar/extra/Makefile.in --- mlterm-2.9.4.orig/contrib/scrollbar/extra/Makefile.in 2005-03-13 11:07:47.000000000 -0500 +++ mlterm-2.9.4/contrib/scrollbar/extra/Makefile.in 2013-07-29 13:41:16.000000000 -0400 @@ -15,7 +15,7 @@ MOZMODERN_OBJ = mozmodern.o NEXT_OBJ = next.o -CFLAGS = $(CFLAGS_LOCAL) -I$(top_srcdir)/xwindow @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ -I/usr/include/include +CFLAGS = -I$(top_srcdir)/xwindow $(CFLAGS_LOCAL) @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ CC = @CC@ INSTALL = @INSTALL@ diff -Nurd -x'*~' mlterm-2.9.4.orig/contrib/scrollbar/pixmap_engine/Makefile.in mlterm-2.9.4/contrib/scrollbar/pixmap_engine/Makefile.in --- mlterm-2.9.4.orig/contrib/scrollbar/pixmap_engine/Makefile.in 2005-03-13 11:07:48.000000000 -0500 +++ mlterm-2.9.4/contrib/scrollbar/pixmap_engine/Makefile.in 2013-07-29 13:41:07.000000000 -0400 @@ -15,7 +15,7 @@ SAMPLES = sample3 PIXMAP_ENGINE_OBJ = pixmap_engine.o -CFLAGS = $(CFLAGS_LOCAL) -I$(top_srcdir)/xwindow @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ -I/usr/include/include +CFLAGS = -I$(top_srcdir)/xwindow $(CFLAGS_LOCAL) @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ CC = @CC@ INSTALL = @INSTALL@ diff -Nurd -x'*~' mlterm-2.9.4.orig/dummy-package.txt mlterm-2.9.4/dummy-package.txt --- mlterm-2.9.4.orig/dummy-package.txt 1969-12-31 19:00:00.000000000 -0500 +++ mlterm-2.9.4/dummy-package.txt 2013-07-29 13:34:19.000000000 -0400 @@ -0,0 +1,2 @@ +The mlterm-shlibs package is merged into mlterm. +You may remove this dummy package safely. diff -Nurd -x'*~' mlterm-2.9.4.orig/inputmethod/iiimf/Makefile.in mlterm-2.9.4/inputmethod/iiimf/Makefile.in --- mlterm-2.9.4.orig/inputmethod/iiimf/Makefile.in 2005-10-04 13:25:07.000000000 -0400 +++ mlterm-2.9.4/inputmethod/iiimf/Makefile.in 2013-07-29 13:39:47.000000000 -0400 @@ -12,7 +12,9 @@ IM_IIIMF_OBJ = im_iiimf.o im_iiimf_aux.o keymap.o -CFLAGS = $(CFLAGS_LOCAL) \ +CFLAGS = -I$(top_srcdir)/mlterm \ + -I${top_srcdir}/xwindow \ + $(CFLAGS_LOCAL) \ @KIK_CFLAGS@ \ @MKF_CFLAGS@ \ @DEB_CFLAGS@ \ @@ -20,10 +22,7 @@ @CFLAGS@ \ @CPPFLAGS@ \ @IM_CFLAGS@ \ - @IIIMF_CFLAGS@ \ - -I$(top_srcdir)/mlterm \ - -I${top_srcdir}/xwindow \ - -I/usr/local/include + @IIIMF_CFLAGS@ LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @MKF_LIBS_FOR_MODULE@ @IIIMF_LIBS@ diff -Nurd -x'*~' mlterm-2.9.4.orig/inputmethod/kbd/Makefile.in mlterm-2.9.4/inputmethod/kbd/Makefile.in --- mlterm-2.9.4.orig/inputmethod/kbd/Makefile.in 2005-03-13 11:07:48.000000000 -0500 +++ mlterm-2.9.4/inputmethod/kbd/Makefile.in 2013-07-29 13:39:37.000000000 -0400 @@ -12,16 +12,15 @@ IM_KBD_OBJ = im_kbd.o -CFLAGS = $(CFLAGS_LOCAL) \ +CFLAGS = -I$(top_srcdir)/mlterm \ + -I${top_srcdir}/xwindow \ + $(CFLAGS_LOCAL) \ @KIK_CFLAGS@ \ @MKF_CFLAGS@ \ @DEB_CFLAGS@ \ @X_CFLAGS@ \ @CFLAGS@ \ - @CPPFLAGS@ \ - -I$(top_srcdir)/mlterm \ - -I${top_srcdir}/xwindow \ - -I/usr/local/include + @CPPFLAGS@ LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @MKF_LIBS_FOR_MODULE@ diff -Nurd -x'*~' mlterm-2.9.4.orig/inputmethod/m17nlib/Makefile.in mlterm-2.9.4/inputmethod/m17nlib/Makefile.in --- mlterm-2.9.4.orig/inputmethod/m17nlib/Makefile.in 2005-03-13 11:07:48.000000000 -0500 +++ mlterm-2.9.4/inputmethod/m17nlib/Makefile.in 2013-07-29 13:39:26.000000000 -0400 @@ -12,7 +12,9 @@ IM_M17NLIB_OBJ = im_m17nlib.o -CFLAGS = $(CFLAGS_LOCAL) \ +CFLAGS = -I$(top_srcdir)/mlterm \ + -I${top_srcdir}/xwindow \ + $(CFLAGS_LOCAL) \ @KIK_CFLAGS@ \ @MKF_CFLAGS@ \ @DEB_CFLAGS@ \ @@ -20,10 +22,7 @@ @CFLAGS@ \ @CPPFLAGS@ \ @IM_CFLAGS@ \ - @M17NLIB_CFLAGS@ \ - -I$(top_srcdir)/mlterm \ - -I${top_srcdir}/xwindow \ - -I/usr/local/include + @M17NLIB_CFLAGS@ LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @M17NLIB_LIBS@ diff -Nurd -x'*~' mlterm-2.9.4.orig/inputmethod/scim/Makefile.in mlterm-2.9.4/inputmethod/scim/Makefile.in --- mlterm-2.9.4.orig/inputmethod/scim/Makefile.in 2005-03-13 11:07:49.000000000 -0500 +++ mlterm-2.9.4/inputmethod/scim/Makefile.in 2013-07-29 13:38:35.000000000 -0400 @@ -12,7 +12,9 @@ IM_SCIM_OBJ = im_scim_mod_if.o im_scim_@SCIM_VERSION@.o -CFLAGS = $(CFLAGS_LOCAL) \ +CFLAGS = -I$(top_srcdir)/mlterm \ + -I${top_srcdir}/xwindow \ + $(CFLAGS_LOCAL) \ @DEB_CFLAGS@ \ @KIK_CFLAGS@ \ @MKF_CFLAGS@ \ @@ -21,10 +23,7 @@ @CPPFLAGS@ \ @CXXFLAGS@ \ @IM_CFLAGS@ \ - @SCIM_CFLAGS@ \ - -I$(top_srcdir)/mlterm \ - -I${top_srcdir}/xwindow \ - -I/usr/local/include + @SCIM_CFLAGS@ LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @SCIM_LIBS@ diff -Nurd -x'*~' mlterm-2.9.4.orig/inputmethod/uim/Makefile.in mlterm-2.9.4/inputmethod/uim/Makefile.in --- mlterm-2.9.4.orig/inputmethod/uim/Makefile.in 2005-03-13 11:07:49.000000000 -0500 +++ mlterm-2.9.4/inputmethod/uim/Makefile.in 2013-07-29 13:37:55.000000000 -0400 @@ -12,7 +12,9 @@ IM_UIM_OBJ = im_uim.o -CFLAGS = $(CFLAGS_LOCAL) \ +CFLAGS = -I$(top_srcdir)/mlterm \ + -I${top_srcdir}/xwindow \ + $(CFLAGS_LOCAL) \ @KIK_CFLAGS@ \ @MKF_CFLAGS@ \ @DEB_CFLAGS@ \ @@ -20,10 +22,7 @@ @CFLAGS@ \ @CPPFLAGS@ \ @IM_CFLAGS@ \ - @UIM_CFLAGS@ \ - -I$(top_srcdir)/mlterm \ - -I${top_srcdir}/xwindow \ - -I/usr/local/include + @UIM_CFLAGS@ LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @UIM_LIBS@ diff -Nurd -x'*~' mlterm-2.9.4.orig/kiklib/configure.in mlterm-2.9.4/kiklib/configure.in --- mlterm-2.9.4.orig/kiklib/configure.in 2006-10-20 05:04:01.000000000 -0400 +++ mlterm-2.9.4/kiklib/configure.in 2013-07-29 13:34:19.000000000 -0400 @@ -251,7 +251,6 @@ else AC_CHECK_FUNC( posix_openpt, [ - AC_DEFINE(HAVE_POSIX_OPENPT,,"HAVE_POSIX_OPENPT") kik_cv_pty=streams ], [ if test -c /dev/ptmx ; then @@ -263,6 +262,9 @@ AC_MSG_RESULT($kik_cv_pty) PTY_NAME="${kik_cv_pty}" AC_SUBST(PTY_NAME) +if test "x$ac_cv_func_posix_openpt" = xyes; then + AC_DEFINE(HAVE_POSIX_OPENPT,,"HAVE_POSIX_OPENPT") +fi # diff -Nurd -x'*~' mlterm-2.9.4.orig/kiklib/src/Makefile.in mlterm-2.9.4/kiklib/src/Makefile.in --- mlterm-2.9.4.orig/kiklib/src/Makefile.in 2006-10-19 10:41:51.000000000 -0400 +++ mlterm-2.9.4/kiklib/src/Makefile.in 2013-07-29 14:03:06.000000000 -0400 @@ -28,7 +28,7 @@ INC = $(COMOBJ:.o=.h) kik_list.h kik_iterator.h kik_types.h kik_util.h kik_def.h kik_net.h kik_pty.h kik_utmp.h kik_dlfcn.h -LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) -I. $(CFLAGS) LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LIBS) LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) @@ -78,7 +78,7 @@ .SUFFIXES: .c.o .c.o: - $(LIBTOOL_CC) -I. -c $< + $(LIBTOOL_CC) -c $< $(LIBNAME).la : $(OBJ) $(LIBTOOL_LINK) -o $(LIBNAME).la $(OBJ:.o=.lo) -rpath $(libdir) \ diff -Nurd -x'*~' mlterm-2.9.4.orig/kiklib/src/kik_pty_streams.c mlterm-2.9.4/kiklib/src/kik_pty_streams.c --- mlterm-2.9.4.orig/kiklib/src/kik_pty_streams.c 2006-10-19 10:41:51.000000000 -0400 +++ mlterm-2.9.4/kiklib/src/kik_pty_streams.c 2013-07-29 13:34:19.000000000 -0400 @@ -2,6 +2,9 @@ * $Id: kik_pty_streams.c,v 1.21 2006/10/19 14:41:51 h_minami Exp $ */ +#if defined(__APPLE__) && defined(__MACH__) /* MacOS X */ +# define _APPLE_C_SOURCE +#else /* ptsname/grantpt/unlockpt are not available without _XOPEN_SOURCE * on GNU libc based systems. (It may have some ill side-effect though) */ #define _XOPEN_SOURCE 500 @@ -12,6 +15,7 @@ /* for solaris */ #define __EXTENSIONS__ +#endif /* not MacOS X */ #include "kik_pty.h" @@ -245,6 +249,12 @@ } #endif /*TIOCNOTTY*/ #endif /*HAVE_SETSID*/ +#ifdef TIOCSCTTY /* BSD (in addition Linux also knows TIOCSCTTY) */ + if(ioctl(*slave, TIOCSCTTY, NULL) < 0) + { + return -1 ; + } +#else /* no TIOCSCTTY (SysV) */ fd = open("/dev/tty", O_RDWR | O_NOCTTY); if (fd >= 0) { @@ -261,6 +271,7 @@ return -1; } close(fd); +#endif /* no TIOCSCTTY (SysV) */ dup2( *slave , 0) ; dup2( *slave , 1) ; diff -Nurd -x'*~' mlterm-2.9.4.orig/scrollbar/sample/Makefile.in mlterm-2.9.4/scrollbar/sample/Makefile.in --- mlterm-2.9.4.orig/scrollbar/sample/Makefile.in 2004-02-16 10:02:00.000000000 -0500 +++ mlterm-2.9.4/scrollbar/sample/Makefile.in 2013-07-29 13:37:11.000000000 -0400 @@ -12,7 +12,7 @@ SAMPLE_OBJ = x_sample_sb_view.o x_transparent_sample_sb_view.o x_sample_sb_view_lib.o SAMPLE2_OBJ = x_sample2_sb_view.o x_transparent_sample2_sb_view.o x_sample_sb_view_lib.o -CFLAGS = $(CFLAGS_LOCAL) -I$(top_srcdir)/xwindow @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ -I/usr/include/include +CFLAGS = -I$(top_srcdir)/xwindow $(CFLAGS_LOCAL) @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ CC = @CC@ INSTALL = @INSTALL@ diff -Nurd -x'*~' mlterm-2.9.4.orig/tool/mlconfig/Makefile.in mlterm-2.9.4/tool/mlconfig/Makefile.in --- mlterm-2.9.4.orig/tool/mlconfig/Makefile.in 2005-01-15 18:55:48.000000000 -0500 +++ mlterm-2.9.4/tool/mlconfig/Makefile.in 2013-07-29 13:59:01.000000000 -0400 @@ -25,13 +25,13 @@ LMKF = @MKF_LIBS@ GTK_CONFIG=@GTK_CONFIG@ -CFLAGS = `$(GTK_CONFIG) --cflags` $(CFLAGS_LOCAL) \ - @FRIBIDI_CFLAGS@ @IND_CFLAGS@ @AA_CFLAGS@ @IMAGELIB_CFLAGS@ \ - @DEB_CFLAGS@ @KIK_CFLAGS@ @MKF_CFLAGS@ @CFLAGS@ @CPPFLAGS@ \ - -I${top_srcdir}/xwindow -I${top_srcdir}/mlterm \ +CFLAGS= -I${top_srcdir}/xwindow -I${top_srcdir}/mlterm \ -I${top_builddir}/common -I${top_srcdir}/common \ -I${top_srcdir}/inputmethod \ - -I/usr/local/include \ + `$(GTK_CONFIG) --cflags` $(CFLAGS_LOCAL) \ + @KIK_CFLAGS@ @MKF_CFLAGS@ \ + @FRIBIDI_CFLAGS@ @IND_CFLAGS@ @AA_CFLAGS@ @IMAGELIB_CFLAGS@ \ + @DEB_CFLAGS@ @CFLAGS@ @CPPFLAGS@ \ -DSYSCONFDIR=\"$(SYSCONFDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" \ -DDATADIR=\"$(DATADIR)\" -DLIBDIR=\"$(LIBDIR)\" LIBS = @INTL_LIBS@ @DL_SELF@ @DL_LIBS_IM@ `$(GTK_CONFIG) --libs` $(LIBS_LOCAL) \ diff -Nurd -x'*~' mlterm-2.9.4.orig/tool/mlconfig/po/Makefile.in.in mlterm-2.9.4/tool/mlconfig/po/Makefile.in.in --- mlterm-2.9.4.orig/tool/mlconfig/po/Makefile.in.in 2003-01-12 05:08:51.000000000 -0500 +++ mlterm-2.9.4/tool/mlconfig/po/Makefile.in.in 2013-07-29 13:34:19.000000000 -0400 @@ -26,8 +26,7 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` +mkinstalldirs = $(top_srcdir)/script/install-sh -d GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ diff -Nurd -x'*~' mlterm-2.9.4.orig/xwindow/Makefile.in mlterm-2.9.4/xwindow/Makefile.in --- mlterm-2.9.4.orig/xwindow/Makefile.in 2005-01-13 12:19:37.000000000 -0500 +++ mlterm-2.9.4/xwindow/Makefile.in 2013-07-29 13:58:14.000000000 -0400 @@ -35,12 +35,12 @@ LKIK_DEB = -lkik_deb LMKF_DEB = -lmkf_deb -CFLAGS=$(CFLAGS_LOCAL) @AA_CFLAGS@ @KIK_CFLAGS@ @MKF_CFLAGS@ @DEB_CFLAGS@ \ +CFLAGS= -I$(top_srcdir)/mlterm -I${top_builddir}/xwindow \ + $(CFLAGS_LOCAL) @KIK_CFLAGS@ @MKF_CFLAGS@ @AA_CFLAGS@ @DEB_CFLAGS@ \ @FRIBIDI_CFLAGS@ @IND_CFLAGS@ @IMAGELIB_CFLAGS@ @X_CFLAGS@ \ @XUTF8_CFLAGS@ @DND_CFLAGS@ @IM_CFLAGS@ @CFLAGS@ @CPPFLAGS@ \ -DLIBDIR=\"$(LIBDIR)\" -DSYSCONFDIR=\"$(SYSCONFDIR)\" \ -DLIBEXECDIR=\"$(LIBEXECDIR)\" -DDATADIR=\"$(DATADIR)\"\ - -I$(top_srcdir)/mlterm -I${top_builddir}/xwindow -I/usr/local/include LIBS=$(LIBS_LOCAL) @IND_LIBS@ @FRIBIDI_LIBS@ @IMAGELIB_LIBS@ @AA_LIBS@ \ @DL_LIBS_IM@ @DL_LIBS_SB@ \