Author: borisk
Date: Thu Jan 28 11:24:15 2010
New Revision: 904040
URL: http://svn.apache.org/viewvc?rev=904040&view=rev
Log:
Execute libtool patching code for --disable-rpath in config.guess instead of
configure since now libtool is created in in config.guess.
Modified:
xerces/c/trunk/configure.ac
Modified: xerces/c/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/configure.ac?rev=904040&r1=904039&r2=904040&view=diff
==============================================================================
--- xerces/c/trunk/configure.ac (original)
+++ xerces/c/trunk/configure.ac Thu Jan 28 11:24:15 2010
@@ -74,13 +74,15 @@
AC_MSG_ERROR([Cannot find a valid 'ar' tool]))
# Patch libtool to not use rpath if requested.
-if test "$xerces_cv_rpath" = "no"; then
- AC_MSG_RESULT([Patching libtool to not use rpath.])
- sed < libtool > libtool-2 \
- 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec="
-D__LIBTOOL_NO_RPATH__ "/'
- mv libtool-2 libtool
- chmod 755 libtool
-fi
+#
+AC_CONFIG_COMMANDS([libtool-rpath-patch],
+[if test "$libtool_patch_use_rpath" = "no"; then
+ echo config.status: patching libtool to not use rpath
+ sed < libtool > libtool-2
's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec="
-D__LIBTOOL_NO_RPATH__ "/'
+ mv libtool-2 libtool
+ chmod 755 libtool
+fi],
+[libtool_patch_use_rpath=$xerces_cv_rpath])
# Export information on whether we are building static/shared libraries.
# enable_shared and enable_static are defined by AC_PROG_LIBTOOL.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
