Enlightenment CVS committal
Author : andreas99
Project : e16
Module : tools
Dir : e16/tools/e16menuedit2
Modified Files:
Makefile.am autogen.sh configure.in e16menuedit2.prj
Removed Files:
ABOUT-NLS acinclude.m4 setup-gettext
Log Message:
much work on autotools files. Should work now.
testet currently in Gentoo and Debian
still some finetuning to do...
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 3 Aug 2004 15:54:13 -0000 1.6
+++ Makefile.am 4 Aug 2004 23:03:49 -0000 1.7
@@ -1,30 +1,28 @@
## Process this file with automake to produce Makefile.in
-## Created by Anjuta - will be overwritten
-## If you don't want it to overwrite it,
-## Please disable it in the Anjuta project configuration
-SUBDIRS = po src pixmaps
+SUBDIRS = src po pixmaps
-e16menuedit2docdir = ${prefix}/doc/e16menuedit2
+e16menuedit2docdir = ${PACKAGE_DOC_DIR}
e16menuedit2doc_DATA = \
- README\
- COPYING\
- AUTHORS\
- ChangeLog\
- INSTALL\
- NEWS\
- TODO\
- ABOUT-NLS
-
-EXTRA_DIST = $(e16menuedit2doc_DATA) e16menuedit2.glade
-
-# Copy all the spec files. Of cource, only one is actually used.
-dist-hook:
- for specfile in *.spec; do \
- if test -f $$specfile; then \
- cp -p $$specfile $(distdir); \
- fi \
- done
+ README\
+ COPYING\
+ AUTHORS\
+ ChangeLog\
+ INSTALL\
+ NEWS\
+ TODO
+
+GLADE_FILES = e16menuedit2.glade
+
+e16menuedit2datadir = ${PACKAGE_DATA_DIR}/${PACKAGE}/glade
+e16menuedit2data_DATA = \
+ $(GLADE_FILES)
+
+INTLTOOL_DIST = intltool-extract.in \
+ intltool-merge.in \
+ intltool-update.in
+
+EXTRA_DIST = $(INTLTOOL_DIST) \
+ $(GLADE_FILES)
-ACLOCAL_AMFLAGS = -I m4
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/autogen.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- autogen.sh 2 Aug 2004 23:18:14 -0000 1.8
+++ autogen.sh 4 Aug 2004 23:03:49 -0000 1.9
@@ -2,24 +2,76 @@
# Run this to generate all the initial makefiles, etc.
srcdir=`dirname $0`
-PKG_NAME="the package."
-CONFIGURE="configure.in"
+test -z "$srcdir" && srcdir=.
+CONFIGURE=configure.in
DIE=0
+if [ -n "$GNOME2_DIR" ]; then
+ ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
+ LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"
+ PATH="$GNOME2_DIR/bin:$PATH"
+ export PATH
+ export LD_LIBRARY_PATH
+fi
+
+(test -f $srcdir/$CONFIGURE) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level package directory"
+ exit 1
+}
+
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
echo
- echo "**Error**: You must have \`autoconf' installed to."
+ echo "**Error**: You must have \`autoconf' installed."
echo "Download the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/";
DIE=1
}
+(grep "^AC_PROG_INTLTOOL" $srcdir/$CONFIGURE >/dev/null) && {
+ (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`intltool' installed."
+ echo "You can get it from:"
+ echo " ftp://ftp.gnome.org/pub/GNOME/";
+ DIE=1
+ }
+}
+
+(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/$CONFIGURE >/dev/null) && {
+ (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`xml-i18n-toolize' installed."
+ echo "You can get it from:"
+ echo " ftp://ftp.gnome.org/pub/GNOME/";
+ DIE=1
+ }
+}
+
+(grep "^AM_PROG_LIBTOOL" $srcdir/$CONFIGURE >/dev/null) && {
+ (libtool --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`libtool' installed."
+ echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/";
+ DIE=1
+ }
+}
+
+(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/$CONFIGURE >/dev/null) && {
+ (grep "sed.*POTFILES" $srcdir/$CONFIGURE) > /dev/null || \
+ (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`glib' installed."
+ echo "You can get it from: ftp://ftp.gtk.org/pub/gtk";
+ DIE=1
+ }
+}
+
(automake --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`automake' installed."
- echo "Get ftp://ftp.gnu.org/pub/gnu/";
- echo "(or a newer version if it is available)"
+ echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/";
DIE=1
NO_AUTOMAKE=yes
}
@@ -30,8 +82,7 @@
echo
echo "**Error**: Missing \`aclocal'. The version of \`automake'"
echo "installed doesn't appear recent enough."
- echo "Get ftp://ftp.gnu.org/pub/gnu/";
- echo "(or a newer version if it is available)"
+ echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/";
DIE=1
}
@@ -51,52 +102,39 @@
am_opt=--include-deps;;
esac
-for coin in `find $srcdir -name $CONFIGURE -print`
+for coin in `find $srcdir -path $srcdir/CVS -prune -o -name $CONFIGURE -print`
do
dr=`dirname $coin`
if test -f $dr/NO-AUTO-GEN; then
echo skipping $dr -- flagged as no auto-gen
else
echo processing $dr
- macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
( cd $dr
- aclocalinclude="$ACLOCAL_FLAGS"
- for k in $macrodirs; do
- if test -d $k; then
- aclocalinclude="$aclocalinclude -I $k"
- ##else
- ## echo "**Warning**: No such directory \`$k'. Ignored."
- fi
- done
-
- if grep "^AM_GNU_GETTEXT" $CONFIGURE >/dev/null; then
- if grep "sed.*POTFILES" $CONFIGURE >/dev/null; then
- : do nothing -- we still have an old unmodified $CONFIGURE
- else
- echo "Creating $dr/aclocal.m4 ..."
- test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
- echo "Running gettextize... Ignore non-fatal messages."
- ./setup-gettext
- echo "Making $dr/aclocal.m4 writable ..."
- test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
- fi
- fi
- (grep "^AC_PROG_INTLTOOL" $CONFIGURE >/dev/null) && {
- (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`intltoolize' installed" \
- "to compile $PKG_NAME."
- DIE=1
- }
- }
+ aclocalinclude="$ACLOCAL_FLAGS"
+ if grep "^AM_GLIB_GNU_GETTEXT" $CONFIGURE >/dev/null; then
+ echo "Creating $dr/aclocal.m4 ..."
+ test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
+ echo "Running glib-gettextize... Ignore non-fatal messages."
+ echo "no" | glib-gettextize --force --copy
+ echo "Making $dr/aclocal.m4 writable ..."
+ test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
+ fi
if grep "^AC_PROG_INTLTOOL" $CONFIGURE >/dev/null; then
- echo "Running intltoolize..."
- intltoolize --copy --force --automake
+ echo "Running intltoolize..."
+ intltoolize --copy --force --automake
+ fi
+ if grep "^AM_PROG_XML_I18N_TOOLS" $CONFIGURE >/dev/null; then
+ echo "Running xml-i18n-toolize..."
+ xml-i18n-toolize --copy --force --automake
+ fi
+ if grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null; then
+ if test -z "$NO_LIBTOOLIZE" ; then
+ echo "Running libtoolize..."
+ libtoolize --force --copy
+ fi
fi
-
- test -d m4 && aclocalinclude="$aclocalinclude -I m4"
echo "Running aclocal $aclocalinclude ..."
aclocal $aclocalinclude
if grep "^AM_CONFIG_HEADER" $CONFIGURE >/dev/null; then
@@ -111,12 +149,12 @@
fi
done
-#conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
+conf_flags="--enable-maintainer-mode"
if test x$NOCONFIGURE = x; then
echo Running $srcdir/configure $conf_flags "$@" ...
$srcdir/configure $conf_flags "$@" \
- && echo Now type \`make\' to compile $PKG_NAME
+ && echo Now type \`make\' to compile. || exit 1
else
echo Skipping configure process.
fi
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- configure.in 3 Aug 2004 15:54:13 -0000 1.10
+++ configure.in 4 Aug 2004 23:03:49 -0000 1.11
@@ -1,45 +1,29 @@
dnl Process this file with autoconf to produce a configure script.
-dnl Created by Anjuta - will be overwritten
-dnl If you don't want it to overwrite it,
-dnl Please disable it in the Anjuta project configuration
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(e16menuedit2, cvs-`date +%F`)
+AM_INIT_AUTOMAKE(e16menuedit2, 0.2)
AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
AC_ISC_POSIX
-CFLAGS=""
-AC_SUBST(CFLAGS)
AC_PROG_CC
AM_PROG_CC_STDC
AC_HEADER_STDC
-#AM_PROG_LIBTOOL
-AC_PREREQ(2.57)
-PKG_CHECK_MODULES(GTK, gtk+-2.0 libglade-2.0,,exit)
-AC_SUBST(GTK_LIBS)
-AC_SUBST(GTK_CFLAGS)
-dnl Checks for programs.
-dnl Checks for libraries.
-dnl Checks for header files.
-dnl Checks for typedefs, structures, and compiler characteristics.
-dnl Checks for library functions.
-dnl Checks for Additional stuffs.
+pkg_modules="gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0.0"
+PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+AC_SUBST(PACKAGE_CFLAGS)
+AC_SUBST(PACKAGE_LIBS)
-dnl Checks for gettext
-#AC_PROG_INTLTOOL([0.23])
+AC_PROG_INTLTOOL([0.23])
GETTEXT_PACKAGE=e16menuedit2
AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
-
-dnl Languages which your application supports
+dnl Add the languages which your application supports here.
ALL_LINGUAS="de en"
AM_GLIB_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION(0.10.40)
-#AM_GNU_GETTEXT_VERSION(0.12.1)
-AC_PROG_INTLTOOL
dnl Set PACKAGE_LOCALE_DIR in config.h.
if test "x${prefix}" = "xNONE"; then
@@ -48,7 +32,6 @@
AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale","")
fi
-
dnl Set PACKAGE SOURCE DIR in config.h.
packagesrcdir=`cd $srcdir && pwd`
@@ -105,11 +88,10 @@
AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}","")
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}","")
-AC_OUTPUT([
+AC_OUTPUT([
Makefile
-intl/Makefile
-po/Makefile.in
src/Makefile
pixmaps/Makefile
+po/Makefile.in
])
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/e16menuedit2.prj,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e16menuedit2.prj 2 Aug 2004 19:36:15 -0000 1.6
+++ e16menuedit2.prj 4 Aug 2004 23:03:49 -0000 1.7
@@ -39,7 +39,7 @@
project.config.extra.modules.before=
project.config.extra.modules.after=
project.config.blocked=0
-project.config.disable.overwriting=1 1 0 0 0 0 0 0 1
+project.config.disable.overwriting=1 1 1 1 1 1 1 1 1
project.menu.entry=e16menuedit2 Version 0.2
project.menu.group=Applications
-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
