Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
NP_TMcode
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Giacomo Mulas
NP_TMcode
Commits
17c60a2f
Commit
17c60a2f
authored
9 months ago
by
Giovanni La Mura
Browse files
Options
Downloads
Patches
Plain Diff
Set default configuration to build static libraries
parent
9e01bb2d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build/configure
+138
-74
138 additions, 74 deletions
build/configure
build/configure.ac
+7
-1
7 additions, 1 deletion
build/configure.ac
with
145 additions
and
75 deletions
build/configure
+
138
−
74
View file @
17c60a2f
...
@@ -800,10 +800,10 @@ ac_subst_files=''
...
@@ -800,10 +800,10 @@ ac_subst_files=''
ac_user_opts='
ac_user_opts='
enable_option_checking
enable_option_checking
enable_silent_rules
enable_silent_rules
enable_dependency_tracking
enable_mpi
enable_shared
enable_shared
enable_static
enable_static
enable_dependency_tracking
enable_mpi
with_pic
with_pic
enable_fast_install
enable_fast_install
with_aix_soname
with_aix_soname
...
@@ -1462,13 +1462,13 @@ Optional Features:
...
@@ -1462,13 +1462,13 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-silent-rules less verbose build output (undo: "make V=1")
--enable-silent-rules less verbose build output (undo: "make V=1")
--disable-silent-rules verbose build output (undo: "make V=0")
--disable-silent-rules verbose build output (undo: "make V=0")
--enable-shared[=PKGS] build shared libraries [default=no]
--enable-static[=PKGS] build static libraries [default=yes]
--enable-dependency-tracking
--enable-dependency-tracking
do not reject slow dependency extractors
do not reject slow dependency extractors
--disable-dependency-tracking
--disable-dependency-tracking
speeds up one-time build
speeds up one-time build
--enable-mpi enable MPI compilation [default=auto]
--enable-mpi enable MPI compilation [default=auto]
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-libtool-lock avoid locking (might break parallel builds)
...
@@ -3636,6 +3636,134 @@ END
...
@@ -3636,6 +3636,134 @@ END
fi
fi
# Set the default library policy
# Check whether --enable-shared was given.
if test ${enable_shared+y}
then :
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
IFS=$lt_save_ifs
;;
esac
else case e in #(
e) enable_shared=no ;;
esac
fi
# Check whether --enable-shared was given.
if test ${enable_shared+y}
then :
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
IFS=$lt_save_ifs
;;
esac
else case e in #(
e) enable_shared=no ;;
esac
fi
# Check whether --enable-static was given.
if test ${enable_static+y}
then :
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
IFS=$lt_save_ifs
;;
esac
else case e in #(
e) enable_static=yes ;;
esac
fi
# Check whether --enable-static was given.
if test ${enable_static+y}
then :
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
IFS=$lt_save_ifs
;;
esac
else case e in #(
e) enable_static=yes ;;
esac
fi
# Compiler detection
# Compiler detection
...
@@ -13996,70 +14124,6 @@ func_stripname_cnf ()
...
@@ -13996,70 +14124,6 @@ func_stripname_cnf ()
enable_win32_dll=no
enable_win32_dll=no
# Check whether --enable-shared was given.
if test ${enable_shared+y}
then :
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
IFS=$lt_save_ifs
;;
esac
else case e in #(
e) enable_shared=yes ;;
esac
fi
# Check whether --enable-static was given.
if test ${enable_static+y}
then :
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
IFS=$lt_save_ifs
;;
esac
else case e in #(
e) enable_static=yes ;;
esac
fi
...
@@ -25888,10 +25952,10 @@ AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
...
@@ -25888,10 +25952,10 @@ AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
sed_quote_subst='$sed_quote_subst'
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
delay_variable_subst='$delay_variable_subst'
macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
...
@@ -26936,16 +27000,16 @@ available_tags='CXX F77 '
...
@@ -26936,16 +27000,16 @@ available_tags='CXX F77 '
# ### BEGIN LIBTOOL CONFIG
# ### BEGIN LIBTOOL CONFIG
# Which release of libtool.m4 was used?
macro_version=$macro_version
macro_revision=$macro_revision
# Whether or not to build shared libraries.
# Whether or not to build shared libraries.
build_libtool_libs=$enable_shared
build_libtool_libs=$enable_shared
# Whether or not to build static libraries.
# Whether or not to build static libraries.
build_old_libs=$enable_static
build_old_libs=$enable_static
# Which release of libtool.m4 was used?
macro_version=$macro_version
macro_revision=$macro_revision
# What type of objects to build.
# What type of objects to build.
pic_mode=$pic_mode
pic_mode=$pic_mode
...
...
This diff is collapsed.
Click to expand it.
build/configure.ac
+
7
−
1
View file @
17c60a2f
...
@@ -96,7 +96,7 @@ EOF
...
@@ -96,7 +96,7 @@ EOF
# END CAPABILITY TESTING MACROS
# END CAPABILITY TESTING MACROS
# autoconf setup initialization
# autoconf setup initialization
AC_INIT([np_tmcode],
[8.04],
[giovanni.lamura@inaf.it])
AC_INIT([np_tmcode],[8.04],[giovanni.lamura@inaf.it])
# Folder structure safety check
# Folder structure safety check
AC_CONFIG_SRCDIR([../src/libnptm/TransitionMatrix.cpp])
AC_CONFIG_SRCDIR([../src/libnptm/TransitionMatrix.cpp])
...
@@ -108,6 +108,12 @@ AC_CONFIG_AUX_DIR([build_aux])
...
@@ -108,6 +108,12 @@ AC_CONFIG_AUX_DIR([build_aux])
# automake initialization
# automake initialization
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
# Set the default library policy
AC_DISABLE_SHARED
AC_DISABLE_SHARED([])
AC_ENABLE_STATIC
AC_ENABLE_STATIC([])
# Compiler detection
# Compiler detection
AM_PROG_AR
AM_PROG_AR
AC_ARG_ENABLE(
AC_ARG_ENABLE(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment