[Gnucash-changes] r11854 - gnucash/trunk - OSX: using GNU sed and
documenting autogen changes
Neil Williams
codehelp at cvs.gnucash.org
Sun Nov 6 08:18:08 EST 2005
Author: codehelp
Date: 2005-11-06 08:18:07 -0500 (Sun, 06 Nov 2005)
New Revision: 11854
Modified:
gnucash/trunk/README.svn
gnucash/trunk/configure.in
Log:
OSX: using GNU sed and documenting autogen changes
Modified: gnucash/trunk/README.svn
===================================================================
--- gnucash/trunk/README.svn 2005-11-06 13:16:09 UTC (rev 11853)
+++ gnucash/trunk/README.svn 2005-11-06 13:18:07 UTC (rev 11854)
@@ -4,20 +4,25 @@
Owen Taylor.
+ In order to build GnuCash from SVN, you need to run the autogen.sh
- command to generate and execute a configure script. When building
- from SVN you should ALWAYS pass your configure options directly to
- autogen.sh. For example:
+ command to generate a configure script and other files. autogen.sh does
+ NOT accept any options but it may output some options that you should
+ add to your own ./configure command.
- ./autogen.sh --enable-ofx --enable-opt-style-install --prefix=/opt/gnucash
+ For example:
- Autogen will automatically generate the configure script and then
- run it WITH SPECIAL ARGUMENTS to make sure certain files get built.
+ ./autogen.sh
+
+ ./configure --enable-maintainer-mode --enable-error-on-warning \
+ --enable-compiler-warnings --enable-ofx --enable-opt-style-install \
+ --prefix=/opt/gnucash
+
+ Autogen will automatically generate the configure script but you must
+ run it WITH SPECIAL ARGUMENTS to make sure that certain files get built.
If you run "configure" without these special arguments, it is very likely
- that GnuCash will fail to build. Therefore, do not run configure by
- hand.
+ that GnuCash will fail to build.
If in doubt, you can run autogen.sh, run ./configure --help,
- then re-run autogen.sh with your options.
+ then re-run ./configure with your options.
+ Some versions of gettextize don't deal well with re-running themselves.
You will see this as an error like:
@@ -95,3 +100,7 @@
Derek Atkins
November 21, 2002
+
+Neil Williams
+November 6th, 2005
+
Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in 2005-11-06 13:16:09 UTC (rev 11853)
+++ gnucash/trunk/configure.in 2005-11-06 13:18:07 UTC (rev 11854)
@@ -74,8 +74,11 @@
AM_MAINTAINER_MODE
-AC_CONFIG_MACRO_DIR(macros)
+# Enable only when we have autoconf --version >= 2.59
+# on all platforms. Note that AC_PREREQ(2.59) may be
+# insufficient to actually use v2.59 on OSX
+#AC_CONFIG_MACRO_DIR(macros)
AC_PROG_INSTALL
@@ -169,6 +172,8 @@
#AC_SEARCH_LIBS(gettext, intl, ,[
# AC_MSG_ERROR([Cannot find gettext -- do you need to build -lintl?])], )
+AC_SUBST(SED)
+
AC_MSG_CHECKING(for darwin)
case $host_os in
rhapsody* | darwin1*)
@@ -177,20 +182,10 @@
update to latest darwin])
;;
darwin*)
- dnl Use fink under MacOS X to find popt
- AC_MSG_CHECKING(for fink support)
- if test -d "/sw/lib" -a -d "/sw/include"; then
- AM_CFLAGS="$AM_CFLAGS -I/sw/include"
- LDFLAGS="$LDFLAGS -L/sw/lib"
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
- AC_CHECK_HEADERS(popt.h)
+ 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|^archive_cmds.*|archive_cmds="$CC -dynamiclib \\$allow_undefined_flag -o \\$lib \\$libobjs \\$deplibs\\$linker_flags -install_name \\$rpath/\\$soname \\$verstring"|g' \
+ ${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
@@ -1075,8 +1070,8 @@
dnl GIVEN_CFLAGS=$(echo $GIVEN_CFLAGS | sed -e "s;-I/sw/include ;;" | sed -e "s;-I/sw/include$;;")
case $host_os in
darwin*)
- GTKHTML_CFLAGS=$(echo $GTKHTML_CFLAGS | sed -e "s;-I/sw/include ;;" | sed -e "s;-I/sw/include$;;")
- GTKHTML_CFLAGS=$(echo $GTKHTML_CFLAGS | sed -e "s;-I/sw/include/gtkhtml ;;" | sed -e "s;-I/sw/includ/gtkhtmle$;;")
+ GTKHTML_CFLAGS=$(echo $GTKHTML_CFLAGS | ${SED} -e "s;-I/sw/include ;;" | ${SED} -e "s;-I/sw/include$;;")
+ GTKHTML_CFLAGS=$(echo $GTKHTML_CFLAGS | ${SED} -e "s;-I/sw/include/gtkhtml ;;" | ${SED} -e "s;-I/sw/includ/gtkhtmle$;;")
;;
esac
AC_SUBST(GTKHTML_CFLAGS)
More information about the gnucash-changes
mailing list