callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

introduce automake conditional USE_BINRELOC.

Browse Source 
2006-02-19  Manish Singh  <yosh@gimp.org>

        * m4macros/binreloc.m4: introduce automake conditional USE_BINRELOC.

        * app/Makefile.am: ... and use the above here, so that -rpath is only
        specified when binreloc functionality is enabled. Fixes bug #331677.
This commit is contained in:
Manish Singh
2006-02-19 17:44:57 +00:00
committed by Manish Singh
parent 1b01b29548
commit d0729e4cc1
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-02-19 Manish Singh <yosh@gimp.org>
* m4macros/binreloc.m4: introduce automake conditional USE_BINRELOC.
* app/Makefile.am: ... and use the above here, so that -rpath is only
specified when binreloc functionality is enabled. Fixes bug #331677.
2006-02-19 Sven Neumann <sven@gimp.org> 2006-02-19 Sven Neumann <sven@gimp.org>
* plug-ins/common/gif.c (save_image): removed warning when reusing * plug-ins/common/gif.c (save_image): removed warning when reusing

2
app/Makefile.am
View File

@ -71,7 +71,7 @@ endif
if OS_WIN32 if OS_WIN32
mwindows = -mwindows mwindows = -mwindows
endif endif
if OS_UNIX if USE_BINRELOC
munix = -Wl,-rpath '-Wl,$$ORIGIN/../lib' munix = -Wl,-rpath '-Wl,$$ORIGIN/../lib'
endif endif

1
m4macros/binreloc.m4
View File

@ -71,4 +71,5 @@ AC_DEFUN([AM_BINRELOC],
fi fi
AC_SUBST(BINRELOC_CFLAGS) AC_SUBST(BINRELOC_CFLAGS)
AC_SUBST(BINRELOC_LIBS) AC_SUBST(BINRELOC_LIBS)
AM_CONDITIONAL(USE_BINRELOC, test x$br_cv_binreloc = xyes)
]) ])