From: Gábor Gombás <[email protected]>
Having these can cause trouble if there are already previous versions
of the BOINC libraries installed since the binaries will be linked with
the installed versions of the libraries rather than the newly built
ones.
---
api/Makefile.am | 4 ++--
lib/Makefile.am | 6 +++---
m4/ax_check_gl.m4 | 6 +++---
m4/ax_check_glu.m4 | 4 ++--
m4/ax_check_glut.m4 | 4 ++--
sched/Makefile.am | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/api/Makefile.am b/api/Makefile.am
index 04fcf78..2b42fd6 100644
--- a/api/Makefile.am
+++ b/api/Makefile.am
@@ -35,12 +35,12 @@ endif
lib_LTLIBRARIES = libboinc_api.la
libboinc_api_la_SOURCES = $(api_files)
-libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number
$(LIBBOINC_VERSION)
+libboinc_api_la_LDFLAGS = -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
if BUILD_GRAPHICS_API
lib_LTLIBRARIES += libboinc_graphics2.la
libboinc_graphics2_la_SOURCES = $(graphics2_files)
libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir)/lib
-libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number
$(LIBBOINC_VERSION)
+libboinc_graphics2_la_LDFLAGS = -rpath $(libdir) -version-number
$(LIBBOINC_VERSION)
endif #BUILD_GRAPHICS_API
if INSTALL_HEADERS
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e517c3a..6c2a1bd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -133,13 +133,13 @@ lib_LTLIBRARIES = libboinc.la libboinc_crypt.la
libboinc_la_SOURCES = $(generic_sources) $(mac_sources)
libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
-libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number
$(LIBBOINC_VERSION)
+libboinc_la_LDFLAGS = -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
libboinc_la_LIBADD =
libboinc_crypt_la_SOURCES = crypt.cpp
libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
-libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number
$(LIBBOINC_VERSION)
+libboinc_crypt_la_LDFLAGS = -rpath $(libdir) -version-number
$(LIBBOINC_VERSION)
libboinc_crypt_la_LIBADD =
@@ -148,7 +148,7 @@ lib_LTLIBRARIES += libboinc_fcgi.la
libboinc_fcgi_la_SOURCES = $(libfcgi_sources) $(mac_sources)
libboinc_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CFLAGS) $(PICFLAGS)
$(PTHREAD_CFLAGS)
libboinc_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CXXFLAGS) $(PICFLAGS)
$(PTHREAD_CFLAGS)
-libboinc_fcgi_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number
$(LIBBOINC_VERSION)
+libboinc_fcgi_la_LDFLAGS = -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
libboinc_fcgi_la_LIBADD =
endif
# end of "if ENABLE_FCGI"
diff --git a/m4/ax_check_gl.m4 b/m4/ax_check_gl.m4
index e26ce5b..5984130 100644
--- a/m4/ax_check_gl.m4
+++ b/m4/ax_check_gl.m4
@@ -39,7 +39,7 @@ else
GL_CFLAGS="-I${x_includes} -I${prefix}/include ${GL_CFLAGS}"
fi
if test -n "$x_libraries"; then
- GL_LIBS="-L${x_libraries} -L${prefix}/lib -lX11 ${GL_LIBS}"
+ GL_LIBS="-L${x_libraries} -lX11 ${GL_LIBS}"
fi
fi
@@ -58,7 +58,7 @@ else
else
ax_try_lib="${ax_lib}"
fi
- LIBS="-L${prefix}/lib ${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
+ LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM([[
# if HAVE_WINDOWS_H && defined(_WIN32)
@@ -66,7 +66,7 @@ else
# endif
# include <GL/gl.h>]],
[[glBegin(0)]])],
- [ax_cv_check_gl_libgl="-L${prefix}/lib ${ax_try_lib}"; break])
+ [ax_cv_check_gl_libgl="${ax_try_lib}"; break])
done
LIBS=${ax_save_LIBS}
CPPFLAGS=${ax_save_CPPFLAGS}])
diff --git a/m4/ax_check_glu.m4 b/m4/ax_check_glu.m4
index 7a8105a..d1c22fa 100644
--- a/m4/ax_check_glu.m4
+++ b/m4/ax_check_glu.m4
@@ -19,7 +19,7 @@ if test "X${with_apple_opengl_framework}" != "Xyes"; then
else
ax_try_lib="${ax_lib}"
fi
- LIBS="-L${prefix}/lib ${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
+ LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
#
# libGLU typically links with libstdc++ on POSIX platforms. However,
# setting the language to C++ means that test program source is named
@@ -37,7 +37,7 @@ if test "X${with_apple_opengl_framework}" != "Xyes"; then
# endif
# include <GL/glu.h>]],
[[gluBeginCurve(0)]])],
- [ax_cv_check_glu_libglu="-L${prefix}/lib ${ax_try_lib}"; break])
+ [ax_cv_check_glu_libglu="${ax_try_lib}"; break])
if test X$ax_compiler_ms = Xyes; then
AC_LANG_POP([C])
fi
diff --git a/m4/ax_check_glut.m4 b/m4/ax_check_glut.m4
index bc70cff..f883833 100644
--- a/m4/ax_check_glut.m4
+++ b/m4/ax_check_glut.m4
@@ -35,7 +35,7 @@ else
else
ax_try_lib="${ax_lib}"
fi
- LIBS="-L${prefix}/lib ${ax_try_lib} ${GLUT_LIBS} ${ax_save_LIBS}"
+ LIBS="${ax_try_lib} ${GLUT_LIBS} ${ax_save_LIBS}"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM([[
# if HAVE_WINDOWS_H && (defined(_WIN32) || defined(CYGWIN_USE_WIN32))
@@ -43,7 +43,7 @@ else
# endif
# include <GL/glut.h>]],
[[glutMainLoop()]])],
- [ax_cv_check_glut_libglut="-L${prefix}/lib ${ax_try_lib}"; break])
+ [ax_cv_check_glut_libglut="${ax_try_lib}"; break])
done
LIBS=${ax_save_LIBS}
diff --git a/sched/Makefile.am b/sched/Makefile.am
index e516d3d..3c5ec6f 100644
--- a/sched/Makefile.am
+++ b/sched/Makefile.am
@@ -23,7 +23,7 @@ lib_LTLIBRARIES = libsched.la
libsched_la_SOURCES = $(libsched_sources)
libsched_la_CFLAGS = $(AM_CPPFLAGS)
libsched_la_CXXFLAGS = $(AM_CPPFLAGS)
-libsched_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number
$(LIBBOINC_VERSION)
+libsched_la_LDFLAGS = -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
libsched_la_LIBADD= $(SSL_LIBS)
## install only headers that are meant for exporting the API !!
@@ -43,7 +43,7 @@ lib_LTLIBRARIES += libsched_fcgi.la
libsched_fcgi_la_SOURCES = $(libsched_sources)
libsched_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
libsched_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
-libsched_fcgi_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number
$(LIBBOINC_VERSION)
+libsched_fcgi_la_LDFLAGS = -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
libsched_fcgi_la_LIBADD=
endif
--
1.6.4.3
_______________________________________________
boinc_dev mailing list
[email protected]
http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev
To unsubscribe, visit the above URL and
(near bottom of page) enter your email address.
