[Hdrflow-svn] SF.net SVN: hdrflow: [385] trunk/lib/openlibraries
Status: Pre-Alpha
Brought to you by:
glslang
|
From: <gl...@us...> - 2007-12-01 17:48:18
|
Revision: 385
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=385&view=rev
Author: glslang
Date: 2007-12-01 09:48:15 -0800 (Sat, 01 Dec 2007)
Log Message:
-----------
+ patch libtool to control generated install names on OS/X
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
Added Paths:
-----------
trunk/lib/openlibraries/m4/install_name.m4
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-11-18 13:37:44 UTC (rev 384)
+++ trunk/lib/openlibraries/configure.ac 2007-12-01 17:48:15 UTC (rev 385)
@@ -43,6 +43,8 @@
AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
+AC_CHECK_INSTALLNAME( )
+
dnl dl support
AC_CHECK_LIB(dl, dlopen,
have_dl=yes DL_LIBS="-ldl",
Added: trunk/lib/openlibraries/m4/install_name.m4
===================================================================
--- trunk/lib/openlibraries/m4/install_name.m4 (rev 0)
+++ trunk/lib/openlibraries/m4/install_name.m4 2007-12-01 17:48:15 UTC (rev 385)
@@ -0,0 +1,25 @@
+
+#
+# change libtool install_name defaults on OS/X
+#
+
+AC_DEFUN([AC_CHECK_INSTALLNAME],[
+ AC_ARG_ENABLE(installname, AC_HELP_STRING([--enable-installname], [enable install name]),
+ [enableinstallname=$enableval],
+ [enableinstallname=no])
+ AC_ARG_WITH(installnameprefix, AC_HELP_STRING([--with-installnameprefix], [install name prefix]),,with_installnameprefix="")
+
+ case $host in
+ *-apple-darwin*)
+ AC_MSG_CHECKING(libtool for install name)
+ if test x"$enableinstallname" = x"yes" ; then
+ test -f libtool || (mv libtool libtool.old && cp libtool.old libtool)
+ sed -e "s/install_name \\\\\$rpath\/\\\\\$soname/install_name $with_installnameprefix\/\\\\\$soname/g" libtool > libtool.new
+ mv libtool.new libtool
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+ ;;
+ esac
+])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|