From 6fb964c36e8c83f149ec6eaead2e88d51bcc4616 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sun, 19 May 2002 17:44:56 +0000 Subject: [PATCH] Add -sgi_version,sgi1.1 to the IRIX DSO command. Add Fl_Shared_Image.html to the list of HTML files to install. Change C++ command to C in src/flstring.h. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2244 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 2 ++ configure.in | 15 ++++++++++++--- documentation/Makefile | 5 +++-- src/flstring.h | 6 +++--- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index c8b98d816..2bbd851c8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ CHANGES IN FLTK 1.1.0rc3 + - Documentation updates. + - OS/2 build fixes from Alexander Mai. - Now use strlcat() instead of strncat() which could cause buffer overflows. - Now use of strlcpy() instead of strncpy() to simplify diff --git a/configure.in b/configure.in index c46bf2465..12fa5f72e 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.66 2002/05/16 12:47:42 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.67 2002/05/19 17:44:56 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -130,7 +130,16 @@ if test x$enable_shared = xyes; then DSOLINK="-Wl,-rpath,$libdir" fi ;; - IRIX* | OSF1*) + IRIX*) + DSONAME="libfltk.so.$FL_API_VERSION" + FLDSONAME="libfltk_forms.so.$FL_API_VERSION" + GLDSONAME="libfltk_gl.so.$FL_API_VERSION" + DSOCOMMAND="\$(CXX) -Wl,-soname,\$@,-set_version,sgi1.1 \$(LDLIBS) -shared $DEBUGFLAG -o" + if test "$libdir" != "/usr/lib" - a "$libdir" != "/usr/lib32"; then + DSOLINK="-Wl,-rpath,$libdir" + fi + ;; + OSF1*) DSONAME="libfltk.so.$FL_API_VERSION" FLDSONAME="libfltk_forms.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_API_VERSION" @@ -735,5 +744,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.66 2002/05/16 12:47:42 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.67 2002/05/19 17:44:56 easysw Exp $". dnl diff --git a/documentation/Makefile b/documentation/Makefile index 513aea12e..3c69207ab 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.9.2.10.2.15 2002/05/01 00:55:45 easysw Exp $" +# "$Id: Makefile,v 1.9.2.10.2.16 2002/05/19 17:44:56 easysw Exp $" # # Documentation makefile for the Fast Light Tool Kit (FLTK). # @@ -114,6 +114,7 @@ HTMLFILES = \ Fl_Scrollbar.html \ Fl_Secret_Input.html \ Fl_Select_Browser.html \ + Fl_Shared_Image.html \ Fl_Single_Window.html \ Fl_Slider.html \ Fl_Tabs.html \ @@ -273,5 +274,5 @@ fltk.pdf: $(HTMLFILES) $(IMAGEFILES) $(HTMLDOC) --verbose --batch fltk.book $(MEDIA) -f fltk.pdf # -# End of "$Id: Makefile,v 1.9.2.10.2.15 2002/05/01 00:55:45 easysw Exp $". +# End of "$Id: Makefile,v 1.9.2.10.2.16 2002/05/19 17:44:56 easysw Exp $". # diff --git a/src/flstring.h b/src/flstring.h index e3f612623..c872a341d 100644 --- a/src/flstring.h +++ b/src/flstring.h @@ -1,5 +1,5 @@ /* - * "$Id: flstring.h,v 1.1.2.6 2002/05/16 12:47:43 easysw Exp $" + * "$Id: flstring.h,v 1.1.2.7 2002/05/19 17:44:56 easysw Exp $" * * Common string header file for the Fast Light Tool Kit (FLTK). * @@ -42,7 +42,7 @@ # ifdef index # undef index -# endif // index +# endif /* index */ # if defined(WIN32) && !defined(__CYGWIN__) # define strcasecmp(s,t) stricmp((s), (t)) @@ -87,5 +87,5 @@ extern size_t fl_strlcpy(char *, const char *, size_t); #endif /* !flstring_h */ /* - * End of "$Id: flstring.h,v 1.1.2.6 2002/05/16 12:47:43 easysw Exp $". + * End of "$Id: flstring.h,v 1.1.2.7 2002/05/19 17:44:56 easysw Exp $". */