- fixes and preparations for building with libtool
diff -purNX .cvsignore ../mknetrel.jcn2.debug/ChangeLog ./ChangeLog
--- ../mknetrel.jcn2.debug/ChangeLog Tue Jul 9 01:17:29 2002
+++ ./ChangeLog Tue Jul 9 01:17:09 2002
@@ -1,5 +1,15 @@
2002-07-08 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+ * VERSION mknetrel.jcn3.libtool
+
+ * README: Add build_ld in description on ~/.mknetrel.
+
+ * bin/mknetrel (read_user_config): Add build_ld as configurable
+ var.
+ (doconfig): Set LD to help libtool detect that dlopen/dlpreopen
+ work. Move preconfig call up, so that $build_config_opts may be
+ overridden.
+
* VERSION mknetrel.jcn2.debug
* .cvsignore: Add .bash_mknetrel.
diff -purNX .cvsignore ../mknetrel.jcn2.debug/README ./README
--- ../mknetrel.jcn2.debug/README Mon Jul 8 23:59:14 2002
+++ ./README Mon Jul 8 23:59:23 2002
@@ -53,6 +53,7 @@ something like this in your ~/.mknetrel:
build_cxx='g++'
build_cc='gcc'
+ build_ld='ld'
build_ranlib='ranlib'
build_dllwrap='dllwrap'
build_ar='ar'
diff -purNX .cvsignore ../mknetrel.jcn2.debug/bin/mknetrel ./bin/mknetrel
--- ../mknetrel.jcn2.debug/bin/mknetrel Tue Jul 9 01:07:05 2002
+++ ./bin/mknetrel Tue Jul 9 01:07:18 2002
@@ -6,6 +6,7 @@ read_user_config() {
: ${cygwin_root=/cygwin}
: ${build_cxx='i686-pc-cygwin-g++'}
: ${build_cc='i686-pc-cygwin-gcc'}
+ : ${build_ld='i686-pc-cygwin-ld'}
: ${build_ranlib='i686-pc-cygwin-ranlib'}
: ${build_dllwrap='i686-pc-cygwin-dllwrap'}
: ${build_ar='i686-pc-cygwin-ar'}
@@ -162,9 +163,9 @@ mystrip() {
}
doconfig() {
- CONFIGOPTS="${build_config_opts} "'--enable-haifa --prefix=/usr
--exec-prefix=/usr --sysconfdir=/etc --libdir=/usr/lib
--includedir=/nonexistent/include --libexecdir=/usr/sbin
--disable-version-specific-runtime-libs'
preconfig || exit 1
- CXX="${build_cxx}" CXX_FOR_TARGET="${build_cc}" CC="${build_cc}"
CC_FOR_TARGET="${build_cc}" GCC_FOR_TARGET="${build_cc}" RANLIB="${build_ranlib}"
DLLWRAP="${build_dllwrap}" AR="${build_ar}" NM="${build_nm}" $src/configure
$CONFIGOPTS || exit 1
+ CONFIGOPTS="${build_config_opts} "'--enable-haifa --prefix=/usr
+--exec-prefix=/usr --sysconfdir=/etc --libdir=/usr/lib
+--includedir=/nonexistent/include --libexecdir=/usr/sbin
+--disable-version-specific-runtime-libs'
+ CXX="${build_cxx}" CXX_FOR_TARGET="${build_cc}" CC="${build_cc}"
+CC_FOR_TARGET="${build_cc}" GCC_FOR_TARGET="${build_cc}" LD="${build_ld}"
+RANLIB="${build_ranlib}" DLLWRAP="${build_dllwrap}" AR="${build_ar}" NM="${build_nm}"
+$src/configure $CONFIGOPTS || exit 1
postconfig || exit 1
}
--
Jan Nieuwenhuizen <[EMAIL PROTECTED]> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien | http://www.lilypond.org