[Gnucash-changes] r14288 - gnucash/trunk - * configure.in: Don't need to patch libtool for darwin anymore.

Derek Atkins warlord at cvs.gnucash.org
Thu Jun 1 17:02:42 EDT 2006


Author: warlord
Date: 2006-06-01 17:02:42 -0400 (Thu, 01 Jun 2006)
New Revision: 14288
Trac: http://svn.gnucash.org/trac/changeset/14288

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/configure.in
   gnucash/trunk/src/gnome-utils/dialog-preferences.c
Log:
	* configure.in: Don't need to patch libtool for darwin anymore.
	  Patch by David Reiser.
	* src/gnome-utils/dialog-preferences.c: fix non-C99 construct so
	  the file builds again.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-06-01 15:30:41 UTC (rev 14287)
+++ gnucash/trunk/ChangeLog	2006-06-01 21:02:42 UTC (rev 14288)
@@ -1,3 +1,10 @@
+2006-06-01  Derek Atkins  <derek at ihtfp.com>
+
+	* configure.in: Don't need to patch libtool for darwin anymore.
+	  Patch by David Reiser.
+	* src/gnome-utils/dialog-preferences.c: fix non-C99 construct so
+	  the file builds again.
+
 2006-06-01  Andreas Köhler  <andi5.py at gmx.net>
 
 	* src/gnome-utils/dialog-preferences.c: Do not try to find

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2006-06-01 15:30:41 UTC (rev 14287)
+++ gnucash/trunk/configure.in	2006-06-01 21:02:42 UTC (rev 14288)
@@ -213,14 +213,15 @@
 update to latest  darwin])
 		;;
 	darwin*)
-                AC_CHECK_HEADERS(popt.h)
-		AC_MSG_RESULT([yes, patching libtool to always build dylibs])
-		mv libtool libtool.old
-		${SED} -e 's/^deplibs_check_method.*/deplibs_check_method=pass_all/g' \
-			-e 's|^library_names_spec.*|library_names_spec="\\$libname\\$release\\$versuffix.dylib \\$libname\\$release\\${major}.dylib \\$libname.dylib"|g' \
-			-e 's|^soname_spec.*|soname_spec="\\$libname\\$release\\$major.dylib"|g' \
-			< libtool.old > libtool
-		rm libtool.old
+		AC_MSG_RESULT([yes, moving on...])
+#		AC_CHECK_HEADERS(popt.h)
+#		AC_MSG_RESULT([yes, patching libtool to always build dylibs])
+#		mv libtool libtool.old
+#		${SED} -e 's/^deplibs_check_method.*/deplibs_check_method=pass_all/g' \
+#			-e 's|^library_names_spec.*|library_names_spec="\\$libname\\$release\\$versuffix.dylib \\$libname\\$release\\${major}.dylib \\$libname.dylib"|g' \
+#			-e 's|^soname_spec.*|soname_spec="\\$libname\\$release\\$major.dylib"|g' \
+#			< libtool.old > libtool
+#		rm libtool.old
 		;;
 	*)
 		AC_MSG_RESULT(no)

Modified: gnucash/trunk/src/gnome-utils/dialog-preferences.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-preferences.c	2006-06-01 15:30:41 UTC (rev 14287)
+++ gnucash/trunk/src/gnome-utils/dialog-preferences.c	2006-06-01 21:02:42 UTC (rev 14288)
@@ -335,7 +335,7 @@
 static GtkWidget *
 gnc_prefs_find_page (GtkNotebook *notebook, const gchar *name)
 {
-  int n_pages;
+  int n_pages, i;
   GtkWidget *child;
   const gchar *child_name;
 
@@ -346,7 +346,7 @@
 
   n_pages = gtk_notebook_get_n_pages (notebook);
 
-  for (int i=0; i<n_pages; i++) {
+  for (i=0; i<n_pages; i++) {
     child = gtk_notebook_get_nth_page (notebook, i);
     g_return_val_if_fail (child, NULL);
 



More information about the gnucash-changes mailing list