1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
$NetBSD: patch-ab,v 1.9 2004/10/21 08:29:45 adam Exp $
--- configure.in.orig 2004-10-18 21:05:27.000000000 +0000
+++ configure.in
@@ -95,6 +95,7 @@ AC_SUBST(GLLIBNAME)
AC_SUBST(IMGLIBNAME)
AC_SUBST(LIBEXT)
AC_SUBST(LIBNAME)
+AC_SUBST(LIBTOOL)
AC_SUBST(LINKFLTK)
AC_SUBST(LINKFLTKGL)
AC_SUBST(LINKFLTKIMG)
@@ -110,6 +111,15 @@ fi
AC_ARG_ENABLE(gl, [ --enable-gl turn on OpenGL support [default=yes]])
AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=no]])
+AC_ARG_ENABLE(libtool, [ --enable-libtool=LIBTOOL_PATH
+ turn on building with libtool [default=no]],[
+if eval "test x$enable_libtool != xno"; then
+ LIBTOOL="$enable_libtool"
+ enable_shared=no
+else
+ LIBTOOL=""
+fi])
+
if test x$enable_shared = xyes; then
PICFLAG=1
SHAREDSUFFIX=""
@@ -209,6 +219,21 @@ else
LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk"
fi
+if test "x$LIBTOOL" != "x"; then
+ LINKFLTK="../src/libfltk.la"
+ if test "x$LINKFLTKGL" != "x"; then
+ LINKFLTKGL="../src/libfltk_gl.la"
+ fi
+ if test "x$LINKFLTKIMG" != "x"; then
+ LINKFLTKIMG="../src/libfltk_images.la"
+ fi
+ LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
+ DSONAME="libfltk.la"
+ FLDSONAME="libfltk_forms.la"
+ GLDSONAME="libfltk_gl.la"
+ IMGDSONAME="libfltk_images.la"
+fi
+
AC_SUBST(DSOCOMMAND)
AC_SUBST(DSOLINK)
AC_SUBST(DSONAME)
@@ -726,7 +751,7 @@ if test -n "$GCC"; then
;;
esac
- CXX="$CC"
+# CXX="$CC"
# Show all standard warnings + unused variables, conversion errors,
# and inlining problems when compiling...
|
