Commit fa65d4c1 authored by Philip Carns's avatar Philip Carns

re-tagging 2.1.0 with autoconf change


git-svn-id: https://svn.mcs.anl.gov/repos/darshan/tags/darshan-2.1.0@423 3b7491f3-a168-0410-bf4b-c445ed680a29
parents a7429b8e b161e18c
all: lib/libdarshan-posix.a lib/libdarshan-mpi-io.a lib/libdarshan.so darshan-parser darshan-diff darshan-analyzer darshan-log-params
all: lib/libdarshan-posix.a lib/libdarshan-mpi-io.a darshan-parser darshan-diff darshan-analyzer darshan-log-params
DESTDIR =
srcdir = @srcdir@
......@@ -11,6 +11,12 @@ sbindir = $(DESTDIR)@sbindir@
bindir = $(DESTDIR)@bindir@
libdir = $(DESTDIR)@libdir@
DISABLE_LDPRELOAD = @DISABLE_LDPRELOAD@
ifndef DISABLE_LDPRELOAD
all: lib/libdarshan.so
endif
VPATH = $(srcdir)
cp_zlib_link_flags = @__CP_ZLIB_LINK_FLAGS@
......@@ -110,7 +116,9 @@ install:: all
install -d $(libdir)
install -m 755 lib/libdarshan-posix.a $(libdir)
install -m 755 lib/libdarshan-mpi-io.a $(libdir)
ifndef DISABLE_LDPRELOAD
install -m 755 lib/libdarshan.so $(libdir)
endif
install -d $(bindir)
install -m 755 darshan-parser $(bindir)
install -m 755 darshan-diff $(bindir)
......
......@@ -593,6 +593,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
DISABLE_LDPRELOAD
__CP_PDFLATEX_HALT_ON_ERROR
CP_WRAPPERS
__CP_ZLIB_INCLUDE_FLAGS
......@@ -660,6 +661,7 @@ ac_user_opts='
enable_option_checking
with_zlib
with_mpi
enable_ld_preload
with_mem_align
with_zlib_for_mpi
with_log_path
......@@ -1279,6 +1281,12 @@ if test -n "$ac_init_help"; then
cat <<\_ACEOF
Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-ld-preload Disables support for LD_PRELOAD library
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
......@@ -3614,6 +3622,15 @@ fi
fi
# Check whether --enable-ld-preload was given.
if test "${enable_ld_preload+set}" = set; then :
enableval=$enable_ld_preload; if test "x$enableval" = "xno" ; then
DISABLE_LDPRELOAD="1"
fi
fi
# Check whether --with-mem-align was given.
if test "${with_mem_align+set}" = set; then :
......@@ -4203,6 +4220,7 @@ fi
ac_config_files="$ac_config_files Makefile darshan-mk-log-dirs.pl darshan-gen-cc.pl darshan-gen-cxx.pl darshan-gen-fortran.pl util/bin/darshan-job-summary.pl"
cat >confcache <<\_ACEOF
......
......@@ -31,6 +31,13 @@ if test x$HAVE_MPICC != xyes; then
fi
AC_SUBST(MPICC)
AC_ARG_ENABLE(ld-preload,
[ --disable-ld-preload Disables support for LD_PRELOAD library],
[if test "x$enableval" = "xno" ; then
DISABLE_LDPRELOAD="1"
fi]
,)
AC_ARG_WITH(mem-align,
[ --with-mem-align=<num> Memory alignment in bytes],
if test x$withval = xyes; then
......@@ -209,6 +216,7 @@ AC_SUBST(__CP_ZLIB_LINK_FLAGS)
AC_SUBST(__CP_ZLIB_INCLUDE_FLAGS)
AC_SUBST(CP_WRAPPERS)
AC_SUBST(__CP_PDFLATEX_HALT_ON_ERROR)
AC_SUBST(DISABLE_LDPRELOAD)
AC_OUTPUT(Makefile
darshan-mk-log-dirs.pl
darshan-gen-cc.pl
......
......@@ -5,7 +5,7 @@ LOGDIR=/intrepid-fs0/logs/darshan/
#darshan
cd ../
./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make && make install
./configure --disable-ld-preload --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make && make install
mkdir -p $LOGDIR
$PREFIX/bin/darshan-mk-log-dirs.pl
......@@ -5,7 +5,7 @@ LOGDIR=/pvfs-surveyor/logs/darshan
#darshan
cd ../
./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make && make install
./configure --disable-ld-preload --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make && make install
mkdir -p $LOGDIR
$PREFIX/bin/darshan-mk-log-dirs.pl
......@@ -5,7 +5,7 @@ LOGDIR=/intrepid-fs0/logs/darshan/
#darshan
cd ../
./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make && make install
./configure --disable-ld-preload --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make && make install
# log dir already exists
#mkdir -p $LOGDIR
......
......@@ -5,7 +5,7 @@ LOGDIR=/pvfs-surveyor/logs/darshan
#darshan
cd ../
./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make && make install
./configure --disable-ld-preload --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make && make install
# log dir already exists
#mkdir -p $LOGDIR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment