• R/O
  • SSH
  • HTTPS

sagcad: Commit


Commit MetaInfo

Revision59 (tree)
Time2009-05-03 15:17:52
Authorkappa

Log Message

autotool

Change Summary

Incremental Difference

--- sagcad/trunk/configure (revision 58)
+++ sagcad/trunk/configure (revision 59)
@@ -661,8 +661,6 @@
661661 USE_NLS
662662 PACKAGE_LIBS
663663 PACKAGE_CFLAGS
664-PLATFORM_WIN32_FALSE
665-PLATFORM_WIN32_TRUE
666664 WITH_WIN32_FALSE
667665 WITH_WIN32_TRUE
668666 GTK_LIBS
@@ -5215,29 +5213,6 @@
52155213
52165214
52175215
5218-{ $as_echo "$as_me:$LINENO: checking for Win32 platform" >&5
5219-$as_echo_n "checking for Win32 platform... " >&6; }
5220-case "$host" in
5221- *-*-mingw*)
5222- platform_win32=yes
5223- #INKSCAPE_CFLAGS="$INKSCAPE_CFLAGS -mms-bitfields -DLIBXML_STATIC"
5224- ;;
5225- *)
5226- platform_win32=no
5227- ;;
5228-esac
5229-{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5
5230-$as_echo "$platform_win32" >&6; }
5231- if test "$platform_win32" = "yes"; then
5232- PLATFORM_WIN32_TRUE=
5233- PLATFORM_WIN32_FALSE='#'
5234-else
5235- PLATFORM_WIN32_TRUE='#'
5236- PLATFORM_WIN32_FALSE=
5237-fi
5238-
5239-
5240-
52415216 # --- debug option ---
52425217 { $as_echo "$as_me:$LINENO: checking if --enable-debug option specified" >&5
52435218 $as_echo_n "checking if --enable-debug option specified... " >&6; }
@@ -6862,14 +6837,7 @@
68626837
68636838
68646839 # --- LOCALEDIR ---
6865-#LOCALEDIR='${prefix}/${DATADIRNAME}/locale'
6866-LOCALEDIR='${datatootdir}/locale'
6867-#win32=no
6868-#case "${host_os}" in
6869-# *mingw* | pw32* | cygwin*)
6870-# win32="yes"
6871-# LOCALEDIR='${prefix}/lib/locale'
6872-#esac
6840+LOCALEDIR='${prefix}/${DATADIRNAME}/locale'
68736841
68746842
68756843 # --- DOCDIR ---
@@ -7024,13 +6992,6 @@
70246992 Usually this means the macro was only invoked conditionally." >&2;}
70256993 { (exit 1); exit 1; }; }
70266994 fi
7027-if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then
7028- { { $as_echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined.
7029-Usually this means the macro was only invoked conditionally." >&5
7030-$as_echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined.
7031-Usually this means the macro was only invoked conditionally." >&2;}
7032- { (exit 1); exit 1; }; }
7033-fi
70346995
70356996 : ${CONFIG_STATUS=./config.status}
70366997 ac_write_fail=0
@@ -8407,7 +8368,6 @@
84078368 echo "exec_prefix : ${exec_prefix}"
84088369 echo "bindir : ${bindir}"
84098370 echo "datadir : ${datadir}"
8410-echo "datarootdir : ${datarootdir}"
84118371 echo "pkgdatadir : ${pkgdatadir}"
84128372 echo "Config : ${sysconfdir}"
84138373 echo "localedir : ${localedir}"
--- sagcad/trunk/Makefile.in (revision 58)
+++ sagcad/trunk/Makefile.in (revision 59)
@@ -183,7 +183,6 @@
183183 prefix = @prefix@
184184 program_transform_name = @program_transform_name@
185185 psdir = @psdir@
186-sagcadlocaledir = @sagcadlocaledir@
187186 sbindir = @sbindir@
188187 sharedstatedir = @sharedstatedir@
189188 srcdir = @srcdir@
--- sagcad/trunk/src/Makefile.in (revision 58)
+++ sagcad/trunk/src/Makefile.in (revision 59)
@@ -1,8 +1,8 @@
1-# Makefile.in generated by automake 1.10 from Makefile.am.
1+# Makefile.in generated by automake 1.10.2 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
88 # with or without modifications, as long as this notice is preserved.
@@ -30,9 +30,6 @@
3030 NORMAL_UNINSTALL = :
3131 PRE_UNINSTALL = :
3232 POST_UNINSTALL = :
33-build_triplet = @build@
34-host_triplet = @host@
35-target_triplet = @target@
3633 bin_PROGRAMS = sagcad$(EXEEXT)
3734 subdir = src
3835 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -72,7 +69,7 @@
7269 am__DEPENDENCIES_1 =
7370 @HAVE_WINDRES_TRUE@am__DEPENDENCIES_2 = sagcad.res
7471 sagcad_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
75-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
72+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
7673 depcomp = $(SHELL) $(top_srcdir)/depcomp
7774 am__depfiles_maybe = depfiles
7875 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -124,6 +121,8 @@
124121 GMOFILES = @GMOFILES@
125122 GMSGFMT = @GMSGFMT@
126123 GREP = @GREP@
124+GTK_CFLAGS = @GTK_CFLAGS@
125+GTK_LIBS = @GTK_LIBS@
127126 INSTALL = @INSTALL@
128127 INSTALL_DATA = @INSTALL_DATA@
129128 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -145,6 +144,7 @@
145144 MKDIR_P = @MKDIR_P@
146145 MKINSTALLDIRS = @MKINSTALLDIRS@
147146 MSGFMT = @MSGFMT@
147+MSGFMT_OPTS = @MSGFMT_OPTS@
148148 OBJEXT = @OBJEXT@
149149 PACKAGE = @PACKAGE@
150150 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -182,11 +182,7 @@
182182 am__tar = @am__tar@
183183 am__untar = @am__untar@
184184 bindir = @bindir@
185-build = @build@
186185 build_alias = @build_alias@
187-build_cpu = @build_cpu@
188-build_os = @build_os@
189-build_vendor = @build_vendor@
190186 builddir = @builddir@
191187 datadir = @datadir@
192188 datarootdir = @datarootdir@
@@ -193,11 +189,7 @@
193189 docdir = @docdir@
194190 dvidir = @dvidir@
195191 exec_prefix = @exec_prefix@
196-host = @host@
197192 host_alias = @host_alias@
198-host_cpu = @host_cpu@
199-host_os = @host_os@
200-host_vendor = @host_vendor@
201193 htmldir = @htmldir@
202194 includedir = @includedir@
203195 infodir = @infodir@
@@ -213,16 +205,12 @@
213205 prefix = @prefix@
214206 program_transform_name = @program_transform_name@
215207 psdir = @psdir@
216-sagcadlocaledir = @sagcadlocaledir@
217208 sbindir = @sbindir@
218209 sharedstatedir = @sharedstatedir@
219210 srcdir = @srcdir@
220211 sysconfdir = @sysconfdir@
221-target = @target@
222212 target_alias = @target_alias@
223-target_cpu = @target_cpu@
224-target_os = @target_os@
225-target_vendor = @target_vendor@
213+top_build_prefix = @top_build_prefix@
226214 top_builddir = @top_builddir@
227215 top_srcdir = @top_srcdir@
228216 SUBDIRS = xpm
@@ -289,10 +277,13 @@
289277 types.h
290278
291279 INCLUDES = \
292- -DG_LOG_DOMAIN=\"sagcad\" \
293280 $(PACKAGE_CFLAGS) \
294281 $(GDK_PIXBUF_CFLAGS) \
295- -I$(includedir)
282+ -I$(includedir) \
283+ -DPACKAGE_PREFIX=\""$(prefix)"\" \
284+ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
285+ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
286+ -DG_LOG_DOMAIN=\"sagcad\"
296287
297288 EXTRA_DIST = \
298289 sagcad.rc.in
@@ -316,8 +307,8 @@
316307 @for dep in $?; do \
317308 case '$(am__configure_deps)' in \
318309 *$$dep*) \
319- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
320- && exit 0; \
310+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
311+ && { if test -f $@; then exit 0; else break; fi; }; \
321312 exit 1;; \
322313 esac; \
323314 done; \
@@ -524,8 +515,8 @@
524515 unique=`for i in $$list; do \
525516 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
526517 done | \
527- $(AWK) ' { files[$$0] = 1; } \
528- END { for (i in files) print i; }'`; \
518+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
519+ END { if (nonempty) { for (i in files) print i; }; }'`; \
529520 mkid -fID $$unique
530521 tags: TAGS
531522
@@ -550,8 +541,8 @@
550541 unique=`for i in $$list; do \
551542 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
552543 done | \
553- $(AWK) ' { files[$$0] = 1; } \
554- END { for (i in files) print i; }'`; \
544+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
545+ END { if (nonempty) { for (i in files) print i; }; }'`; \
555546 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
556547 test -n "$$unique" || unique=$$empty_fix; \
557548 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -561,13 +552,12 @@
561552 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
562553 $(TAGS_FILES) $(LISP)
563554 tags=; \
564- here=`pwd`; \
565555 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
566556 unique=`for i in $$list; do \
567557 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
568558 done | \
569- $(AWK) ' { files[$$0] = 1; } \
570- END { for (i in files) print i; }'`; \
559+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
560+ END { if (nonempty) { for (i in files) print i; }; }'`; \
571561 test -z "$(CTAGS_ARGS)$$tags$$unique" \
572562 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
573563 $$tags $$unique
--- sagcad/trunk/src/xpm/Makefile.in (revision 58)
+++ sagcad/trunk/src/xpm/Makefile.in (revision 59)
@@ -1,8 +1,8 @@
1-# Makefile.in generated by automake 1.10 from Makefile.am.
1+# Makefile.in generated by automake 1.10.2 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
88 # with or without modifications, as long as this notice is preserved.
@@ -29,9 +29,6 @@
2929 NORMAL_UNINSTALL = :
3030 PRE_UNINSTALL = :
3131 POST_UNINSTALL = :
32-build_triplet = @build@
33-host_triplet = @host@
34-target_triplet = @target@
3532 subdir = src/xpm
3633 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
3734 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -74,6 +71,8 @@
7471 GMOFILES = @GMOFILES@
7572 GMSGFMT = @GMSGFMT@
7673 GREP = @GREP@
74+GTK_CFLAGS = @GTK_CFLAGS@
75+GTK_LIBS = @GTK_LIBS@
7776 INSTALL = @INSTALL@
7877 INSTALL_DATA = @INSTALL_DATA@
7978 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -95,6 +94,7 @@
9594 MKDIR_P = @MKDIR_P@
9695 MKINSTALLDIRS = @MKINSTALLDIRS@
9796 MSGFMT = @MSGFMT@
97+MSGFMT_OPTS = @MSGFMT_OPTS@
9898 OBJEXT = @OBJEXT@
9999 PACKAGE = @PACKAGE@
100100 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -132,11 +132,7 @@
132132 am__tar = @am__tar@
133133 am__untar = @am__untar@
134134 bindir = @bindir@
135-build = @build@
136135 build_alias = @build_alias@
137-build_cpu = @build_cpu@
138-build_os = @build_os@
139-build_vendor = @build_vendor@
140136 builddir = @builddir@
141137 datadir = @datadir@
142138 datarootdir = @datarootdir@
@@ -143,11 +139,7 @@
143139 docdir = @docdir@
144140 dvidir = @dvidir@
145141 exec_prefix = @exec_prefix@
146-host = @host@
147142 host_alias = @host_alias@
148-host_cpu = @host_cpu@
149-host_os = @host_os@
150-host_vendor = @host_vendor@
151143 htmldir = @htmldir@
152144 includedir = @includedir@
153145 infodir = @infodir@
@@ -163,16 +155,12 @@
163155 prefix = @prefix@
164156 program_transform_name = @program_transform_name@
165157 psdir = @psdir@
166-sagcadlocaledir = @sagcadlocaledir@
167158 sbindir = @sbindir@
168159 sharedstatedir = @sharedstatedir@
169160 srcdir = @srcdir@
170161 sysconfdir = @sysconfdir@
171-target = @target@
172162 target_alias = @target_alias@
173-target_cpu = @target_cpu@
174-target_os = @target_os@
175-target_vendor = @target_vendor@
163+top_build_prefix = @top_build_prefix@
176164 top_builddir = @top_builddir@
177165 top_srcdir = @top_srcdir@
178166 BUILT_SOURCES =
@@ -235,8 +223,8 @@
235223 @for dep in $?; do \
236224 case '$(am__configure_deps)' in \
237225 *$$dep*) \
238- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
239- && exit 0; \
226+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
227+ && { if test -f $@; then exit 0; else break; fi; }; \
240228 exit 1;; \
241229 esac; \
242230 done; \
--- sagcad/trunk/tools/ruby/Makefile.in (revision 58)
+++ sagcad/trunk/tools/ruby/Makefile.in (revision 59)
@@ -1,8 +1,8 @@
1-# Makefile.in generated by automake 1.10 from Makefile.am.
1+# Makefile.in generated by automake 1.10.2 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
88 # with or without modifications, as long as this notice is preserved.
@@ -30,9 +30,6 @@
3030 NORMAL_UNINSTALL = :
3131 PRE_UNINSTALL = :
3232 POST_UNINSTALL = :
33-build_triplet = @build@
34-host_triplet = @host@
35-target_triplet = @target@
3633 subdir = tools/ruby
3734 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
3835 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -78,6 +75,8 @@
7875 GMOFILES = @GMOFILES@
7976 GMSGFMT = @GMSGFMT@
8077 GREP = @GREP@
78+GTK_CFLAGS = @GTK_CFLAGS@
79+GTK_LIBS = @GTK_LIBS@
8180 INSTALL = @INSTALL@
8281 INSTALL_DATA = @INSTALL_DATA@
8382 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -99,6 +98,7 @@
9998 MKDIR_P = @MKDIR_P@
10099 MKINSTALLDIRS = @MKINSTALLDIRS@
101100 MSGFMT = @MSGFMT@
101+MSGFMT_OPTS = @MSGFMT_OPTS@
102102 OBJEXT = @OBJEXT@
103103 PACKAGE = @PACKAGE@
104104 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -136,11 +136,7 @@
136136 am__tar = @am__tar@
137137 am__untar = @am__untar@
138138 bindir = @bindir@
139-build = @build@
140139 build_alias = @build_alias@
141-build_cpu = @build_cpu@
142-build_os = @build_os@
143-build_vendor = @build_vendor@
144140 builddir = @builddir@
145141 datadir = @datadir@
146142 datarootdir = @datarootdir@
@@ -147,11 +143,7 @@
147143 docdir = @docdir@
148144 dvidir = @dvidir@
149145 exec_prefix = @exec_prefix@
150-host = @host@
151146 host_alias = @host_alias@
152-host_cpu = @host_cpu@
153-host_os = @host_os@
154-host_vendor = @host_vendor@
155147 htmldir = @htmldir@
156148 includedir = @includedir@
157149 infodir = @infodir@
@@ -167,16 +159,12 @@
167159 prefix = @prefix@
168160 program_transform_name = @program_transform_name@
169161 psdir = @psdir@
170-sagcadlocaledir = @sagcadlocaledir@
171162 sbindir = @sbindir@
172163 sharedstatedir = @sharedstatedir@
173164 srcdir = @srcdir@
174165 sysconfdir = @sysconfdir@
175-target = @target@
176166 target_alias = @target_alias@
177-target_cpu = @target_cpu@
178-target_os = @target_os@
179-target_vendor = @target_vendor@
167+top_build_prefix = @top_build_prefix@
180168 top_builddir = @top_builddir@
181169 top_srcdir = @top_srcdir@
182170 tooldatadir = $(TOOLDIR)/ruby
@@ -196,8 +184,8 @@
196184 @for dep in $?; do \
197185 case '$(am__configure_deps)' in \
198186 *$$dep*) \
199- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
200- && exit 0; \
187+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
188+ && { if test -f $@; then exit 0; else break; fi; }; \
201189 exit 1;; \
202190 esac; \
203191 done; \
--- sagcad/trunk/tools/Makefile.in (revision 58)
+++ sagcad/trunk/tools/Makefile.in (revision 59)
@@ -1,8 +1,8 @@
1-# Makefile.in generated by automake 1.10 from Makefile.am.
1+# Makefile.in generated by automake 1.10.2 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
88 # with or without modifications, as long as this notice is preserved.
@@ -30,9 +30,6 @@
3030 NORMAL_UNINSTALL = :
3131 PRE_UNINSTALL = :
3232 POST_UNINSTALL = :
33-build_triplet = @build@
34-host_triplet = @host@
35-target_triplet = @target@
3633 subdir = tools
3734 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
3835 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -96,6 +93,8 @@
9693 GMOFILES = @GMOFILES@
9794 GMSGFMT = @GMSGFMT@
9895 GREP = @GREP@
96+GTK_CFLAGS = @GTK_CFLAGS@
97+GTK_LIBS = @GTK_LIBS@
9998 INSTALL = @INSTALL@
10099 INSTALL_DATA = @INSTALL_DATA@
101100 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -117,6 +116,7 @@
117116 MKDIR_P = @MKDIR_P@
118117 MKINSTALLDIRS = @MKINSTALLDIRS@
119118 MSGFMT = @MSGFMT@
119+MSGFMT_OPTS = @MSGFMT_OPTS@
120120 OBJEXT = @OBJEXT@
121121 PACKAGE = @PACKAGE@
122122 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -154,11 +154,7 @@
154154 am__tar = @am__tar@
155155 am__untar = @am__untar@
156156 bindir = @bindir@
157-build = @build@
158157 build_alias = @build_alias@
159-build_cpu = @build_cpu@
160-build_os = @build_os@
161-build_vendor = @build_vendor@
162158 builddir = @builddir@
163159 datadir = @datadir@
164160 datarootdir = @datarootdir@
@@ -165,11 +161,7 @@
165161 docdir = @docdir@
166162 dvidir = @dvidir@
167163 exec_prefix = @exec_prefix@
168-host = @host@
169164 host_alias = @host_alias@
170-host_cpu = @host_cpu@
171-host_os = @host_os@
172-host_vendor = @host_vendor@
173165 htmldir = @htmldir@
174166 includedir = @includedir@
175167 infodir = @infodir@
@@ -185,16 +177,12 @@
185177 prefix = @prefix@
186178 program_transform_name = @program_transform_name@
187179 psdir = @psdir@
188-sagcadlocaledir = @sagcadlocaledir@
189180 sbindir = @sbindir@
190181 sharedstatedir = @sharedstatedir@
191182 srcdir = @srcdir@
192183 sysconfdir = @sysconfdir@
193-target = @target@
194184 target_alias = @target_alias@
195-target_cpu = @target_cpu@
196-target_os = @target_os@
197-target_vendor = @target_vendor@
185+top_build_prefix = @top_build_prefix@
198186 top_builddir = @top_builddir@
199187 top_srcdir = @top_srcdir@
200188 SUBDIRS = ruby
@@ -214,8 +202,8 @@
214202 @for dep in $?; do \
215203 case '$(am__configure_deps)' in \
216204 *$$dep*) \
217- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
218- && exit 0; \
205+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
206+ && { if test -f $@; then exit 0; else break; fi; }; \
219207 exit 1;; \
220208 esac; \
221209 done; \
@@ -332,8 +320,8 @@
332320 unique=`for i in $$list; do \
333321 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
334322 done | \
335- $(AWK) ' { files[$$0] = 1; } \
336- END { for (i in files) print i; }'`; \
323+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
324+ END { if (nonempty) { for (i in files) print i; }; }'`; \
337325 mkid -fID $$unique
338326 tags: TAGS
339327
@@ -358,8 +346,8 @@
358346 unique=`for i in $$list; do \
359347 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
360348 done | \
361- $(AWK) ' { files[$$0] = 1; } \
362- END { for (i in files) print i; }'`; \
349+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
350+ END { if (nonempty) { for (i in files) print i; }; }'`; \
363351 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
364352 test -n "$$unique" || unique=$$empty_fix; \
365353 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -369,13 +357,12 @@
369357 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
370358 $(TAGS_FILES) $(LISP)
371359 tags=; \
372- here=`pwd`; \
373360 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
374361 unique=`for i in $$list; do \
375362 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
376363 done | \
377- $(AWK) ' { files[$$0] = 1; } \
378- END { for (i in files) print i; }'`; \
364+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
365+ END { if (nonempty) { for (i in files) print i; }; }'`; \
379366 test -z "$(CTAGS_ARGS)$$tags$$unique" \
380367 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
381368 $$tags $$unique
--- sagcad/trunk/doc/Makefile.in (revision 58)
+++ sagcad/trunk/doc/Makefile.in (revision 59)
@@ -1,8 +1,8 @@
1-# Makefile.in generated by automake 1.10 from Makefile.am.
1+# Makefile.in generated by automake 1.10.2 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
88 # with or without modifications, as long as this notice is preserved.
@@ -29,9 +29,6 @@
2929 NORMAL_UNINSTALL = :
3030 PRE_UNINSTALL = :
3131 POST_UNINSTALL = :
32-build_triplet = @build@
33-host_triplet = @host@
34-target_triplet = @target@
3532 subdir = doc
3633 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
3734 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -86,6 +83,8 @@
8683 GMOFILES = @GMOFILES@
8784 GMSGFMT = @GMSGFMT@
8885 GREP = @GREP@
86+GTK_CFLAGS = @GTK_CFLAGS@
87+GTK_LIBS = @GTK_LIBS@
8988 INSTALL = @INSTALL@
9089 INSTALL_DATA = @INSTALL_DATA@
9190 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +106,7 @@
107106 MKDIR_P = @MKDIR_P@
108107 MKINSTALLDIRS = @MKINSTALLDIRS@
109108 MSGFMT = @MSGFMT@
109+MSGFMT_OPTS = @MSGFMT_OPTS@
110110 OBJEXT = @OBJEXT@
111111 PACKAGE = @PACKAGE@
112112 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -144,11 +144,7 @@
144144 am__tar = @am__tar@
145145 am__untar = @am__untar@
146146 bindir = @bindir@
147-build = @build@
148147 build_alias = @build_alias@
149-build_cpu = @build_cpu@
150-build_os = @build_os@
151-build_vendor = @build_vendor@
152148 builddir = @builddir@
153149 datadir = @datadir@
154150 datarootdir = @datarootdir@
@@ -155,11 +151,7 @@
155151 docdir = @docdir@
156152 dvidir = @dvidir@
157153 exec_prefix = @exec_prefix@
158-host = @host@
159154 host_alias = @host_alias@
160-host_cpu = @host_cpu@
161-host_os = @host_os@
162-host_vendor = @host_vendor@
163155 htmldir = @htmldir@
164156 includedir = @includedir@
165157 infodir = @infodir@
@@ -175,16 +167,12 @@
175167 prefix = @prefix@
176168 program_transform_name = @program_transform_name@
177169 psdir = @psdir@
178-sagcadlocaledir = @sagcadlocaledir@
179170 sbindir = @sbindir@
180171 sharedstatedir = @sharedstatedir@
181172 srcdir = @srcdir@
182173 sysconfdir = @sysconfdir@
183-target = @target@
184174 target_alias = @target_alias@
185-target_cpu = @target_cpu@
186-target_os = @target_os@
187-target_vendor = @target_vendor@
175+top_build_prefix = @top_build_prefix@
188176 top_builddir = @top_builddir@
189177 top_srcdir = @top_srcdir@
190178 SUBDIRS = ja de
@@ -195,8 +183,8 @@
195183 @for dep in $?; do \
196184 case '$(am__configure_deps)' in \
197185 *$$dep*) \
198- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
199- && exit 0; \
186+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
187+ && { if test -f $@; then exit 0; else break; fi; }; \
200188 exit 1;; \
201189 esac; \
202190 done; \
@@ -296,8 +284,8 @@
296284 unique=`for i in $$list; do \
297285 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
298286 done | \
299- $(AWK) ' { files[$$0] = 1; } \
300- END { for (i in files) print i; }'`; \
287+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
288+ END { if (nonempty) { for (i in files) print i; }; }'`; \
301289 mkid -fID $$unique
302290 tags: TAGS
303291
@@ -322,8 +310,8 @@
322310 unique=`for i in $$list; do \
323311 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
324312 done | \
325- $(AWK) ' { files[$$0] = 1; } \
326- END { for (i in files) print i; }'`; \
313+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
314+ END { if (nonempty) { for (i in files) print i; }; }'`; \
327315 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
328316 test -n "$$unique" || unique=$$empty_fix; \
329317 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -333,13 +321,12 @@
333321 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
334322 $(TAGS_FILES) $(LISP)
335323 tags=; \
336- here=`pwd`; \
337324 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
338325 unique=`for i in $$list; do \
339326 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
340327 done | \
341- $(AWK) ' { files[$$0] = 1; } \
342- END { for (i in files) print i; }'`; \
328+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
329+ END { if (nonempty) { for (i in files) print i; }; }'`; \
343330 test -z "$(CTAGS_ARGS)$$tags$$unique" \
344331 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
345332 $$tags $$unique
--- sagcad/trunk/doc/de/Makefile.in (revision 58)
+++ sagcad/trunk/doc/de/Makefile.in (revision 59)
@@ -1,8 +1,8 @@
1-# Makefile.in generated by automake 1.10 from Makefile.am.
1+# Makefile.in generated by automake 1.10.2 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
88 # with or without modifications, as long as this notice is preserved.
@@ -30,9 +30,6 @@
3030 NORMAL_UNINSTALL = :
3131 PRE_UNINSTALL = :
3232 POST_UNINSTALL = :
33-build_triplet = @build@
34-host_triplet = @host@
35-target_triplet = @target@
3633 subdir = doc/de
3734 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
3835 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -96,6 +93,8 @@
9693 GMOFILES = @GMOFILES@
9794 GMSGFMT = @GMSGFMT@
9895 GREP = @GREP@
96+GTK_CFLAGS = @GTK_CFLAGS@
97+GTK_LIBS = @GTK_LIBS@
9998 INSTALL = @INSTALL@
10099 INSTALL_DATA = @INSTALL_DATA@
101100 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -117,6 +116,7 @@
117116 MKDIR_P = @MKDIR_P@
118117 MKINSTALLDIRS = @MKINSTALLDIRS@
119118 MSGFMT = @MSGFMT@
119+MSGFMT_OPTS = @MSGFMT_OPTS@
120120 OBJEXT = @OBJEXT@
121121 PACKAGE = @PACKAGE@
122122 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -154,11 +154,7 @@
154154 am__tar = @am__tar@
155155 am__untar = @am__untar@
156156 bindir = @bindir@
157-build = @build@
158157 build_alias = @build_alias@
159-build_cpu = @build_cpu@
160-build_os = @build_os@
161-build_vendor = @build_vendor@
162158 builddir = @builddir@
163159 datadir = @datadir@
164160 datarootdir = @datarootdir@
@@ -165,11 +161,7 @@
165161 docdir = @docdir@
166162 dvidir = @dvidir@
167163 exec_prefix = @exec_prefix@
168-host = @host@
169164 host_alias = @host_alias@
170-host_cpu = @host_cpu@
171-host_os = @host_os@
172-host_vendor = @host_vendor@
173165 htmldir = @htmldir@
174166 includedir = @includedir@
175167 infodir = @infodir@
@@ -185,16 +177,12 @@
185177 prefix = @prefix@
186178 program_transform_name = @program_transform_name@
187179 psdir = @psdir@
188-sagcadlocaledir = @sagcadlocaledir@
189180 sbindir = @sbindir@
190181 sharedstatedir = @sharedstatedir@
191182 srcdir = @srcdir@
192183 sysconfdir = @sysconfdir@
193-target = @target@
194184 target_alias = @target_alias@
195-target_cpu = @target_cpu@
196-target_os = @target_os@
197-target_vendor = @target_vendor@
185+top_build_prefix = @top_build_prefix@
198186 top_builddir = @top_builddir@
199187 top_srcdir = @top_srcdir@
200188 SUBDIRS = img
@@ -221,8 +209,8 @@
221209 @for dep in $?; do \
222210 case '$(am__configure_deps)' in \
223211 *$$dep*) \
224- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
225- && exit 0; \
212+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
213+ && { if test -f $@; then exit 0; else break; fi; }; \
226214 exit 1;; \
227215 esac; \
228216 done; \
@@ -339,8 +327,8 @@
339327 unique=`for i in $$list; do \
340328 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
341329 done | \
342- $(AWK) ' { files[$$0] = 1; } \
343- END { for (i in files) print i; }'`; \
330+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
331+ END { if (nonempty) { for (i in files) print i; }; }'`; \
344332 mkid -fID $$unique
345333 tags: TAGS
346334
@@ -365,8 +353,8 @@
365353 unique=`for i in $$list; do \
366354 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
367355 done | \
368- $(AWK) ' { files[$$0] = 1; } \
369- END { for (i in files) print i; }'`; \
356+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
357+ END { if (nonempty) { for (i in files) print i; }; }'`; \
370358 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
371359 test -n "$$unique" || unique=$$empty_fix; \
372360 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -376,13 +364,12 @@
376364 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
377365 $(TAGS_FILES) $(LISP)
378366 tags=; \
379- here=`pwd`; \
380367 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
381368 unique=`for i in $$list; do \
382369 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
383370 done | \
384- $(AWK) ' { files[$$0] = 1; } \
385- END { for (i in files) print i; }'`; \
371+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
372+ END { if (nonempty) { for (i in files) print i; }; }'`; \
386373 test -z "$(CTAGS_ARGS)$$tags$$unique" \
387374 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
388375 $$tags $$unique
--- sagcad/trunk/doc/de/img/Makefile.in (revision 58)
+++ sagcad/trunk/doc/de/img/Makefile.in (revision 59)
@@ -1,8 +1,8 @@
1-# Makefile.in generated by automake 1.10 from Makefile.am.
1+# Makefile.in generated by automake 1.10.2 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
88 # with or without modifications, as long as this notice is preserved.
@@ -30,9 +30,6 @@
3030 NORMAL_UNINSTALL = :
3131 PRE_UNINSTALL = :
3232 POST_UNINSTALL = :
33-build_triplet = @build@
34-host_triplet = @host@
35-target_triplet = @target@
3633 subdir = doc/de/img
3734 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
3835 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -84,6 +81,8 @@
8481 GMOFILES = @GMOFILES@
8582 GMSGFMT = @GMSGFMT@
8683 GREP = @GREP@
84+GTK_CFLAGS = @GTK_CFLAGS@
85+GTK_LIBS = @GTK_LIBS@
8786 INSTALL = @INSTALL@
8887 INSTALL_DATA = @INSTALL_DATA@
8988 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -105,6 +104,7 @@
105104 MKDIR_P = @MKDIR_P@
106105 MKINSTALLDIRS = @MKINSTALLDIRS@
107106 MSGFMT = @MSGFMT@
107+MSGFMT_OPTS = @MSGFMT_OPTS@
108108 OBJEXT = @OBJEXT@
109109 PACKAGE = @PACKAGE@
110110 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -142,11 +142,7 @@
142142 am__tar = @am__tar@
143143 am__untar = @am__untar@
144144 bindir = @bindir@
145-build = @build@
146145 build_alias = @build_alias@
147-build_cpu = @build_cpu@
148-build_os = @build_os@
149-build_vendor = @build_vendor@
150146 builddir = @builddir@
151147 datadir = @datadir@
152148 datarootdir = @datarootdir@
@@ -153,11 +149,7 @@
153149 docdir = @docdir@
154150 dvidir = @dvidir@
155151 exec_prefix = @exec_prefix@
156-host = @host@
157152 host_alias = @host_alias@
158-host_cpu = @host_cpu@
159-host_os = @host_os@
160-host_vendor = @host_vendor@
161153 htmldir = @htmldir@
162154 includedir = @includedir@
163155 infodir = @infodir@
@@ -173,16 +165,12 @@
173165 prefix = @prefix@
174166 program_transform_name = @program_transform_name@
175167 psdir = @psdir@
176-sagcadlocaledir = @sagcadlocaledir@
177168 sbindir = @sbindir@
178169 sharedstatedir = @sharedstatedir@
179170 srcdir = @srcdir@
180171 sysconfdir = @sysconfdir@
181-target = @target@
182172 target_alias = @target_alias@
183-target_cpu = @target_cpu@
184-target_os = @target_os@
185-target_vendor = @target_vendor@
173+top_build_prefix = @top_build_prefix@
186174 top_builddir = @top_builddir@
187175 top_srcdir = @top_srcdir@
188176 docdatadir = $(DOCDIR)/de/img
@@ -290,8 +278,8 @@
290278 @for dep in $?; do \
291279 case '$(am__configure_deps)' in \
292280 *$$dep*) \
293- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
294- && exit 0; \
281+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
282+ && { if test -f $@; then exit 0; else break; fi; }; \
295283 exit 1;; \
296284 esac; \
297285 done; \
--- sagcad/trunk/doc/ja/Makefile.in (revision 58)
+++ sagcad/trunk/doc/ja/Makefile.in (revision 59)
@@ -1,8 +1,8 @@
1-# Makefile.in generated by automake 1.10 from Makefile.am.
1+# Makefile.in generated by automake 1.10.2 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
88 # with or without modifications, as long as this notice is preserved.
@@ -30,9 +30,6 @@
3030 NORMAL_UNINSTALL = :
3131 PRE_UNINSTALL = :
3232 POST_UNINSTALL = :
33-build_triplet = @build@
34-host_triplet = @host@
35-target_triplet = @target@
3633 subdir = doc/ja
3734 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
3835 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -96,6 +93,8 @@
9693 GMOFILES = @GMOFILES@
9794 GMSGFMT = @GMSGFMT@
9895 GREP = @GREP@
96+GTK_CFLAGS = @GTK_CFLAGS@
97+GTK_LIBS = @GTK_LIBS@
9998 INSTALL = @INSTALL@
10099 INSTALL_DATA = @INSTALL_DATA@
101100 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -117,6 +116,7 @@
117116 MKDIR_P = @MKDIR_P@
118117 MKINSTALLDIRS = @MKINSTALLDIRS@
119118 MSGFMT = @MSGFMT@
119+MSGFMT_OPTS = @MSGFMT_OPTS@
120120 OBJEXT = @OBJEXT@
121121 PACKAGE = @PACKAGE@
122122 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -154,11 +154,7 @@
154154 am__tar = @am__tar@
155155 am__untar = @am__untar@
156156 bindir = @bindir@
157-build = @build@
158157 build_alias = @build_alias@
159-build_cpu = @build_cpu@
160-build_os = @build_os@
161-build_vendor = @build_vendor@
162158 builddir = @builddir@
163159 datadir = @datadir@
164160 datarootdir = @datarootdir@
@@ -165,11 +161,7 @@
165161 docdir = @docdir@
166162 dvidir = @dvidir@
167163 exec_prefix = @exec_prefix@
168-host = @host@
169164 host_alias = @host_alias@
170-host_cpu = @host_cpu@
171-host_os = @host_os@
172-host_vendor = @host_vendor@
173165 htmldir = @htmldir@
174166 includedir = @includedir@
175167 infodir = @infodir@
@@ -185,16 +177,12 @@
185177 prefix = @prefix@
186178 program_transform_name = @program_transform_name@
187179 psdir = @psdir@
188-sagcadlocaledir = @sagcadlocaledir@
189180 sbindir = @sbindir@
190181 sharedstatedir = @sharedstatedir@
191182 srcdir = @srcdir@
192183 sysconfdir = @sysconfdir@
193-target = @target@
194184 target_alias = @target_alias@
195-target_cpu = @target_cpu@
196-target_os = @target_os@
197-target_vendor = @target_vendor@
185+top_build_prefix = @top_build_prefix@
198186 top_builddir = @top_builddir@
199187 top_srcdir = @top_srcdir@
200188 SUBDIRS = img
@@ -221,8 +209,8 @@
221209 @for dep in $?; do \
222210 case '$(am__configure_deps)' in \
223211 *$$dep*) \
224- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
225- && exit 0; \
212+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
213+ && { if test -f $@; then exit 0; else break; fi; }; \
226214 exit 1;; \
227215 esac; \
228216 done; \
@@ -339,8 +327,8 @@
339327 unique=`for i in $$list; do \
340328 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
341329 done | \
342- $(AWK) ' { files[$$0] = 1; } \
343- END { for (i in files) print i; }'`; \
330+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
331+ END { if (nonempty) { for (i in files) print i; }; }'`; \
344332 mkid -fID $$unique
345333 tags: TAGS
346334
@@ -365,8 +353,8 @@
365353 unique=`for i in $$list; do \
366354 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
367355 done | \
368- $(AWK) ' { files[$$0] = 1; } \
369- END { for (i in files) print i; }'`; \
356+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
357+ END { if (nonempty) { for (i in files) print i; }; }'`; \
370358 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
371359 test -n "$$unique" || unique=$$empty_fix; \
372360 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -376,13 +364,12 @@
376364 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
377365 $(TAGS_FILES) $(LISP)
378366 tags=; \
379- here=`pwd`; \
380367 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
381368 unique=`for i in $$list; do \
382369 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
383370 done | \
384- $(AWK) ' { files[$$0] = 1; } \
385- END { for (i in files) print i; }'`; \
371+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
372+ END { if (nonempty) { for (i in files) print i; }; }'`; \
386373 test -z "$(CTAGS_ARGS)$$tags$$unique" \
387374 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
388375 $$tags $$unique
--- sagcad/trunk/doc/ja/img/Makefile.in (revision 58)
+++ sagcad/trunk/doc/ja/img/Makefile.in (revision 59)
@@ -1,8 +1,8 @@
1-# Makefile.in generated by automake 1.10 from Makefile.am.
1+# Makefile.in generated by automake 1.10.2 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
88 # with or without modifications, as long as this notice is preserved.
@@ -30,9 +30,6 @@
3030 NORMAL_UNINSTALL = :
3131 PRE_UNINSTALL = :
3232 POST_UNINSTALL = :
33-build_triplet = @build@
34-host_triplet = @host@
35-target_triplet = @target@
3633 subdir = doc/ja/img
3734 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
3835 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -84,6 +81,8 @@
8481 GMOFILES = @GMOFILES@
8582 GMSGFMT = @GMSGFMT@
8683 GREP = @GREP@
84+GTK_CFLAGS = @GTK_CFLAGS@
85+GTK_LIBS = @GTK_LIBS@
8786 INSTALL = @INSTALL@
8887 INSTALL_DATA = @INSTALL_DATA@
8988 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -105,6 +104,7 @@
105104 MKDIR_P = @MKDIR_P@
106105 MKINSTALLDIRS = @MKINSTALLDIRS@
107106 MSGFMT = @MSGFMT@
107+MSGFMT_OPTS = @MSGFMT_OPTS@
108108 OBJEXT = @OBJEXT@
109109 PACKAGE = @PACKAGE@
110110 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -142,11 +142,7 @@
142142 am__tar = @am__tar@
143143 am__untar = @am__untar@
144144 bindir = @bindir@
145-build = @build@
146145 build_alias = @build_alias@
147-build_cpu = @build_cpu@
148-build_os = @build_os@
149-build_vendor = @build_vendor@
150146 builddir = @builddir@
151147 datadir = @datadir@
152148 datarootdir = @datarootdir@
@@ -153,11 +149,7 @@
153149 docdir = @docdir@
154150 dvidir = @dvidir@
155151 exec_prefix = @exec_prefix@
156-host = @host@
157152 host_alias = @host_alias@
158-host_cpu = @host_cpu@
159-host_os = @host_os@
160-host_vendor = @host_vendor@
161153 htmldir = @htmldir@
162154 includedir = @includedir@
163155 infodir = @infodir@
@@ -173,16 +165,12 @@
173165 prefix = @prefix@
174166 program_transform_name = @program_transform_name@
175167 psdir = @psdir@
176-sagcadlocaledir = @sagcadlocaledir@
177168 sbindir = @sbindir@
178169 sharedstatedir = @sharedstatedir@
179170 srcdir = @srcdir@
180171 sysconfdir = @sysconfdir@
181-target = @target@
182172 target_alias = @target_alias@
183-target_cpu = @target_cpu@
184-target_os = @target_os@
185-target_vendor = @target_vendor@
173+top_build_prefix = @top_build_prefix@
186174 top_builddir = @top_builddir@
187175 top_srcdir = @top_srcdir@
188176 docdatadir = $(DOCDIR)/ja/img
@@ -290,8 +278,8 @@
290278 @for dep in $?; do \
291279 case '$(am__configure_deps)' in \
292280 *$$dep*) \
293- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
294- && exit 0; \
281+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
282+ && { if test -f $@; then exit 0; else break; fi; }; \
295283 exit 1;; \
296284 esac; \
297285 done; \
--- sagcad/trunk/configure.in (revision 58)
+++ sagcad/trunk/configure.in (revision 59)
@@ -89,12 +89,6 @@
8989
9090 # --- LOCALEDIR ---
9191 LOCALEDIR='${prefix}/${DATADIRNAME}/locale'
92-#win32=no
93-#case "${host_os}" in
94-# *mingw* | pw32* | cygwin*)
95-# win32="yes"
96-# LOCALEDIR='${prefix}/lib/locale'
97-#esac
9892 AC_SUBST(LOCALEDIR)
9993
10094 # --- DOCDIR ---
--- sagcad/trunk/font/Makefile.in (revision 58)
+++ sagcad/trunk/font/Makefile.in (revision 59)
@@ -1,8 +1,8 @@
1-# Makefile.in generated by automake 1.10 from Makefile.am.
1+# Makefile.in generated by automake 1.10.2 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
88 # with or without modifications, as long as this notice is preserved.
@@ -30,9 +30,6 @@
3030 NORMAL_UNINSTALL = :
3131 PRE_UNINSTALL = :
3232 POST_UNINSTALL = :
33-build_triplet = @build@
34-host_triplet = @host@
35-target_triplet = @target@
3633 subdir = font
3734 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
3835 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -84,6 +81,8 @@
8481 GMOFILES = @GMOFILES@
8582 GMSGFMT = @GMSGFMT@
8683 GREP = @GREP@
84+GTK_CFLAGS = @GTK_CFLAGS@
85+GTK_LIBS = @GTK_LIBS@
8786 INSTALL = @INSTALL@
8887 INSTALL_DATA = @INSTALL_DATA@
8988 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -105,6 +104,7 @@
105104 MKDIR_P = @MKDIR_P@
106105 MKINSTALLDIRS = @MKINSTALLDIRS@
107106 MSGFMT = @MSGFMT@
107+MSGFMT_OPTS = @MSGFMT_OPTS@
108108 OBJEXT = @OBJEXT@
109109 PACKAGE = @PACKAGE@
110110 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -142,11 +142,7 @@
142142 am__tar = @am__tar@
143143 am__untar = @am__untar@
144144 bindir = @bindir@
145-build = @build@
146145 build_alias = @build_alias@
147-build_cpu = @build_cpu@
148-build_os = @build_os@
149-build_vendor = @build_vendor@
150146 builddir = @builddir@
151147 datadir = @datadir@
152148 datarootdir = @datarootdir@
@@ -153,11 +149,7 @@
153149 docdir = @docdir@
154150 dvidir = @dvidir@
155151 exec_prefix = @exec_prefix@
156-host = @host@
157152 host_alias = @host_alias@
158-host_cpu = @host_cpu@
159-host_os = @host_os@
160-host_vendor = @host_vendor@
161153 htmldir = @htmldir@
162154 includedir = @includedir@
163155 infodir = @infodir@
@@ -173,16 +165,12 @@
173165 prefix = @prefix@
174166 program_transform_name = @program_transform_name@
175167 psdir = @psdir@
176-sagcadlocaledir = @sagcadlocaledir@
177168 sbindir = @sbindir@
178169 sharedstatedir = @sharedstatedir@
179170 srcdir = @srcdir@
180171 sysconfdir = @sysconfdir@
181-target = @target@
182172 target_alias = @target_alias@
183-target_cpu = @target_cpu@
184-target_os = @target_os@
185-target_vendor = @target_vendor@
173+top_build_prefix = @top_build_prefix@
186174 top_builddir = @top_builddir@
187175 top_srcdir = @top_srcdir@
188176 fontdatadir = $(FONTDIR)
@@ -199,8 +187,8 @@
199187 @for dep in $?; do \
200188 case '$(am__configure_deps)' in \
201189 *$$dep*) \
202- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
203- && exit 0; \
190+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
191+ && { if test -f $@; then exit 0; else break; fi; }; \
204192 exit 1;; \
205193 esac; \
206194 done; \
--- sagcad/trunk/aclocal.m4 (revision 58)
+++ sagcad/trunk/aclocal.m4 (revision 59)
@@ -1,7 +1,7 @@
1-# generated automatically by aclocal 1.10 -*- Autoconf -*-
1+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
22
33 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4-# 2005, 2006 Free Software Foundation, Inc.
4+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
55 # This file is free software; the Free Software Foundation
66 # gives unlimited permission to copy and/or distribute it,
77 # with or without modifications, as long as this notice is preserved.
@@ -11,10 +11,13 @@
1111 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1212 # PARTICULAR PURPOSE.
1313
14-m4_if(m4_PACKAGE_VERSION, [2.61],,
15-[m4_fatal([this file was generated for autoconf 2.61.
16-You have another version of autoconf. If you want to use that,
17-you should regenerate the build system entirely.], [63])])
14+m4_ifndef([AC_AUTOCONF_VERSION],
15+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
17+[m4_warning([this file was generated for autoconf 2.63.
18+You have another version of autoconf. It may work, but is not guaranteed to.
19+If you have problems, you may need to regenerate the build system entirely.
20+To do so, use the procedure documented by the package, typically `autoreconf'.])])
1821
1922 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
2023 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -223,6 +226,20 @@
223226 glib_save_LIBS="$LIBS"
224227 LIBS="$LIBS $INTLLIBS"
225228 AC_CHECK_FUNCS(dcgettext)
229+ MSGFMT_OPTS=
230+ AC_MSG_CHECKING([if msgfmt accepts -c])
231+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
232+msgid ""
233+msgstr ""
234+"Content-Type: text/plain; charset=UTF-8\n"
235+"Project-Id-Version: test 1.0\n"
236+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
237+"Last-Translator: test <foo@bar.xx>\n"
238+"Language-Team: C <LL@li.org>\n"
239+"MIME-Version: 1.0\n"
240+"Content-Transfer-Encoding: 8bit\n"
241+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
242+ AC_SUBST(MSGFMT_OPTS)
226243 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
227244 GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
228245 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
@@ -418,6 +435,23 @@
418435 AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
419436 ])dnl
420437
438+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
439+#
440+# Create a temporary file with TEST-FILE as its contents and pass the
441+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
442+# 0 and perform ACTION-IF-FAIL for any other exit status.
443+AC_DEFUN([GLIB_RUN_PROG],
444+[cat >conftest.foo <<_ACEOF
445+$2
446+_ACEOF
447+if AC_RUN_LOG([$1 conftest.foo]); then
448+ m4_ifval([$3], [$3], [:])
449+m4_ifvaln([$4], [else $4])dnl
450+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
451+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
452+fi])
453+
454+
421455 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
422456 #
423457 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
@@ -566,7 +600,7 @@
566600
567601 _PKG_TEXT
568602
569-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
603+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
570604 [$4])
571605 else
572606 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -576,7 +610,7 @@
576610 fi[]dnl
577611 ])# PKG_CHECK_MODULES
578612
579-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
613+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
580614 #
581615 # This file is free software; the Free Software Foundation
582616 # gives unlimited permission to copy and/or distribute it,
@@ -591,7 +625,7 @@
591625 [am__api_version='1.10'
592626 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
593627 dnl require some minimum version. Point them to the right macro.
594-m4_if([$1], [1.10], [],
628+m4_if([$1], [1.10.2], [],
595629 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
596630 ])
597631
@@ -605,10 +639,12 @@
605639 # AM_SET_CURRENT_AUTOMAKE_VERSION
606640 # -------------------------------
607641 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
608-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
642+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
609643 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
610-[AM_AUTOMAKE_VERSION([1.10])dnl
611-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
644+[AM_AUTOMAKE_VERSION([1.10.2])dnl
645+m4_ifndef([AC_AUTOCONF_VERSION],
646+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
647+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
612648
613649 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
614650
@@ -858,7 +894,7 @@
858894
859895 # Generate code to set up dependency tracking. -*- Autoconf -*-
860896
861-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
897+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
862898 # Free Software Foundation, Inc.
863899 #
864900 # This file is free software; the Free Software Foundation
@@ -865,50 +901,61 @@
865901 # gives unlimited permission to copy and/or distribute it,
866902 # with or without modifications, as long as this notice is preserved.
867903
868-#serial 3
904+#serial 5
869905
870906 # _AM_OUTPUT_DEPENDENCY_COMMANDS
871907 # ------------------------------
872908 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
873-[for mf in $CONFIG_FILES; do
874- # Strip MF so we end up with the name of the file.
875- mf=`echo "$mf" | sed -e 's/:.*$//'`
876- # Check whether this is an Automake generated Makefile or not.
877- # We used to match only the files named `Makefile.in', but
878- # some people rename them; so instead we look at the file content.
879- # Grep'ing the first line is not enough: some people post-process
880- # each Makefile.in and add a new line on top of each file to say so.
881- # Grep'ing the whole file is not good either: AIX grep has a line
882- # limit of 2048, but all sed's we know have understand at least 4000.
883- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
884- dirpart=`AS_DIRNAME("$mf")`
885- else
886- continue
887- fi
888- # Extract the definition of DEPDIR, am__include, and am__quote
889- # from the Makefile without running `make'.
890- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
891- test -z "$DEPDIR" && continue
892- am__include=`sed -n 's/^am__include = //p' < "$mf"`
893- test -z "am__include" && continue
894- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
895- # When using ansi2knr, U may be empty or an underscore; expand it
896- U=`sed -n 's/^U = //p' < "$mf"`
897- # Find all dependency output files, they are included files with
898- # $(DEPDIR) in their names. We invoke sed twice because it is the
899- # simplest approach to changing $(DEPDIR) to its actual value in the
900- # expansion.
901- for file in `sed -n "
902- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
903- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
904- # Make sure the directory exists.
905- test -f "$dirpart/$file" && continue
906- fdir=`AS_DIRNAME(["$file"])`
907- AS_MKDIR_P([$dirpart/$fdir])
908- # echo "creating $dirpart/$file"
909- echo '# dummy' > "$dirpart/$file"
909+[{
910+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
911+ # are listed without --file. Let's play safe and only enable the eval
912+ # if we detect the quoting.
913+ case $CONFIG_FILES in
914+ *\'*) eval set x "$CONFIG_FILES" ;;
915+ *) set x $CONFIG_FILES ;;
916+ esac
917+ shift
918+ for mf
919+ do
920+ # Strip MF so we end up with the name of the file.
921+ mf=`echo "$mf" | sed -e 's/:.*$//'`
922+ # Check whether this is an Automake generated Makefile or not.
923+ # We used to match only the files named `Makefile.in', but
924+ # some people rename them; so instead we look at the file content.
925+ # Grep'ing the first line is not enough: some people post-process
926+ # each Makefile.in and add a new line on top of each file to say so.
927+ # Grep'ing the whole file is not good either: AIX grep has a line
928+ # limit of 2048, but all sed's we know have understand at least 4000.
929+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
930+ dirpart=`AS_DIRNAME("$mf")`
931+ else
932+ continue
933+ fi
934+ # Extract the definition of DEPDIR, am__include, and am__quote
935+ # from the Makefile without running `make'.
936+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
937+ test -z "$DEPDIR" && continue
938+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
939+ test -z "am__include" && continue
940+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
941+ # When using ansi2knr, U may be empty or an underscore; expand it
942+ U=`sed -n 's/^U = //p' < "$mf"`
943+ # Find all dependency output files, they are included files with
944+ # $(DEPDIR) in their names. We invoke sed twice because it is the
945+ # simplest approach to changing $(DEPDIR) to its actual value in the
946+ # expansion.
947+ for file in `sed -n "
948+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
949+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
950+ # Make sure the directory exists.
951+ test -f "$dirpart/$file" && continue
952+ fdir=`AS_DIRNAME(["$file"])`
953+ AS_MKDIR_P([$dirpart/$fdir])
954+ # echo "creating $dirpart/$file"
955+ echo '# dummy' > "$dirpart/$file"
956+ done
910957 done
911-done
958+}
912959 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
913960
914961
@@ -940,13 +987,13 @@
940987 # Do all the work for Automake. -*- Autoconf -*-
941988
942989 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
943-# 2005, 2006 Free Software Foundation, Inc.
990+# 2005, 2006, 2008 Free Software Foundation, Inc.
944991 #
945992 # This file is free software; the Free Software Foundation
946993 # gives unlimited permission to copy and/or distribute it,
947994 # with or without modifications, as long as this notice is preserved.
948995
949-# serial 12
996+# serial 13
950997
951998 # This macro actually does too much. Some checks are only needed if
952999 # your package does certain things. But this isn't really a big deal.
@@ -1051,16 +1098,17 @@
10511098 # our stamp files there.
10521099 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
10531100 [# Compute $1's index in $config_headers.
1101+_am_arg=$1
10541102 _am_stamp_count=1
10551103 for _am_header in $config_headers :; do
10561104 case $_am_header in
1057- $1 | $1:* )
1105+ $_am_arg | $_am_arg:* )
10581106 break ;;
10591107 * )
10601108 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
10611109 esac
10621110 done
1063-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
1111+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
10641112
10651113 # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
10661114 #
@@ -1242,13 +1290,13 @@
12421290
12431291 # Helper functions for option handling. -*- Autoconf -*-
12441292
1245-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
1293+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
12461294 #
12471295 # This file is free software; the Free Software Foundation
12481296 # gives unlimited permission to copy and/or distribute it,
12491297 # with or without modifications, as long as this notice is preserved.
12501298
1251-# serial 3
1299+# serial 4
12521300
12531301 # _AM_MANGLE_OPTION(NAME)
12541302 # -----------------------
@@ -1265,7 +1313,7 @@
12651313 # ----------------------------------
12661314 # OPTIONS is a space-separated list of Automake options.
12671315 AC_DEFUN([_AM_SET_OPTIONS],
1268-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
1316+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
12691317
12701318 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
12711319 # -------------------------------------------
@@ -1361,7 +1409,7 @@
13611409
13621410 # _AM_SUBST_NOTMAKE(VARIABLE)
13631411 # ---------------------------
1364-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
1412+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
13651413 # This macro is traced by Automake.
13661414 AC_DEFUN([_AM_SUBST_NOTMAKE])
13671415
--- sagcad/trunk/examples/Makefile.in (revision 58)
+++ sagcad/trunk/examples/Makefile.in (revision 59)
@@ -1,8 +1,8 @@
1-# Makefile.in generated by automake 1.10 from Makefile.am.
1+# Makefile.in generated by automake 1.10.2 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
66 # This Makefile.in is free software; the Free Software Foundation
77 # gives unlimited permission to copy and/or distribute it,
88 # with or without modifications, as long as this notice is preserved.
@@ -30,9 +30,6 @@
3030 NORMAL_UNINSTALL = :
3131 PRE_UNINSTALL = :
3232 POST_UNINSTALL = :
33-build_triplet = @build@
34-host_triplet = @host@
35-target_triplet = @target@
3633 subdir = examples
3734 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
3835 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -84,6 +81,8 @@
8481 GMOFILES = @GMOFILES@
8582 GMSGFMT = @GMSGFMT@
8683 GREP = @GREP@
84+GTK_CFLAGS = @GTK_CFLAGS@
85+GTK_LIBS = @GTK_LIBS@
8786 INSTALL = @INSTALL@
8887 INSTALL_DATA = @INSTALL_DATA@
8988 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -105,6 +104,7 @@
105104 MKDIR_P = @MKDIR_P@
106105 MKINSTALLDIRS = @MKINSTALLDIRS@
107106 MSGFMT = @MSGFMT@
107+MSGFMT_OPTS = @MSGFMT_OPTS@
108108 OBJEXT = @OBJEXT@
109109 PACKAGE = @PACKAGE@
110110 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -142,11 +142,7 @@
142142 am__tar = @am__tar@
143143 am__untar = @am__untar@
144144 bindir = @bindir@
145-build = @build@
146145 build_alias = @build_alias@
147-build_cpu = @build_cpu@
148-build_os = @build_os@
149-build_vendor = @build_vendor@
150146 builddir = @builddir@
151147 datadir = @datadir@
152148 datarootdir = @datarootdir@
@@ -153,11 +149,7 @@
153149 docdir = @docdir@
154150 dvidir = @dvidir@
155151 exec_prefix = @exec_prefix@
156-host = @host@
157152 host_alias = @host_alias@
158-host_cpu = @host_cpu@
159-host_os = @host_os@
160-host_vendor = @host_vendor@
161153 htmldir = @htmldir@
162154 includedir = @includedir@
163155 infodir = @infodir@
@@ -173,16 +165,12 @@
173165 prefix = @prefix@
174166 program_transform_name = @program_transform_name@
175167 psdir = @psdir@
176-sagcadlocaledir = @sagcadlocaledir@
177168 sbindir = @sbindir@
178169 sharedstatedir = @sharedstatedir@
179170 srcdir = @srcdir@
180171 sysconfdir = @sysconfdir@
181-target = @target@
182172 target_alias = @target_alias@
183-target_cpu = @target_cpu@
184-target_os = @target_os@
185-target_vendor = @target_vendor@
173+top_build_prefix = @top_build_prefix@
186174 top_builddir = @top_builddir@
187175 top_srcdir = @top_srcdir@
188176 exampledatadir = $(EXAMPLEDIR)
@@ -198,8 +186,8 @@
198186 @for dep in $?; do \
199187 case '$(am__configure_deps)' in \
200188 *$$dep*) \
201- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
202- && exit 0; \
189+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
190+ && { if test -f $@; then exit 0; else break; fi; }; \
203191 exit 1;; \
204192 esac; \
205193 done; \
Show on old repository browser