diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-07-14 17:03:31 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-07-14 17:03:31 +0000 |
| commit | 3346a9fee75faff9b8087513204cb63cfcf8ec0c (patch) | |
| tree | 9d047b2a883c283ebca058e3872758aa8c39a69c /configure.in | |
| parent | 8e2ff295008e2319e01df604a7c8e382924b22cd (diff) | |
Change the Fl_Group current, add, and remove methods so they are no longer
inline; this should make shared libraries work better on all platforms.
Link FLUID against shared libraries, too, so that the installed fluid is
also using shared libraries (still make a statically linked fluid for the
build)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2525 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/configure.in b/configure.in index dc490e0ae..bc152f520 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl -*- sh -*- dnl the "configure" script is made from this by running GNU "autoconf" dnl -dnl "$Id: configure.in,v 1.33.2.31.2.78 2002/07/12 02:04:53 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.79 2002/07/14 17:03:30 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -109,6 +109,9 @@ AC_ARG_ENABLE(gl, [ --enable-gl turn on OpenGL support [default=yes AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=no]]) if test x$enable_shared = xyes; then PICFLAG=1 + SHAREDSUFFIX="" + FLUID="fluid-shared" + case $uname in Darwin*) DSONAME="libfltk.$FL_API_VERSION.dylib" @@ -177,6 +180,7 @@ if test x$enable_shared = xyes; then GLDSONAME="libfltk_gl_s.a" IMGDSONAME="libfltk_images_s.a" DSOCOMMAND="\$(CXX) -Wl,-bexpall,-bM:SRE,-bnoentry -o" + SHAREDSUFFIX="_s" ;; CYGWIN* | MINGW*) AC_MSG_WARN(Shared libraries are not supported under CygWin.) @@ -190,6 +194,8 @@ if test x$enable_shared = xyes; then DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o" ;; esac + + LINKSHARED="-L../src -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX" else DSOCOMMAND="echo" DSOLINK="" @@ -198,6 +204,9 @@ else GLDSONAME="" IMGDSONAME="" PICFLAG=0 + SHAREDSUFFIX="" + FLUID="fluid" + LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk" fi AC_SUBST(DSOCOMMAND) @@ -206,6 +215,9 @@ AC_SUBST(DSONAME) AC_SUBST(FLDSONAME) AC_SUBST(GLDSONAME) AC_SUBST(IMGDSONAME) +AC_SUBST(SHAREDSUFFIX) +AC_SUBST(LINKSHARED) +AC_SUBST(FLUID) AC_ARG_ENABLE(threads, [ --enable-threads enable multi-threading support]) @@ -766,5 +778,5 @@ dnl Make sure the fltk-config script is executable... chmod +x fltk-config dnl -dnl End of "$Id: configure.in,v 1.33.2.31.2.78 2002/07/12 02:04:53 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.79 2002/07/14 17:03:30 easysw Exp $". dnl |