Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm
Modified Files:
ChangeLog Eterm.spec autogen.sh configure.in
Log Message:
Wed Feb 23 15:37:40 2005 Michael Jennings (mej)
Merged in previous autoFUCK changes from libast.
Added a feature to specify a command to be run in place of the normal
PC speaker beep.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/ChangeLog,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -3 -r1.400 -r1.401
--- ChangeLog 5 Jan 2005 20:18:07 -0000 1.400
+++ ChangeLog 23 Feb 2005 20:38:17 -0000 1.401
@@ -5293,3 +5293,10 @@
Spec dependency fixes.
----------------------------------------------------------------------
+Wed Feb 23 15:37:40 2005 Michael Jennings (mej)
+
+Merged in previous autoFUCK changes from libast.
+
+Added a feature to specify a command to be run in place of the normal
+PC speaker beep.
+----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/Eterm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- Eterm.spec 5 Jan 2005 20:18:07 -0000 1.15
+++ Eterm.spec 23 Feb 2005 20:38:19 -0000 1.16
@@ -2,6 +2,8 @@
%define compression gz
%endif
+%define __os_install_post /usr/lib/rpm/brp-compress
+
Summary: Enlightened terminal emulator
Name: Eterm
Version: 0.9.4
@@ -30,14 +32,16 @@
%setup -a 1
%build
-CFLAGS="$RPM_OPT_FLAGS"
+#CFLAGS="$RPM_OPT_FLAGS"
+CFLAGS="-O0 -g3"
export CFLAGS
# When using the configure macro, I also specify all the directory
# macros I use for compatibility with older versions of the macro
%configure --bindir=%{_bindir} --libdir=%{_libdir} --mandir=%{_mandir} \
--datadir=%{_datadir} --sysconfdir=%{_sysconfdir} \
- --enable-multi-charset --enable-escreen --enable-auto-encoding
%{?acflags}
+ --enable-multi-charset --enable-escreen --enable-auto-encoding \
+ --with-debugging=9 %{?acflags}
%{__make} %{?mflags}
%install
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/autogen.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- autogen.sh 20 Oct 2004 04:49:59 -0000 1.7
+++ autogen.sh 23 Feb 2005 20:38:19 -0000 1.8
@@ -1,6 +1,6 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
-# $Id: autogen.sh,v 1.7 2004/10/20 04:49:59 rbdpngn Exp $
+# $Id: autogen.sh,v 1.8 2005/02/23 20:38:19 mej Exp $
broken() {
echo
@@ -15,45 +15,50 @@
echo "Generating configuration files for Eterm, please wait...."
LIBTOOLIZE_CHOICES="$LIBTOOLIZE libtoolize glibtoolize"
-AUTOHEADER_CHOICES="$AUTOHEADER autoheader213 autoheader-2.13 autoheader"
-ACLOCAL_CHOICES="$ACLOCAL aclocal14 aclocal-1.4 aclocal"
-AUTOMAKE_CHOICES="$AUTOMAKE automake14 automake-1.4 automake"
-AUTOCONF_CHOICES="$AUTOCONF autoconf213 autoconf-2.13 autoconf"
+ACLOCAL_CHOICES="$ACLOCAL aclocal"
+AUTOCONF_CHOICES="$AUTOCONF autoconf"
+AUTOHEADER_CHOICES="$AUTOHEADER autoheader"
+AUTOMAKE_CHOICES="$AUTOMAKE automake"
for i in $LIBTOOLIZE_CHOICES ; do
$i --version </dev/null >/dev/null 2>&1 && LIBTOOLIZE=$i && break
done
[ "x$LIBTOOLIZE" = "x" ] && broken libtool
-for i in $AUTOHEADER_CHOICES ; do
- $i --version </dev/null >/dev/null 2>&1 && AUTOHEADER=$i && break
-done
-[ "x$AUTOHEADER" = "x" ] && broken autoconf
-
for i in $ACLOCAL_CHOICES ; do
$i --version </dev/null >/dev/null 2>&1 && ACLOCAL=$i && break
done
[ "x$ACLOCAL" = "x" ] && broken automake
-for i in $AUTOMAKE_CHOICES ; do
- $i --version </dev/null >/dev/null 2>&1 && AUTOMAKE=$i && break
-done
-[ "x$AUTOMAKE" = "x" ] && broken automake
-
for i in $AUTOCONF_CHOICES ; do
$i --version </dev/null >/dev/null 2>&1 && AUTOCONF=$i && break
done
[ "x$AUTOCONF" = "x" ] && broken autoconf
+for i in $AUTOHEADER_CHOICES ; do
+ $i --version </dev/null >/dev/null 2>&1 && AUTOHEADER=$i && break
+done
+[ "x$AUTOHEADER" = "x" ] && broken autoconf
+
+for i in $AUTOMAKE_CHOICES ; do
+ $i --version </dev/null >/dev/null 2>&1 && AUTOMAKE=$i && break
+done
+[ "x$AUTOMAKE" = "x" ] && broken automake
+
# Export them so configure can AC_SUBST() them.
-export LIBTOOLIZE AUTOHEADER ACLOCAL AUTOMAKE AUTOCONF
+export LIBTOOLIZE ACLOCAL AUTOCONF AUTOHEADER AUTOMAKE
+
+# Check for existing libast.m4 we can use. Use the local one if not.
+if test ! -f "`$ACLOCAL --print-ac-dir`/libast.m4"; then
+ ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
+fi
# Run the stuff.
(set -x && $LIBTOOLIZE -c -f)
-(set -x && $AUTOHEADER)
(set -x && $ACLOCAL $ACLOCAL_FLAGS)
-(set -x && $AUTOMAKE -a -c)
(set -x && $AUTOCONF)
+(set -x && $AUTOHEADER)
+(set -x && $AUTOMAKE -a -c)
# Run configure.
./configure "$@"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/configure.in,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- configure.in 14 Dec 2004 23:24:23 -0000 1.86
+++ configure.in 23 Feb 2005 20:38:19 -0000 1.87
@@ -1,25 +1,25 @@
-dnl# $Id: configure.in,v 1.86 2004/12/14 23:24:23 mej Exp $
+dnl# $Id: configure.in,v 1.87 2005/02/23 20:38:19 mej Exp $
PATH=$PATH:/usr/bin:/bin:/usr/local/bin:/usr/ccs/bin:/usr/contrib/bin:/usr/ucb/bin
export PATH
-test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=true
-test "x$AUTOHEADER" = "x" && AUTOHEADER=true
-test "x$ACLOCAL" = "x" && ACLOCAL=true
-test "x$AUTOMAKE" = "x" && AUTOMAKE=true
-test "x$AUTOCONF" = "x" && AUTOCONF=true
+test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
+test "x$ACLOCAL" = "x" && ACLOCAL=aclocal
+test "x$AUTOCONF" = "x" && AUTOCONF=autoconf
+test "x$AUTOHEADER" = "x" && AUTOHEADER=autoheader
+test "x$AUTOMAKE" = "x" && AUTOMAKE=automake
AC_SUBST(LIBTOOLIZE)
-AC_SUBST(AUTOHEADER)
AC_SUBST(ACLOCAL)
-AC_SUBST(AUTOMAKE)
AC_SUBST(AUTOCONF)
+AC_SUBST(AUTOHEADER)
+AC_SUBST(AUTOMAKE)
SAVE_LIBTOOLIZE="$LIBTOOLIZE"
-SAVE_AUTOHEADER="$AUTOHEADER"
SAVE_ACLOCAL="$ACLOCAL"
-SAVE_AUTOMAKE="$AUTOMAKE"
SAVE_AUTOCONF="$AUTOCONF"
+SAVE_AUTOHEADER="$AUTOHEADER"
+SAVE_AUTOMAKE="$AUTOMAKE"
AC_INIT(src/feature.h)
AM_INIT_AUTOMAKE(Eterm, 0.9.4)
@@ -33,11 +33,22 @@
AC_SUBST(AUTHORS)
AC_DEFINE_UNQUOTED(AUTHORS, "$AUTHORS", [Authors])
-LIBTOOLIZE="$SAVE_LIBTOOLIZE"
-AUTOHEADER="$SAVE_AUTOHEADER"
-ACLOCAL="$SAVE_ACLOCAL"
-AUTOMAKE="$SAVE_AUTOMAKE"
-AUTOCONF="$SAVE_AUTOCONF"
+LIBTOOLIZE="${SAVE_LIBTOOLIZE:-libtoolize}"
+ACLOCAL="${SAVE_ACLOCAL:-aclocal}"
+AUTOCONF="${SAVE_AUTOCONF:-autoconf}"
+AUTOHEADER="${SAVE_AUTOHEADER:-autoheader}"
+AUTOMAKE="${SAVE_AUTOMAKE:-automake}"
+
+AC_MSG_CHECKING(for preferred libtoolize)
+AC_MSG_RESULT($LIBTOOLIZE)
+AC_MSG_CHECKING(for preferred aclocal)
+AC_MSG_RESULT($ACLOCAL)
+AC_MSG_CHECKING(for preferred autoconf)
+AC_MSG_RESULT($AUTOCONF)
+AC_MSG_CHECKING(for preferred autoheader)
+AC_MSG_RESULT($AUTOHEADER)
+AC_MSG_CHECKING(for preferred automake)
+AC_MSG_RESULT($AUTOMAKE)
dnl# Find RCS Ident info from source files
AC_DEFINE_UNQUOTED(ACTIONS_IDENT, "`grep '$''Id:' $srcdir/src/actions.c | sed
's/^.*\$''Id: //;s/ \$.*$//;s/.v / /;s/ Exp//'`", [actions.c RCS ID])
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
