Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : apps/etcher
Dir : e17/apps/etcher
Modified Files:
ChangeLog Makefile.am config.h.in configure.in etcher.glade
Added Files:
acinclude.m4
Log Message:
Etcher merge from SPLIT.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/etcher/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ChangeLog 24 Mar 2002 13:27:15 -0000 1.10
+++ ChangeLog 15 Jan 2003 16:57:29 -0000 1.11
@@ -1,3 +1,11 @@
+2003-01-15 gettextize <[EMAIL PROTECTED]>
+
+ * Makefile.am (SUBDIRS): Add m4.
+ (SUBDIRS): Remove intl.
+ (ACLOCAL_AMFLAGS): New variable.
+ (EXTRA_DIST): Add config.rpath.
+ * configure.in (AC_OUTPUT): Add m4/Makefile.
+
Sun Mar 17 12:17:52 2002 Christopher Rosendahl <[EMAIL PROTECTED]>
* Made etcher handle the prefered size field.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/etcher/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 12 Sep 2000 04:15:05 -0000 1.3
+++ Makefile.am 15 Jan 2003 16:57:30 -0000 1.4
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = intl po src
+SUBDIRS = m4 po src
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
config.h.in config.sub configure install-sh \
@@ -64,4 +64,6 @@
done \
fi
-EXTRA_DIST = README AUTHORS COPYING etcher.spec etcher.spec.in
+EXTRA_DIST = config.rpath README AUTHORS COPYING etcher.spec etcher.spec.in
+
+ACLOCAL_AMFLAGS = -I m4
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/etcher/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- config.h.in 9 Sep 2000 02:37:50 -0000 1.2
+++ config.h.in 15 Jan 2003 16:57:30 -0000 1.3
@@ -1,4 +1,4 @@
-/* config.h.in. Generated automatically from configure.in by autoheader. */
+/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */
/* Define if using alloca.c. */
#undef C_ALLOCA
@@ -25,9 +25,6 @@
/* Define to `long' if <sys/types.h> doesn't define. */
#undef off_t
-/* Define if you need to in order for stat and other things to work. */
-#undef _POSIX_SOURCE
-
/* Define to `unsigned' if <sys/types.h> doesn't define. */
#undef size_t
@@ -62,15 +59,36 @@
/* Define if you have the __argz_stringify function. */
#undef HAVE___ARGZ_STRINGIFY
-/* Define if you have the dcgettext function. */
-#undef HAVE_DCGETTEXT
+/* Define if you have the feof_unlocked function. */
+#undef HAVE_FEOF_UNLOCKED
+
+/* Define if you have the fgets_unlocked function. */
+#undef HAVE_FGETS_UNLOCKED
+
+/* Define if you have the getc_unlocked function. */
+#undef HAVE_GETC_UNLOCKED
/* Define if you have the getcwd function. */
#undef HAVE_GETCWD
+/* Define if you have the getegid function. */
+#undef HAVE_GETEGID
+
+/* Define if you have the geteuid function. */
+#undef HAVE_GETEUID
+
+/* Define if you have the getgid function. */
+#undef HAVE_GETGID
+
/* Define if you have the getpagesize function. */
#undef HAVE_GETPAGESIZE
+/* Define if you have the getuid function. */
+#undef HAVE_GETUID
+
+/* Define if you have the mempcpy function. */
+#undef HAVE_MEMPCPY
+
/* Define if you have the munmap function. */
#undef HAVE_MUNMAP
@@ -89,12 +107,15 @@
/* Define if you have the strcasecmp function. */
#undef HAVE_STRCASECMP
-/* Define if you have the strchr function. */
-#undef HAVE_STRCHR
-
/* Define if you have the strdup function. */
#undef HAVE_STRDUP
+/* Define if you have the strtoul function. */
+#undef HAVE_STRTOUL
+
+/* Define if you have the tsearch function. */
+#undef HAVE_TSEARCH
+
/* Define if you have the <argz.h> header file. */
#undef HAVE_ARGZ_H
@@ -110,6 +131,12 @@
/* Define if you have the <nl_types.h> header file. */
#undef HAVE_NL_TYPES_H
+/* Define if you have the <stddef.h> header file. */
+#undef HAVE_STDDEF_H
+
+/* Define if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
/* Define if you have the <string.h> header file. */
#undef HAVE_STRING_H
@@ -119,9 +146,6 @@
/* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define if you have the i library (-li). */
-#undef HAVE_LIBI
-
/* Name of package */
#undef PACKAGE
@@ -130,4 +154,50 @@
/* Define if using the dmalloc debugging malloc package */
#undef WITH_DMALLOC
+
+/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+ and declares uintmax_t. */
+#undef HAVE_INTTYPES_H_WITH_UINTMAX
+
+/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
+ and declares uintmax_t. */
+#undef HAVE_STDINT_H_WITH_UINTMAX
+
+/* Define if you have the unsigned long long type. */
+#undef HAVE_UNSIGNED_LONG_LONG
+
+/* Define if integer division by zero raises signal SIGFPE. */
+#undef INTDIV0_RAISES_SIGFPE
+
+/* Define to unsigned long or unsigned long long
+ if <inttypes.h> and <stdint.h> don't define. */
+#undef uintmax_t
+
+/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
+#undef HAVE_INTTYPES_H
+
+/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
+#undef PRI_MACROS_BROKEN
+
+/* Define if you have the iconv() function. */
+#undef HAVE_ICONV
+
+/* Define as const if the declaration of iconv() needs const. */
+#undef ICONV_CONST
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#undef HAVE_LANGINFO_CODESET
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
+
+/* Define to 1 if translation of program messages to the user's native language
+ is requested. */
+#undef ENABLE_NLS
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define if the GNU dcgettext() function is already present or preinstalled. */
+#undef HAVE_DCGETTEXT
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/etcher/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- configure.in 18 Dec 2000 20:17:23 -0000 1.7
+++ configure.in 15 Jan 2003 16:57:30 -0000 1.8
@@ -54,13 +54,22 @@
evas_libs=`evas-config --libs`
edb_cflags=`edb-config --cflags`
edb_libs=`edb-config --libs`
+imlib2_cflags=`imlib2-config --cflags`
+imlib2_libs=`imlib2-config --libs`
+
+AC_PATH_GENERIC(evas, 1.0, [
+ AC_SUBST(evas_libs)
+ AC_SUBST(evas_cflags) ],
+ AC_MSG_ERROR(Cannot find evas: Is evas-config in path? Is evas2 installed?))
+dnl AC_SUBST(evas_cflags)
+dnl AC_SUBST(evas_libs)
-AC_SUBST(evas_cflags)
-AC_SUBST(evas_libs)
AC_SUBST(edb_cflags)
AC_SUBST(edb_libs)
+AC_SUBST(imlib2_cflags)
+AC_SUBST(imlib2_libs)
-AC_OUTPUT([
+AC_OUTPUT([ m4/Makefile
Makefile
etcher.spec
src/Makefile
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/etcher/etcher.glade,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- etcher.glade 17 Mar 2002 11:24:47 -0000 1.30
+++ etcher.glade 15 Jan 2003 16:57:30 -0000 1.31
@@ -2554,52 +2554,6 @@
</widget>
<widget>
- <class>GtkCheckButton</class>
- <name>use_contents_h</name>
- <can_focus>True</can_focus>
- <label>Use Horizontal Size of Contents</label>
- <active>False</active>
- <draw_indicator>True</draw_indicator>
- <child>
- <left_attach>0</left_attach>
- <right_attach>3</right_attach>
- <top_attach>5</top_attach>
- <bottom_attach>6</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
-
- <widget>
- <class>GtkCheckButton</class>
- <name>use_contents_v</name>
- <can_focus>True</can_focus>
- <label>Use Vertical Size of Contents</label>
- <active>False</active>
- <draw_indicator>True</draw_indicator>
- <child>
- <left_attach>0</left_attach>
- <right_attach>3</right_attach>
- <top_attach>6</top_attach>
- <bottom_attach>7</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
-
- <widget>
<class>GtkHSeparator</class>
<name>hseparator1</name>
<child>
@@ -2695,6 +2649,107 @@
<yfill>True</yfill>
</child>
</widget>
+
+ <widget>
+ <class>GtkCheckButton</class>
+ <name>use_contents_h</name>
+ <can_focus>True</can_focus>
+ <label>Use Horizontal Size of Contents</label>
+ <active>False</active>
+ <draw_indicator>True</draw_indicator>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>5</top_attach>
+ <bottom_attach>6</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkCheckButton</class>
+ <name>use_contents_v</name>
+ <can_focus>True</can_focus>
+ <label>Use Vertical Size of Contents</label>
+ <active>False</active>
+ <draw_indicator>True</draw_indicator>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>6</top_attach>
+ <bottom_attach>7</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkCheckButton</class>
+ <name>use_smart_size</name>
+ <can_focus>True</can_focus>
+ <signal>
+ <name>clicked</name>
+ <handler>on_use_smart_size_clicked</handler>
+ <last_modification_time>Sat, 14 Sep 2002 00:18:06
+GMT</last_modification_time>
+ </signal>
+ <label>Smart Size</label>
+ <active>False</active>
+ <draw_indicator>True</draw_indicator>
+ <child>
+ <left_attach>2</left_attach>
+ <right_attach>3</right_attach>
+ <top_attach>5</top_attach>
+ <bottom_attach>6</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>False</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkButton</class>
+ <name>smartsize_set</name>
+ <can_focus>True</can_focus>
+ <signal>
+ <name>clicked</name>
+ <handler>on_smartsize_set_clicked</handler>
+ <last_modification_time>Sat, 14 Sep 2002 12:38:23
+GMT</last_modification_time>
+ </signal>
+ <label>Smart Size</label>
+ <relief>GTK_RELIEF_NORMAL</relief>
+ <child>
+ <left_attach>2</left_attach>
+ <right_attach>3</right_attach>
+ <top_attach>6</top_attach>
+ <bottom_attach>7</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
</widget>
<widget>
@@ -4280,7 +4335,7 @@
<wrap>False</wrap>
<value>1</value>
<lower>0</lower>
- <upper>100</upper>
+ <upper>999999</upper>
<step>1</step>
<page>10</page>
<page_size>10</page_size>
@@ -4312,7 +4367,7 @@
<wrap>False</wrap>
<value>1</value>
<lower>0</lower>
- <upper>100</upper>
+ <upper>999999</upper>
<step>1</step>
<page>10</page>
<page_size>10</page_size>
-------------------------------------------------------
This SF.NET email is sponsored by: Take your first step towards giving
your online business a competitive advantage. Test-drive a Thawte SSL
certificate - our easy online guide will show you how. Click here to get
started: http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0027en
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
