e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Remove explicit -L <prefix>/lib from LDFLAGS. Cleanups. 

SVN revision: 38956
This commit is contained in:
Kim Woelders 2009-02-05 17:34:44 +00:00
parent 93e3d61baf
commit 97c4d8dfb5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -118,8 +118,11 @@ if test "x$enable_sound_esound" = "xyes"; then
fi
AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound_esound" = "xyes")
# Save CPPFLAGS/LDFLAGS and add X_... to each
SAVE_CPPFLAGS="$CPPFLAGS"
SAVE_LDFLAGS="$LDFLAGS"
CPPFLAGS="$X_CFLAGS $CPPFLAGS"
LDFLAGS="$X_LIBS $LDFLAGS -L$prefix/lib"
LDFLAGS="$X_LIBS $LDFLAGS"
PKG_CHECK_MODULES(IMLIB2, imlib2 >= 1.2.0, have_good_imlib2=yes)
AC_CHECK_LIB(Imlib2, imlib_context_set_mask_alpha_threshold,
@ -288,6 +291,10 @@ AC_CHECK_LIB(Fridge,mass_quantities_of_any_ale,, [
echo " We highly suggest that you rectify this situation immediately."
])
# Restore CPPFLAGS/LDFLAGS
CPPFLAGS="$SAVE_CPPFLAGS"
LDFLAGS="$SAVE_LDFLAGS"
AC_ARG_ENABLE(roothacklib,
[ --enable-roothacklib build window mode helper library @<:@default=yes@:>@],,
enable_roothacklib=yes)

2
lib/Makefile.am
View File

@ -5,7 +5,7 @@ if BUILD_ROOTHACKLIB
libe16_LTLIBRARIES = libhack.la
libhack_la_SOURCES = e16_hack.c
libhack_la_CPPFLAGS = -I$(top_srcdir)/src $(CWARNFLAGS)
libhack_la_CPPFLAGS = -I$(top_srcdir)/src $(X_CFLAGS) $(CWARNFLAGS)
libhack_la_LIBADD = $(DLOPEN_LIBS)
libhack_la_LDFLAGS = -avoid-version