Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : efm_nav
Dir : e_modules/efm_nav
Modified Files:
.cvsignore Makefile.am autogen.sh configure.in
Added Files:
ABOUT-NLS
Log Message:
Make configure.in like other modules.
Add NLS
===================================================================
RCS file: /cvs/e/e_modules/efm_nav/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- .cvsignore 15 Nov 2007 19:08:55 -0000 1.1
+++ .cvsignore 20 Nov 2007 06:48:54 -0000 1.2
@@ -6,6 +6,7 @@
config.h
config.h.in
config.log
+config.rpath
config.status
config.sub
configure
@@ -15,7 +16,9 @@
*.tar.gz
install-sh
libtool
-ltmain.sh
+m4
missing
+mkinstalldirs
module.desktop
+ltmain.sh
stamp-h1
===================================================================
RCS file: /cvs/e/e_modules/efm_nav/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 15 Nov 2007 19:27:02 -0000 1.2
+++ Makefile.am 20 Nov 2007 06:48:54 -0000 1.3
@@ -2,7 +2,7 @@
config.sub configure depcomp install-sh ltmain.sh \
missing module.desktop
-SUBDIRS = src
+SUBDIRS = src po
EDJE_FLAGS = -v \
-id $(top_srcdir)/images \
===================================================================
RCS file: /cvs/e/e_modules/efm_nav/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- autogen.sh 13 Nov 2007 20:39:53 -0000 1.1
+++ autogen.sh 20 Nov 2007 06:48:54 -0000 1.2
@@ -3,7 +3,10 @@
rm -rf autom4te.cache
rm -f aclocal.m4 ltmain.sh
-echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
+touch README
+
+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/efm_nav/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- configure.in 13 Nov 2007 20:39:53 -0000 1.1
+++ configure.in 20 Nov 2007 06:48:54 -0000 1.2
@@ -1,101 +1,52 @@
rm -f config.cache
+AC_INIT(efm_nav, 0.0.1, [EMAIL PROTECTED])
AC_PREREQ(2.59)
-AC_INIT([efm_nav], [0.0.1], [EMAIL PROTECTED])
AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE([1.8 foreign])
+AM_INIT_AUTOMAKE(1.8)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_PROG_CC
-AM_PROG_LIBTOOL
AC_HEADER_STDC
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+AC_PROG_LIBTOOL
+
+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")
-# 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
libraries destination")
- else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", "Package libraries
destination")
- fi
-else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", "Package 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
#
-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_PATH_PROG(E_CONFIG, "enlightenment-config", "", $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)
+
+datadir="${e_modules}/${PACKAGE}"
+AC_ARG_ENABLE(homedir-install,
+ AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]),
+ [ datadir="${HOME}/.e/e/modules/${PACKAGE}" ]
+)
AC_OUTPUT([
Makefile
src/Makefile
+po/Makefile.in
module.desktop
-],[])
+], [
+])
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
