d2f742606d
+ Update to work with FLTK 1.1 and latest 2.x CVS. + Added workaround for strange focus behaviour when scrolling with the scrollbar. The text widget gets an unfocus when the scrollbar is clicked, but then when you click back on the text, instead of it getting a focus event, it gets another unfocus. This makes the cursor remain invisible when it shouldn't. * Fixes to scrollbar handling. * Fixed status panel on Fl_FancyEditor (positioning problem).
73 lines
2.2 KiB
Plaintext
73 lines
2.2 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.5 2002/08/10 20:04:16 wilfried Exp $
|
|
--- configure.in.orig Wed Jan 10 00:11:25 2001
|
|
+++ configure.in Fri Aug 9 15:52:32 2002
|
|
@@ -18,7 +18,7 @@ AC_PATH_PROG(AR,ar)
|
|
AC_PATH_PROG(RM,rm)
|
|
|
|
dnl Check for libraries...
|
|
-LDFLAGS="$CXXFLAGS"
|
|
+#LDFLAGS="$CXXFLAGS"
|
|
AC_SUBST(LDFLAGS)
|
|
|
|
AC_PATH_X
|
|
@@ -47,33 +47,12 @@ fi])
|
|
|
|
AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=no]],[
|
|
if eval "test x$enable_shared = xyes"; then
|
|
- PICFLAG=1
|
|
+ CFLAGS="$CFLAGS -fPIC"
|
|
+ CXXFLAGS="$CXXFLAGS -fPIC"
|
|
ac_fltk_dso="-lfltk"
|
|
DSOLIBNAME="libfleditor"
|
|
- case $uname in
|
|
- SunOS* | UNIX_S*)
|
|
- DSOEXT=".so.1"
|
|
- DSOCOMMAND="\$(CXX) -Wl,-h,\$@ \$(LDLIBS) -G $DEBUGFLAG -o"
|
|
- ;;
|
|
- HP-UX*)
|
|
- DSOEXT=".s1.1"
|
|
- DSOCOMMAND="ld -b -z +h \$@ $DEBUGFLAG -o"
|
|
- ;;
|
|
- OSF1*)
|
|
- DSOEXT=".so.1"
|
|
- DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
|
|
-cd ;;
|
|
- IRIX*)
|
|
- DSOEXT=".so.1"
|
|
- DSOCOMMAND="\$(CXX) -soname \$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
|
|
- ;;
|
|
- *)
|
|
- echo "Warning: shared libraries may not be supported. Trying -shared"
|
|
- echo " option with compiler."
|
|
- DSOEXT=".so.1"
|
|
- DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ -shared $DEBUGFLAG -o"
|
|
- ;;
|
|
- esac
|
|
+ DSOEXT=".so.2.0"
|
|
+ DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -fPIC -shared $DEBUGFLAG -o"
|
|
fi],
|
|
[
|
|
ac_fltk_static="\$(FLTKLIBDIR)/libfltk.a"
|
|
@@ -91,18 +70,12 @@ AC_ARG_WITH(fltk,
|
|
ac_fltk_libraries="/usr/local/lib"
|
|
])
|
|
|
|
+ac_fltk2="-DFL_MAJOR_VERSION=1"
|
|
AC_ARG_WITH(fltk2,
|
|
[ --with-fltk2 build for \"FLTK 2 Pure\" [default=no]],
|
|
- [ if test " x$withval = xyes"; then ac_fltk2="-DFLTK2"; fi ])
|
|
+ [ if test x$withval = xyes; then ac_fltk2="-DFL_MAJOR_VERSION=2"; fi ])
|
|
|
|
-AC_CHECK_LIB(fltk,numericsort)
|
|
-
|
|
-dnl# test to see if OpenGL is on this machine:
|
|
-GLLIB=
|
|
-AC_CHECK_LIB(GL, glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lGLU -lGL", \
|
|
- AC_CHECK_LIB(MesaGL,glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lMesaGLU -lMesaGL",,\
|
|
- -lX11 -lXext $X_EXTRA_LIBS -lm), \
|
|
- -lX11 -lXext $X_EXTRA_LIBS -lm)
|
|
+AC_CHECK_LIB(fltk,fl_numericsort)
|
|
|
|
AC_SUBST(GLLIB)
|
|
AC_SUBST(DSOCOMMAND)
|