* 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.



git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14288 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins 2006-06-01 21:02:42 +00:00
parent 877ddc61d9
commit ecf8603602
3 changed files with 18 additions and 10 deletions

View File

@ -1,3 +1,10 @@
2006-06-01 Derek Atkins <derek@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@gmx.net> 2006-06-01 Andreas Köhler <andi5.py@gmx.net>
* src/gnome-utils/dialog-preferences.c: Do not try to find * src/gnome-utils/dialog-preferences.c: Do not try to find

View File

@ -213,14 +213,15 @@ case $host_os in
update to latest darwin]) update to latest darwin])
;; ;;
darwin*) darwin*)
AC_CHECK_HEADERS(popt.h) AC_MSG_RESULT([yes, moving on...])
AC_MSG_RESULT([yes, patching libtool to always build dylibs]) # AC_CHECK_HEADERS(popt.h)
mv libtool libtool.old # AC_MSG_RESULT([yes, patching libtool to always build dylibs])
${SED} -e 's/^deplibs_check_method.*/deplibs_check_method=pass_all/g' \ # mv libtool libtool.old
-e 's|^library_names_spec.*|library_names_spec="\\$libname\\$release\\$versuffix.dylib \\$libname\\$release\\${major}.dylib \\$libname.dylib"|g' \ # ${SED} -e 's/^deplibs_check_method.*/deplibs_check_method=pass_all/g' \
-e 's|^soname_spec.*|soname_spec="\\$libname\\$release\\$major.dylib"|g' \ # -e 's|^library_names_spec.*|library_names_spec="\\$libname\\$release\\$versuffix.dylib \\$libname\\$release\\${major}.dylib \\$libname.dylib"|g' \
< libtool.old > libtool # -e 's|^soname_spec.*|soname_spec="\\$libname\\$release\\$major.dylib"|g' \
rm libtool.old # < libtool.old > libtool
# rm libtool.old
;; ;;
*) *)
AC_MSG_RESULT(no) AC_MSG_RESULT(no)

View File

@ -335,7 +335,7 @@ struct copy_data {
static GtkWidget * static GtkWidget *
gnc_prefs_find_page (GtkNotebook *notebook, const gchar *name) gnc_prefs_find_page (GtkNotebook *notebook, const gchar *name)
{ {
int n_pages; int n_pages, i;
GtkWidget *child; GtkWidget *child;
const gchar *child_name; const gchar *child_name;
@ -346,7 +346,7 @@ gnc_prefs_find_page (GtkNotebook *notebook, const gchar *name)
n_pages = gtk_notebook_get_n_pages (notebook); 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); child = gtk_notebook_get_nth_page (notebook, i);
g_return_val_if_fail (child, NULL); g_return_val_if_fail (child, NULL);