Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : news
Dir : e_modules/news
Modified Files:
Makefile.am autogen.sh configure.in
Log Message:
NLS
===================================================================
RCS file: /cvs/e/e_modules/news/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 7 Nov 2007 19:08:02 -0000 1.3
+++ Makefile.am 12 Nov 2007 17:32:25 -0000 1.4
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = src data
+SUBDIRS = src data po
filesdir = $(datadir)
files_DATA = module.desktop
===================================================================
RCS file: /cvs/e/e_modules/news/autogen.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- autogen.sh 12 Nov 2007 03:51:30 -0000 1.4
+++ autogen.sh 12 Nov 2007 17:32:26 -0000 1.5
@@ -3,7 +3,8 @@
rm -rf autom4te.cache
rm -f aclocal.m4 ltmain.sh
-echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
+echo "Running autopoint..." ; autopoint -f || :
+echo "Running aclocal..." ; aclocal -I m4 $ACLOCAL_FLAGS || exit 1
echo "Running autoheader..." ; autoheader || exit 1
echo "Running autoconf..." ; autoconf || exit 1
echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize
--automake) || exit 1
===================================================================
RCS file: /cvs/e/e_modules/news/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- configure.in 12 Nov 2007 04:40:54 -0000 1.5
+++ configure.in 12 Nov 2007 17:32:26 -0000 1.6
@@ -3,104 +3,61 @@
# get rid of that stupid cache mechanism
rm -f config.cache
+AC_INIT(news, 0.1.0, [EMAIL PROTECTED])
AC_PREREQ(2.59)
-AC_INIT([news], [0.1.0], [EMAIL PROTECTED])
-AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.8 foreign])
-
+AC_CONFIG_SRCDIR(configure.in)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
+AC_ISC_POSIX
+
+AM_INIT_AUTOMAKE(1.6)
+AM_CONFIG_HEADER(config.h)
AC_PROG_CC
-AM_PROG_LIBTOOL
+AM_PROG_CC_STDC
AC_HEADER_STDC
+AC_C_CONST
+
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+AC_PROG_LIBTOOL
-ALL_LINGUAS="fi it ja ru sv"
-AC_SUBST(ALL_LINGUAS)
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION(0.14)
MODULE_ARCH="$host_os-$host_cpu"
AC_SUBST(MODULE_ARCH)
AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
AC_DEFINE_UNQUOTED(MODULE_VERSION, "0.1.0", "Module version")
-# Check Library Directory
-if test "x${libdir}" = 'x${exec_prefix}/lib'; then
- if test "x${exec_prefix}" = "xNONE"; then
- if test "x${prefix}" = "xNONE"; then
- libdir="${ac_default_prefix}/lib";
- else
- libdir="${prefix}/lib";
- fi
- else
- if test "x${prefix}" = "xNONE"; then
- libdir="${ac_default_prefix}/lib";
- else
- libdir="${prefix}/lib";
- fi
- fi
-fi
-
-#
-# Set Library Directory in config.h
-#
-if test "x${libdir}" = 'xNONE'; then
- if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", "Package
installed libraries destination")
- else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", "Package installed
libraries destination")
- fi
-else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", "Package installed
libraries destination")
-fi
-
-#
-# Set Data Directory in config.h
-#
-if test "x${prefix}" = "xNONE"; then
- datadir="${HOME}/.e/e/modules/${PACKAGE}"
-else
- datadir="${libdir}/enlightenment/modules/${PACKAGE}"
-fi
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", "Package data destination")
-
-#
-# Set Data Root and Locale Directory in config.h
-#
-AC_PREFIX_DEFAULT(${HOME}/.e/e)
-if test "x$prefix" = "xNONE"; then
- datarootdir=${ac_default_prefix}
-else
- datarootdir=${prefix}/share
-fi
-localedir=${datarootdir}/locale
-AC_SUBST(LOCALEDIR, "${localedir}")
-AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", "Module Locale Directory")
-
-#
-# Check EFL Libs
-#
-PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
-AC_PATH_PROG(EDJE_CC, "edje_cc", "", $PATH)
-
-#
-# Check Enlightenment
-#
+edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc"
+AC_ARG_WITH(edje-cc,
+ AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]),
+ [
+ edje_cc=$withval;
+ echo " Enlightenment edje_cc explicitly set to "$edje_cc;
+ ]
+)
+AC_SUBST(edje_cc)
+
AC_ARG_WITH(enlightenment-config,
-[ --with-enlightenment-config=E_CONFIG use enlightenment-config specified
],
-[
- E_CONFIG=$withval;
- echo "using "$E_CONFIG" for enlightenment-config";
-],[
- PROG="enlightenment-config";
- AC_PATH_PROG(E_CONFIG, $PROG, "", $PATH)
-])
+ AC_HELP_STRING([--with-enlightenment-config=E_CONFIG], [use
enlightenment-config specified]),
+ [
+ E_CONFIG=$withval;
+ echo "using "$E_CONFIG" for enlightenment-config";
+ ], [
+ PROG="enlightenment-config";
+ AC_PATH_PROG(E_CONFIG, $PROG, "", $PATH)
+ ]
+)
e_cflags=`$E_CONFIG --cflags`
e_libs=`$E_CONFIG --libs`
e_modules=`$E_CONFIG --module-dir`
AC_SUBST(e_cflags)
AC_SUBST(e_libs)
-AC_SUBST(e_modules)
+
+dnl TODO: Fix better install for homedir
+datadir="${e_modules}/${PACKAGE}"
AC_OUTPUT([
e_modules-news.spec
@@ -112,6 +69,7 @@
data/theme/Makefile
src/Makefile
src/module/Makefile
-],[
+po/Makefile.in
+], [
])
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
