| ... |
... |
@@ -78,22 +78,6 @@ AC_DEFUN([PREP_MAYBE_PROGRAM],[ |
|
78
|
78
|
AC_SUBST([$1MaybeProg])
|
|
79
|
79
|
])
|
|
80
|
80
|
|
|
81
|
|
-# PREP_MAYBE_LIBRARY
|
|
82
|
|
-# =========================
|
|
83
|
|
-#
|
|
84
|
|
-# Introduce a substitution [$1MaybeProg] with
|
|
85
|
|
-# * Nothing, if $$1 is empty or "NO"
|
|
86
|
|
-# * Just the library otherwise
|
|
87
|
|
-AC_DEFUN([PREP_MAYBE_LIBRARY],[
|
|
88
|
|
- if test -z "$$1" || test "$$1" = "NO"; then
|
|
89
|
|
- $1MaybeLibrary=Nothing
|
|
90
|
|
- else
|
|
91
|
|
- PREP_LIST([$2])
|
|
92
|
|
- $1MaybeLibrary="Just (Library { libName = \"$2\", includePath = \"$3\", libraryPath = \"$4\" })"
|
|
93
|
|
- fi
|
|
94
|
|
- AC_SUBST([$1MaybeLibrary])
|
|
95
|
|
-])
|
|
96
|
|
-
|
|
97
|
81
|
# PREP_MAYBE_STRING
|
|
98
|
82
|
# =========================
|
|
99
|
83
|
#
|
| ... |
... |
@@ -111,6 +95,24 @@ AC_DEFUN([PREP_MAYBE_STRING],[ |
|
111
|
95
|
AC_SUBST([$1MaybeStr])
|
|
112
|
96
|
])
|
|
113
|
97
|
|
|
|
98
|
+# PREP_MAYBE_LIBRARY
|
|
|
99
|
+# =========================
|
|
|
100
|
+#
|
|
|
101
|
+# Introduce a substitution [$1MaybeProg] with
|
|
|
102
|
+# * Nothing, if $$1 is empty or "NO"
|
|
|
103
|
+# * Just the library otherwise
|
|
|
104
|
+AC_DEFUN([PREP_MAYBE_LIBRARY],[
|
|
|
105
|
+ if test -z "$$1" || test "$$1" = "NO"; then
|
|
|
106
|
+ $1MaybeLibrary=Nothing
|
|
|
107
|
+ else
|
|
|
108
|
+ PREP_LIST([$2])
|
|
|
109
|
+ PREP_MAYBE_STRING([$3])
|
|
|
110
|
+ PREP_MAYBE_STRING([$4])
|
|
|
111
|
+ $1MaybeLibrary="Just Library { libName = \"$2\", includePath = $$3MaybeStr, libraryPath = $$4MaybeStr }"
|
|
|
112
|
+ fi
|
|
|
113
|
+ AC_SUBST([$1MaybeLibrary])
|
|
|
114
|
+])
|
|
|
115
|
+
|
|
114
|
116
|
# PREP_BOOLEAN
|
|
115
|
117
|
# ============
|
|
116
|
118
|
#
|
| ... |
... |
@@ -195,10 +197,7 @@ AC_DEFUN([PREP_TARGET_FILE],[ |
|
195
|
197
|
PREP_LIST([CONF_CPP_OPTS_STAGE2])
|
|
196
|
198
|
PREP_LIST([CONF_CXX_OPTS_STAGE2])
|
|
197
|
199
|
PREP_LIST([CONF_CC_OPTS_STAGE2])
|
|
198
|
|
-
|
|
199
|
|
- PREP_MAYBE_STRING([LibdwIncludeDir])
|
|
200
|
|
- PREP_MAYBE_STRING([LibdwLibDir])
|
|
201
|
|
- PREP_MAYBE_LIBRARY([UseLibdw], [dw], [$LibdwIncludeDirMaybeStr], [$LibdwLibDirMaybeStr])
|
|
|
200
|
+ PREP_MAYBE_LIBRARY([UseLibdw], [dw], [LibdwIncludeDir], [LibdwLibDir])
|
|
202
|
201
|
|
|
203
|
202
|
dnl Host target
|
|
204
|
203
|
PREP_BOOLEAN([ArSupportsAtFile_STAGE0])
|