On Wednesday 31 August 2005 10:23 am, Michael Jennings wrote: > On Wednesday, 31 August 2005, at 01:43:47 (-0400), > > Mike Frysinger wrote: > > it makes a difference to us distro maintainers who wish to remove it > > To what end? What do you hope to accomplish? What does removing it > gain you that makes it worth the effort (not to mention the added > configure/Makefile cruft)?
well, as you can see, some distro's like to clamp down on RPATH's (for whatever reasons/policies/boredom) so Eterm is going to be changed, it'd just be nice if we could do it with a simple ./configure option rather than patching it ourselves ;) -mike
Index: configure.in =================================================================== RCS file: /cvsroot/enlightenment/eterm/Eterm/configure.in,v retrieving revision 1.93 diff -u -p -r1.93 configure.in --- configure.in 14 Jun 2005 19:39:00 -0000 1.93 +++ configure.in 31 Aug 2005 22:07:29 -0000 @@ -235,6 +235,24 @@ AC_SEARCH_LIBS(logout, util) AC_SEARCH_LIBS(getpwuid, sun) dnl# +dnl# Portable RPATH settings +dnl# +AC_MSG_CHECKING(how to define RPATH) +AC_ARG_ENABLE(default-rpaths, [ --disable-default-rpaths do not add default paths to RPATH], [ + if test "$enableval" == "no"; then + enable_default_rpaths=no + else + enable_default_rpaths=yes + fi], [enable_default_rpaths=yes]) +if test "$enable_default_rpaths" = "yes"; then + ETERM_RPATHS="\$(libdir):\$(pkglibdir)" +else + ETERM_RPATHS="\$(pkglibdir)" +fi +AC_SUBST(ETERM_RPATHS) +AC_MSG_RESULT($ETERM_RPATHS) + +dnl# dnl# Utility stuff dnl# dnl# Did they want debugging? Index: utils/Makefile.am =================================================================== RCS file: /cvsroot/enlightenment/eterm/Eterm/utils/Makefile.am,v retrieving revision 1.8 diff -u -p -r1.8 Makefile.am --- utils/Makefile.am 15 Mar 2005 21:48:14 -0000 1.8 +++ utils/Makefile.am 31 Aug 2005 22:07:29 -0000 @@ -4,7 +4,7 @@ bin_PROGRAMS = Esetroot Etbg Ettable bin_SCRIPTS = Etcolors Etsearch kEsetroot Etbg_update_list Esetroot_SOURCES = Esetroot.c -Esetroot_LDFLAGS = -rpath $(libdir):$(pkglibdir) +Esetroot_LDFLAGS = -rpath $(ETERM_RPATHS) Etbg_SOURCES = Etbg.c Ettable_SOURCES = Ettable.c Index: src/Makefile.am =================================================================== RCS file: /cvsroot/enlightenment/eterm/Eterm/src/Makefile.am,v retrieving revision 1.30 diff -u -p -r1.30 Makefile.am --- src/Makefile.am 14 Jun 2005 19:39:01 -0000 1.30 +++ src/Makefile.am 31 Aug 2005 22:07:29 -0000 @@ -36,7 +36,7 @@ endif Eterm_SOURCES = main.c Eterm_DEPENDENCIES = libEterm.la -Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir) +Eterm_LDFLAGS = -rpath $(ETERM_RPATHS) Eterm_LDADD = libEterm.la EXTRA_DIST = mmx_cmod.S sse2_cmod.c
