← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/fltk1.1/jaunty

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Aaron M. Ucko
  • Date: 2004-04-14 21:55:19 UTC
  • Revision ID: james.westby@ubuntu.com-20040414215519-4yvsiryemerttja6
Tags: 1.1.4+1.1.5rc1-1
* New upstream release candidate, incorporating the fix for #226014.
  Remaining patches ported forward (usually trivially).
* FL/Makefile.in: revert changes (now handled more cleanly).
* debian/libfltk1.1-dev.links: new, for the two header-related links we
  actually want.
* debian/rules:
  - don't let CDBS pass CFLAGS to configure; FLTK's build system is
    somewhat idiosyncratic and prefers such settings in OPTIM.
  - take advantage of configure's new --without-links option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
167
167
            GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
168
168
            IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
169
169
            DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
170
 
            if test "x$libdir" != "x/usr/lib"; then
171
 
                    DSOLINK="-Wl,-rpath,$libdir"
172
 
            fi
 
170
#           if test "x$libdir" != "x/usr/lib"; then
 
171
#                   DSOLINK="-Wl,-rpath,$libdir"
 
172
#           fi
173
173
            ;;
174
174
        AIX*)
175
175
            DSONAME="libfltk_s.a"
490
490
        fi
491
491
 
492
492
        dnl Check for X11...
493
 
        AC_PATH_XTRA
 
493
        AC_PATH_XTRA_CORRECTED
494
494
 
495
495
        if test x$no_x = xyes; then
496
496
            AC_MSG_ERROR(Configure could not find required X11 libraries, aborting.)
664
664
    # Previous versions of GCC do not have the reliance on the stdc++
665
665
    # or g++ libraries, so the extra supc++ library is not needed.
666
666
 
667
 
    AC_MSG_CHECKING(if libsupc++ is required)
 
667
    # For debian we use option 1)
668
668
 
669
 
    SUPC="`$CXX -print-file-name=libsupc++.a 2>/dev/null`"
670
 
    case "$SUPC" in
671
 
        libsupc++.a*)
672
 
            # Library not found, so this is and older GCC...
673
 
            AC_MSG_RESULT(no)
674
 
            ;;
675
 
        *)
676
 
            # This is gcc 3.x, and it knows of libsupc++, so we need it
677
 
            LIBS="$LIBS -lsupc++"
678
 
            AC_MSG_RESULT(yes)
679
 
            ;;
680
 
    esac
 
669
    LIBS="$LIBS -lstdc++"
681
670
 
682
671
    CXX="$CC"
683
672
 
845
834
if test x$prefix = xNONE; then
846
835
    AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "/usr/local/share/doc/fltk")
847
836
else
848
 
    AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$prefix/share/doc/fltk")
 
837
    AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$prefix/share/doc/fltk1.1-doc/HTML")
849
838
fi
850
839
 
851
840
dnl Define the FLTK data directory...