900b07feb6
* Will reject attempts to LoadFrom(char *) with a null pointer. * Now puts a null byte in the tail end of the buffer during a SaveTo(char *) even if the editor buffers are empty. Will refuse to save to a null pointer.
72 lines
2.1 KiB
Plaintext
72 lines
2.1 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.4 2001/10/26 23:36:17 wilfried Exp $
|
|
--- configure.in.orig Wed Jan 10 00:11:25 2001
|
|
+++ configure.in Sat Oct 27 01:24:19 2001
|
|
@@ -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.1.1"
|
|
+ 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_SUBST(GLLIB)
|
|
AC_SUBST(DSOCOMMAND)
|