summaryrefslogtreecommitdiff
path: root/x11/fltk/patches/patch-ac
blob: b9012ec5941422c9f7172f52cc045fc3f3528148 (plain)
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
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
$NetBSD: patch-ac,v 1.9 2006/01/22 11:11:34 wiz Exp $

--- configure.orig	2006-01-18 02:30:52.000000000 +0000
+++ configure
@@ -856,6 +856,8 @@ Optional Features:
   --enable-debug          turn on debugging default=no
   --enable-gl             turn on OpenGL support default=yes
   --enable-shared         turn on shared libraries default=no
+  --enable-libtool=LIBTOOL_PATH
+                          turn on building with libtool [default=no]
   --enable-threads        enable multi-threading support
   --enable-quartz         use Quartz instead of Quickdraw (default=no)
   --disable-largefile     omit support for large files
@@ -1412,7 +1414,22 @@ if test "${enable_shared+set}" = set; th
   enableval="$enable_shared"
 
 fi;
-if test x$enable_shared = xyes; then
+
+# Check whether --enable-libtool or --disable-libtool was given.
+if test "${enable_libtool+set}" = set; then
+  enableval="$enable_libtool"
+
+if test x$enable_libtool != xno; then
+    LIBTOOL="$enable_libtool"
+    enable_shared=no
+else
+    LIBTOOL=""
+fi
+fi
+
+
+if test "$enable_shared" = "yes"; then
+
     PICFLAG=1
     SHAREDSUFFIX=""
     FLUID="fluid-shared"
@@ -1524,8 +1541,20 @@ else
     LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
 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
 
 
 
@@ -11073,26 +11102,9 @@ esac
 
 
 
-case "$uname" in
-    *BSD* | Darwin*)
-	# *BSD
-	CAT1EXT=0
-	CAT3EXT=0
-	CAT6EXT=0
-	;;
-    IRIX*)
-	# SGI IRIX
-	CAT1EXT=z
-	CAT3EXT=z
-	CAT6EXT=z
-	;;
-    *)
-	# All others
-	CAT1EXT=1
-	CAT3EXT=3
-	CAT6EXT=3
-	;;
-esac
+CAT1EXT=1
+CAT3EXT=3
+CAT6EXT=6
 
 
 
@@ -12034,6 +12048,7 @@ s,@GLLIBNAME@,$GLLIBNAME,;t t
 s,@IMGLIBNAME@,$IMGLIBNAME,;t t
 s,@LIBEXT@,$LIBEXT,;t t
 s,@LIBNAME@,$LIBNAME,;t t
+s,@LIBTOOL@,$LIBTOOL,;t t
 s,@LINKFLTK@,$LINKFLTK,;t t
 s,@LINKFLTKFORMS@,$LINKFLTKFORMS,;t t
 s,@LINKFLTKGL@,$LINKFLTKGL,;t t