diff --git a/configure b/configure index 70b44ee07f55c4ac7a8185d29a75f6b11d0d43ef..a6aadc9c592ec09898edfa8b1e8447bb59155df5 100755 --- a/configure +++ b/configure @@ -677,6 +677,7 @@ OPTIM LINKER GMSH_DIRS GMSH_LIBS +LIBEXT LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -3567,6 +3568,7 @@ case "$UNAME" in Darwin*) RANLIB=true AR="libtool -o" + LIBEXT=".a" ;; *) if test -n "$ac_tool_prefix"; then @@ -3711,6 +3713,7 @@ echo "$as_me: error: Could not find the library archiver, aborting." >&2;} { (exit 1); exit 1; }; } fi AR="${AR} ruvs" + LIBEXT=".a" ;; esac @@ -7379,6 +7382,7 @@ ac_config_headers="$ac_config_headers Common/GmshConfig.h:Common/GmshConfig.h.in + ac_config_files="$ac_config_files variables" cat >confcache <<\_ACEOF @@ -8060,11 +8064,12 @@ OPTIM!$OPTIM$ac_delim LINKER!$LINKER$ac_delim GMSH_DIRS!$GMSH_DIRS$ac_delim GMSH_LIBS!$GMSH_LIBS$ac_delim +LIBEXT!$LIBEXT$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.in b/configure.in index d6e3e7586312bdb2b24db210c5ab50b55d3caa3c..f9ca25dd6e4fe2f0965d88f85ad8667b0069f6b9 100644 --- a/configure.in +++ b/configure.in @@ -221,6 +221,7 @@ case "$UNAME" in Darwin*) RANLIB=true AR="libtool -o" + LIBEXT=".a" ;; *) AC_PROG_RANLIB @@ -229,6 +230,7 @@ case "$UNAME" in AC_MSG_ERROR([Could not find the library archiver, aborting.]) fi AR="${AR} ruvs" + LIBEXT=".a" ;; esac @@ -876,6 +878,7 @@ AC_SUBST(LINKER) AC_SUBST(GMSH_DIRS) AC_SUBST(GMSH_LIBS) AC_SUBST(AR) +AC_SUBST(LIBEXT) AC_CONFIG_FILES([variables]) AC_OUTPUT diff --git a/variables.in b/variables.in index 8c0b2e079fc15c92632d0d04195346ae24070590..2c02fcf737e93d2de7621185939cbe5b01f10c3c 100644 --- a/variables.in +++ b/variables.in @@ -43,7 +43,7 @@ DASH=- # The extension to use for object files, libraries and executables OBJEXT=.o -LIBEXT=.a +LIBEXT=@LIBEXT@ EXEEXT=@EXEEXT@ # File handling commands