Skip to content

Commit c771d83

Browse files
authored
Set up EXTSTATIC before checking it
The bundle_loader check for darwin checks EXTSTATIC, but previously the setup for the variable comes after the check. I had trouble building using --with-static-linked-ext on darwin before this change.
1 parent c726c48 commit c771d83

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

configure.ac

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2964,6 +2964,23 @@ STATIC=
29642964
])
29652965
}
29662966

2967+
EXTSTATIC=
2968+
AC_SUBST(EXTSTATIC)dnl
2969+
AC_ARG_WITH(static-linked-ext,
2970+
AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
2971+
[AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static],[no],[],[EXTSTATIC="$withval"])])
2972+
AS_CASE([",$EXTSTATIC,"], [,static,|*,enc,*], [
2973+
ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.$(LIBEXT) enc/libtrans.$(LIBEXT)'
2974+
EXTOBJS='ext/extinit.$(OBJEXT)'
2975+
AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
2976+
AC_SUBST(ENCSTATIC, static)
2977+
], [
2978+
ENCOBJS='dmyenc.$(OBJEXT)'
2979+
EXTOBJS='dmyext.$(OBJEXT)'
2980+
])
2981+
AC_SUBST(ENCOBJS)
2982+
AC_SUBST(EXTOBJS)
2983+
29672984
: "rpath" && {
29682985
AS_CASE(["$target_os"],
29692986
[solaris*], [ AS_IF([test "$GCC" = yes], [
@@ -3268,23 +3285,6 @@ AC_ARG_WITH(ext,
32683285
AC_ARG_WITH(out-ext,
32693286
AS_HELP_STRING([--with-out-ext=EXTS],
32703287
[pass to --without-ext option of extmk.rb]))
3271-
EXTSTATIC=
3272-
AC_SUBST(EXTSTATIC)dnl
3273-
AC_ARG_WITH(static-linked-ext,
3274-
AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
3275-
[AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static],[no],[],[EXTSTATIC="$withval"])])
3276-
AS_CASE([",$EXTSTATIC,"], [,static,|*,enc,*], [
3277-
ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.$(LIBEXT) enc/libtrans.$(LIBEXT)'
3278-
EXTOBJS='ext/extinit.$(OBJEXT)'
3279-
AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
3280-
AC_SUBST(ENCSTATIC, static)
3281-
], [
3282-
ENCOBJS='dmyenc.$(OBJEXT)'
3283-
EXTOBJS='dmyext.$(OBJEXT)'
3284-
])
3285-
AC_SUBST(ENCOBJS)
3286-
AC_SUBST(EXTOBJS)
3287-
32883288
AC_ARG_WITH(setup,
32893289
AS_HELP_STRING([--with-setup=SETUP], [use extension libraries setup]),
32903290
[setup=$withval])

0 commit comments

Comments
 (0)