diff options
| author | Fabien Costantini <fabien@onepost.net> | 2008-10-25 18:31:44 +0000 |
|---|---|---|
| committer | Fabien Costantini <fabien@onepost.net> | 2008-10-25 18:31:44 +0000 |
| commit | ed6ac69dd60e8534fd920ee3de2c45f42aeae1df (patch) | |
| tree | f217696c75fc793324d02231da5ec4fb5a3fc2b7 /configure.in | |
| parent | f6d5f48bbe9deb82a86f31ebcdd90510512c6104 (diff) | |
Fixed cairo makefiles link error when shared option activated under linux.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6485 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/configure.in b/configure.in index c56cba435..9c8803bb8 100644 --- a/configure.in +++ b/configure.in @@ -173,7 +173,7 @@ if test x$enable_shared = xyes; then FLDSONAME="libfltk_forms.$FL_API_VERSION.dylib" GLDSONAME="libfltk_gl.$FL_API_VERSION.dylib" IMGDSONAME="libfltk_images.$FL_API_VERSION.dylib" - CAIRODSONAME="libfltk_cairo.$FL_API_VERSION.dylib" + CAIRODSONAME="../src/libfltk_cairo.$FL_API_VERSION.dylib" DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -dynamiclib -lc -o" ;; @@ -182,7 +182,7 @@ if test x$enable_shared = xyes; then FLDSONAME="libfltk_forms.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_API_VERSION" IMGDSONAME="libfltk_images.so.$FL_API_VERSION" - CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" + CAIRODSONAME="../src/libfltk_cairo.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -h \$@ \$(LDLIBS) -G $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib"; then DSOLINK="-R$libdir" @@ -193,7 +193,7 @@ if test x$enable_shared = xyes; then FLDSONAME="libfltk_forms.sl.$FL_API_VERSION" GLDSONAME="libfltk_gl.sl.$FL_API_VERSION" IMGDSONAME="libfltk_images.sl.$FL_API_VERSION" - CAIRODSONAME="libfltk_cairo.sl.$FL_API_VERSION" + CAIRODSONAME="../src/libfltk_cairo.sl.$FL_API_VERSION" DSOCOMMAND="ld \$(DSOFLAGS) -b -z +h \$@ $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib"; then DSOLINK="-Wl,-rpath,$libdir" @@ -204,7 +204,7 @@ if test x$enable_shared = xyes; then FLDSONAME="libfltk_forms.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_API_VERSION" IMGDSONAME="libfltk_images.so.$FL_API_VERSION" - CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" + CAIRODSONAME="../src/libfltk_cairo.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@,-set_version,sgi1.1 \$(LDLIBS) -shared $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32" -a "x$libdir" != "x/usr/lib64"; then DSOLINK="-Wl,-rpath,$libdir" @@ -215,7 +215,7 @@ if test x$enable_shared = xyes; then FLDSONAME="libfltk_forms.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_API_VERSION" IMGDSONAME="libfltk_images.so.$FL_API_VERSION" - CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" + CAIRODSONAME="../src/libfltk_cairo.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32"; then DSOLINK="-Wl,-rpath,$libdir" @@ -226,7 +226,7 @@ if test x$enable_shared = xyes; then FLDSONAME="libfltk_forms.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_API_VERSION" IMGDSONAME="libfltk_images.so.$FL_API_VERSION" - CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" + CAIRODSONAME="../src/libfltk_cairo.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib"; then DSOLINK="-Wl,-rpath,$libdir" @@ -237,7 +237,7 @@ if test x$enable_shared = xyes; then FLDSONAME="libfltk_forms_s.a" GLDSONAME="libfltk_gl_s.a" IMGDSONAME="libfltk_images_s.a" - CAIRODSONAME="libfltk_cairo_s.a" + CAIRODSONAME="../src/libfltk_cairo_s.a" DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-bexpall,-bM:SRE,-bnoentry -o" SHAREDSUFFIX="_s" ;; @@ -248,13 +248,13 @@ if test x$enable_shared = xyes; then FLDSONAME="mgwfltknox_forms-$FL_API_VERSION.dll" GLDSONAME="mgwfltknox_gl-$FL_API_VERSION.dll" IMGDSONAME="mgwfltknox_images-$FL_API_VERSION.dll" - CAIRODSONAME="mgwfltknox_cairo-$FL_API_VERSION.dll" + CAIRODSONAME="../src/mgwfltknox_cairo-$FL_API_VERSION.dll" else DSONAME="cygfltknox-$FL_API_VERSION.dll" FLDSONAME="cygfltknox_forms-$FL_API_VERSION.dll" GLDSONAME="cygfltknox_gl-$FL_API_VERSION.dll" IMGDSONAME="cygfltknox_images-$FL_API_VERSION.dll" - CAIRODSONAME="cygfltknox_cairo-$FL_API_VERSION.dll" + CAIRODSONAME="../src/cygfltknox_cairo-$FL_API_VERSION.dll" fi #----------------------------------------------------------- # -Wl,--enable-runtime-pseudo-reloc: See str 1585 @@ -272,7 +272,7 @@ if test x$enable_shared = xyes; then FLDSONAME="libfltk_forms.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_API_VERSION" IMGDSONAME="libfltk_images.so.$FL_API_VERSION" - CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" + CAIRODSONAME="../src/libfltk_cairo.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o" ;; esac |