ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-04-03 22:34:29 +05:00
Code Issues Packages Projects Releases Wiki Activity

add AM_PROG_AR

Browse Source
This commit is contained in:
Joachim Schoeberl 2014-01-09 10:44:35 +00:00
parent e079f0caf1
commit 03853d9c88
5 changed files with 1281 additions and 1060 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -37,8 +37,8 @@ subdir = .
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS ChangeLog INSTALL NEWS TODO \
config.guess config.sub depcomp install-sh ltmain.sh missing \
mkinstalldirs
ar-lib config.guess config.sub depcomp install-sh ltmain.sh \
missing mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

61
aclocal.m4 vendored
View File

@ -59,6 +59,67 @@ m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# Copyright (C) 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 1
# AM_PROG_AR([ACT-IF-FAIL])
# -------------------------
# Try to determine the archiver interface, and trigger the ar-lib wrapper
# if it is needed. If the detection of archiver interface fails, run
# ACT-IF-FAIL (default is to abort configure with a proper error message).
AC_DEFUN([AM_PROG_AR],
[AC_BEFORE([$0], [LT_INIT])dnl
AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([ar-lib])dnl
AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
: ${AR=ar}
AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
[am_cv_ar_interface=ar
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
[am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
AC_TRY_EVAL([am_ar_try])
if test "$ac_status" -eq 0; then
am_cv_ar_interface=ar
else
am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
AC_TRY_EVAL([am_ar_try])
if test "$ac_status" -eq 0; then
am_cv_ar_interface=lib
else
am_cv_ar_interface=unknown
fi
fi
rm -f conftest.lib libconftest.a
])
])
case $am_cv_ar_interface in
ar)
;;
lib)
# Microsoft lib, so override with the ar-lib wrapper script.
# FIXME: It is wrong to rewrite AR.
# But if we don't then we get into trouble of one sort or another.
# A longer-term fix would be to have automake use am__AR in this case,
# and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
# similar.
AR="$am_aux_dir/ar-lib $AR"
;;
unknown)
m4_default([$1],
[AC_MSG_ERROR([could not determine $AR interface])])
;;
esac
AC_SUBST([AR])dnl
])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.

2271
configure vendored
View File

File diff suppressed because it is too large Load Diff

2
configure.ac
View File

@ -6,7 +6,7 @@ AC_CONFIG_MACRO_DIR([m4])
AC_PREFIX_DEFAULT(["/opt/netgen"])
AM_PROG_AR
# AC_HEADER_STDC

3
libsrc/include/Makefile.in
View File

@ -253,7 +253,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_HEADERS = acisgeom.hpp gprim.hpp meshing.hpp occgeom.hpp \
visual.hpp csg.hpp incvis.hpp myadt.hpp opti.hpp geometry2d.hpp \
linalg.hpp mydefs.hpp parallel.hpp stlgeom.hpp mystdlib.h
linalg.hpp mydefs.hpp parallel.hpp stlgeom.hpp mystdlib.h \
nginterface_v2_impl.hpp
include_HEADERS = nginterface.h nginterface_v2.hpp
AM_CPPFLAGS =