From 18d1bee562d0a346b963eca2ff51dcfe12dc47d4 Mon Sep 17 00:00:00 2001 From: handa Date: Mon, 26 Mar 2007 13:02:10 +0000 Subject: [PATCH] *** empty log message *** --- Makefile.am | 6 +++++- configure.ac | 6 ++++++ src/Makefile.am | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index d1b4128..ab79d15 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,6 +26,10 @@ SUBDIRS = intl src po EXTRA_DIST = m4/ChangeLog config.rpath mkinstalldirs \ - m17n-im-config.pc.in + m17n-im-config.pc.in bootstrap.sh + +pkgconfigdir = ${libdir}/pkgconfig + +pkgconfig_DATA = m17n-im-config.pc ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 8a68b53..ffe28ba 100644 --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,13 @@ AC_SUBST(M17NLIB_LDFLAGS) dnl Check for Gtk+ library. PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.4.0]) +AC_ARG_ENABLE(program, + AC_HELP_STRING([--enable-program], + [enable a standalone program (default is YES)])) +AM_CONDITIONAL(ENABLE_PROG, test x$enable_program != xno) + AC_CONFIG_FILES([Makefile intl/Makefile po/Makefile.in po/Makefile + m17n-im-config.pc src/Makefile ]) diff --git a/src/Makefile.am b/src/Makefile.am index 9edd512..e938300 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,9 @@ lib_LTLIBRARIES = libm17n-im-config.la libm17n_im_config_la_SOURCES = m17n-im-config.h mim-config.c libm17n_im_config_la_LIBADD = @GTK2_LIBS@ @M17NLIB_LIBS@ +if ENABLE_PROG bin_PROGRAMS = m17n-im-config m17n_im_config_SOURCES = m17n-im-config.h main.c m17n_im_config_LDADD = @GTK2_LIBS@ ${top_builddir}/src/libm17n-im-config.la +endif -- 1.7.10.4