ObjWeb  Check-in [22656812fc]

Overview
Comment:configure: Properly set LIBOBJWEB_DEP
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | trunk
Files: files | file ages | folders
SHA3-256: 22656812fc097bc609f5cf8879c9b41cf0de0078cd9a0f1bcd65094067762dc5
User & Date: js on 2016-05-07 11:54:50
Other Links: manifest | tags
Context
2016-05-07
11:54
configure: Properly set LIBOBJWEB_DEP Leaf check-in: 22656812fc user: js tags: trunk
2016-05-06
18:04
Initial import. check-in: ce5d486e9a user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified configure.ac from [78d14fc3bb] to [d15c04b17d].

︙︙
29
30
31
32
33
34
35


36
37
38
39
40
41
42

AC_ARG_ENABLE(shared,
	AS_HELP_STRING([--disable-shared], [do not build shared library]))
AS_IF([test x"$enable_shared" != x"no"], [
	BUILDSYS_SHARED_LIB
	AC_SUBST(OBJWEB_SHARED_LIB, "${LIB_PREFIX}objweb${LIB_SUFFIX}")
	AC_SUBST(EXCEPTIONS_LIB_A, "exceptions.lib.a")
	AC_SUBST(EXCEPTIONS_EXCEPTIONS_LIB_A, "exceptions/exceptions.lib.a")


])
AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library]))
AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [
	AC_SUBST(OBJWEB_STATIC_LIB, "libobjweb.a")
	AC_SUBST(EXCEPTIONS_A, "exceptions.a")
	AC_SUBST(EXCEPTIONS_EXCEPTIONS_A, "exceptions/exceptions.a")
])








>
>








29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44

AC_ARG_ENABLE(shared,
	AS_HELP_STRING([--disable-shared], [do not build shared library]))
AS_IF([test x"$enable_shared" != x"no"], [
	BUILDSYS_SHARED_LIB
	AC_SUBST(OBJWEB_SHARED_LIB, "${LIB_PREFIX}objweb${LIB_SUFFIX}")
	AC_SUBST(EXCEPTIONS_LIB_A, "exceptions.lib.a")
	AC_SUBST(EXCEPTIONS_EXCEPTIONS_LIB_A, "exceptions/exceptions.lib.a")
], [
	AC_SUBST(LIBOBJWEB_DEP, "../src/libobjweb.a")
])
AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library]))
AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [
	AC_SUBST(OBJWEB_STATIC_LIB, "libobjweb.a")
	AC_SUBST(EXCEPTIONS_A, "exceptions.a")
	AC_SUBST(EXCEPTIONS_EXCEPTIONS_A, "exceptions/exceptions.a")
])
︙︙

Modified extra.mk.in from [a92d5b9068] to [374584275d]. 

1
2
3
4
5
6
7
8
9
10

11

OBJWEB_SHARED_LIB = @OBJWEB_SHARED_LIB@
OBJWEB_STATIC_LIB = @OBJWEB_STATIC_LIB@
OBJWEB_LIB_MAJOR = 0
OBJWEB_LIB_MINOR = 0
OBJWEB_LIB_MAJOR_MINOR = ${OBJWEB_LIB_MAJOR}.${OBJWEB_LIB_MINOR}

EXCEPTIONS_A = @EXCEPTIONS_A@
EXCEPTIONS_EXCEPTIONS_A = @EXCEPTIONS_EXCEPTIONS_A@
EXCEPTIONS_EXCEPTIONS_LIB_A = @EXCEPTIONS_EXCEPTIONS_LIB_A@
EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@

RUN_TESTS = @RUN_TESTS@











>


1
2
3
4
5
6
7
8
9
10
11
12

OBJWEB_SHARED_LIB = @OBJWEB_SHARED_LIB@
OBJWEB_STATIC_LIB = @OBJWEB_STATIC_LIB@
OBJWEB_LIB_MAJOR = 0
OBJWEB_LIB_MINOR = 0
OBJWEB_LIB_MAJOR_MINOR = ${OBJWEB_LIB_MAJOR}.${OBJWEB_LIB_MINOR}

EXCEPTIONS_A = @EXCEPTIONS_A@
EXCEPTIONS_EXCEPTIONS_A = @EXCEPTIONS_EXCEPTIONS_A@
EXCEPTIONS_EXCEPTIONS_LIB_A = @EXCEPTIONS_EXCEPTIONS_LIB_A@
EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@
LIBOBJWEB_DEP = @LIBOBJWEB_DEP@
RUN_TESTS = @RUN_TESTS@