Commit adb7ea2d authored by Lynn Garren's avatar Lynn Garren

set AR and ARFLAGS

merge other changes from 1.9 into 2.0
parent 0321d2ed
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
tempincludedir = $(TEMPDIR)/CLHEP/@PACKAGE@
COPY_P = @COPY_P@
......
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
# put . first so that CLHEP directory is built before anything else
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Cast, 2.0.1.2, CLHEP@cern.ch, Cast)
AC_INIT(CLHEP Cast, 2.0.2.0, CLHEP@cern.ch, Cast)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/itos.cc])
......@@ -40,6 +40,15 @@ AC_ARG_ENABLE(static,
esac],
[build_static="yes"])
AC_ARG_ENABLE(gmake,
AC_HELP_STRING([--enable-gmake],[use gmake (default is make)]),
[case "${enableval}" in
yes) use_gmake="yes";;
no) use_gmake="no";;
*) use_gmake="no";;
esac],
[use_gmake="no"])
# ----------------------------------------------------------------------
# Identify the files that 'configure' is to produce:
# ----------------------------------------------------------------------
......@@ -139,6 +148,7 @@ case "$target" in
;;
*-*-solaris*)
COPY_P="cp -p";DIFF_Q="diff -b"
use_gmake="yes"
;;
*-*-linux*)
COPY_P="cp -p";DIFF_Q="diff -q -b"
......@@ -147,6 +157,8 @@ case "$target" in
COPY_P="cp -p";DIFF_Q="diff -q -b"
esac
AM_CONDITIONAL(USE_GMAKE, test x$use_gmake = xyes)
AC_SUBST(COPY_P)
AC_SUBST(DIFF_Q)
......@@ -158,16 +170,19 @@ g++)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
c++)
case "$target" in
......@@ -175,19 +190,23 @@ c++)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
CC)
......@@ -197,25 +216,31 @@ CC)
MY_SHFLAGS="-KPIC -DPIC"; MY_SHLINK="-G"; SHEXT=so
MY_SHNAME="-h"; MY_LD="-R"
AM_LDFLAGS="-lsunmath"
AR="CC"; ARFLAGS="-xar -o"
;;
*-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
*-*-irix*) AM_CXXFLAGS="-O -OPT:Olimit=0 -pta"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
*) echo UNEXPECTED CHOICE OF OPERATING SYSTEM FOR $CXX: $target
esac;;
aCC)
AM_CXXFLAGS="-O -Aa +DAportable +Onolimit"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
cxx)
AM_CXXFLAGS="-O -std strict_ansi -timplicit_local"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
xlC)
AM_CXXFLAGS="-O3 -qtwolink -+"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
......@@ -231,6 +256,8 @@ AC_SUBST(MY_SHLINK)
AC_SUBST(MY_SHNAME)
AC_SUBST(MY_LD)
AC_SUBST(SHEXT)
AC_SUBST(AR)
AC_SUBST(ARFLAGS)
# ----------------------------------------------------------------------
# Set system-dependent options:
......
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
INCLUDES = -I$(top_builddir)
libCLHEP_Cast_@VERSION@_a_SOURCES = \
......
Thu Apr 7 2005 Lynn Garren <garren@fnal.gov>
* configure.in: set AR and ARFLAGS
2005-03-15 Lynn Garren <garren@fnal.gov>
* examples are now installed
2005-03-15 Mark Fischler <mf@fnal.gov>
* engineIDulong.cc, engineIDulong.h
......
2005-04-07 Lynn Garren <garren@fnal.gov>
* configure.in: set AR and ARFLAGS
2005-02-18 Lynn Garren <garren@fnal.gov>
* configure.in, Makefile.am: Stop using libtool.
The newer releases of libtool seem to have dropped support for
Windows Visual C++.
2005-02-14 Lynn Garren <garren@fnal.gov>
* configure.in: Visual C++ flags are now "-EHsc -nologo -GR -GX -MD"
2005-02-03 Lynn Garren <garren@fnal.gov>
* configure.in: install step creates libCLHEP.a, libCLHEP.so,
and/or libCLHEP.dylib by adding a symbolic link.
2005-02-02 Andreas PFEIFFER <andreas.pfeiffer@cern.ch>
* configure.in: modified compiler flags for windows:
added "-O -GR -GX -MD" as this is needed for the multi-thread
environments used.
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
......@@ -10,6 +35,11 @@ Fri Sep 24 2004 Lynn Garren <garren@fnal.gov>
* use AM_CXXFLAGS
* require autoconf 2.59, automake 1.9.1, and libtool 1.9b
Tue Aug 31 2004 Lynn Garren <garren@fnal.gov>
* change Solaris CC compile flags from "-O -mt" to "-O"
* libtools 1.9b or later is required for Solaris CC
==============================
23.07.04 Release CLHEP-2.0.1.0
==============================
......
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
tempincludedir = $(TEMPDIR)/CLHEP/@PACKAGE@
COPY_P = @COPY_P@
......
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
# put . first so that CLHEP directory is built before anything else
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Evaluator, 2.0.1.2, CLHEP@cern.ch, Evaluator)
AC_INIT(CLHEP Evaluator, 2.0.2.0, CLHEP@cern.ch, Evaluator)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Evaluator.cc])
......@@ -40,6 +40,15 @@ AC_ARG_ENABLE(static,
esac],
[build_static="yes"])
AC_ARG_ENABLE(gmake,
AC_HELP_STRING([--enable-gmake],[use gmake (default is make)]),
[case "${enableval}" in
yes) use_gmake="yes";;
no) use_gmake="no";;
*) use_gmake="no";;
esac],
[use_gmake="no"])
# ----------------------------------------------------------------------
# Identify the files that 'configure' is to produce:
# ----------------------------------------------------------------------
......@@ -141,6 +150,7 @@ case "$target" in
;;
*-*-solaris*)
COPY_P="cp -p";DIFF_Q="diff -b"
use_gmake="yes"
;;
*-*-linux*)
COPY_P="cp -p";DIFF_Q="diff -q -b"
......@@ -149,6 +159,8 @@ case "$target" in
COPY_P="cp -p";DIFF_Q="diff -q -b"
esac
AM_CONDITIONAL(USE_GMAKE, test x$use_gmake = xyes)
AC_SUBST(COPY_P)
AC_SUBST(DIFF_Q)
......@@ -160,16 +172,19 @@ g++)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
c++)
case "$target" in
......@@ -177,19 +192,23 @@ c++)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
CC)
......@@ -199,25 +218,31 @@ CC)
MY_SHFLAGS="-KPIC -DPIC"; MY_SHLINK="-G"; SHEXT=so
MY_SHNAME="-h"; MY_LD="-R"
AM_LDFLAGS="-lsunmath"
AR="CC"; ARFLAGS="-xar -o"
;;
*-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
*-*-irix*) AM_CXXFLAGS="-O -OPT:Olimit=0 -pta"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
*) echo UNEXPECTED CHOICE OF OPERATING SYSTEM FOR $CXX: $target
esac;;
aCC)
AM_CXXFLAGS="-O -Aa +DAportable +Onolimit"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
cxx)
AM_CXXFLAGS="-O -std strict_ansi -timplicit_local"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
xlC)
AM_CXXFLAGS="-O3 -qtwolink -+"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
......@@ -233,6 +258,8 @@ AC_SUBST(MY_SHLINK)
AC_SUBST(MY_SHNAME)
AC_SUBST(MY_LD)
AC_SUBST(SHEXT)
AC_SUBST(AR)
AC_SUBST(ARFLAGS)
# ----------------------------------------------------------------------
# Set system-dependent options:
......
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
INCLUDES = -I$(top_builddir)
libCLHEP_Evaluator_@VERSION@_a_SOURCES = \
......
# Applicable to each test program:
if USE_GMAKE
MAKE = gmake
endif
INCLUDES = -I$(top_builddir)/
# libraries to link, and whence
......
2005-04-07 Lynn Garren <garren@fnal.gov>
* configure.in: set AR and ARFLAGS
2005-02-18 Lynn Garren <garren@fnal.gov>
* configure.in, Makefile.am: Stop using libtool.
The newer releases of libtool seem to have dropped support for
Windows Visual C++.
2005-02-14 Lynn Garren <garren@fnal.gov>
* configure.in: Visual C++ flags are now "-EHsc -nologo -GR -GX -MD"
2005-02-03 Lynn Garren <garren@fnal.gov>
* configure.in: install step creates libCLHEP.a, libCLHEP.so,
and/or libCLHEP.dylib by adding a symbolic link.
2005-02-02 Andreas PFEIFFER <andreas.pfeiffer@cern.ch>
* configure.in: modified compiler flags for windows:
added "-O -GR -GX -MD" as this is needed for the multi-thread
environments used.
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
......@@ -10,6 +35,11 @@ Fri Sep 24 2004 Lynn Garren <garren@fnal.gov>
* use AM_CXXFLAGS
* require autoconf 2.59, automake 1.9.1, and libtool 1.9b
Tue Aug 31 2004 Lynn Garren <garren@fnal.gov>
* change Solaris CC compile flags from "-O -mt" to "-O"
* libtools 1.9b or later is required for Solaris CC
==============================
23.07.04 Release CLHEP-2.0.1.0
==============================
......@@ -26,7 +56,6 @@ Fri Sep 24 2004 Lynn Garren <garren@fnal.gov>
21.04.04 Release CLHEP-2.0.0.1
==============================
Thu Nov 06 2003 Lynn Garren <garren@fnal.gov>
* adding ZOOM Exceptions package for FNAL
......
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
tempincludedir = $(TEMPDIR)/CLHEP/@PACKAGE@
COPY_P = @COPY_P@
......
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
# put . first so that CLHEP directory is built before anything else
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Exceptions, 2.0.1.2, CLHEP@cern.ch, Exceptions)
AC_INIT(CLHEP Exceptions, 2.0.2.0, CLHEP@cern.ch, Exceptions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/ZMerrno.cc])
......@@ -40,6 +40,15 @@ AC_ARG_ENABLE(static,
esac],
[build_static="yes"])
AC_ARG_ENABLE(gmake,
AC_HELP_STRING([--enable-gmake],[use gmake (default is make)]),
[case "${enableval}" in
yes) use_gmake="yes";;
no) use_gmake="no";;
*) use_gmake="no";;
esac],
[use_gmake="no"])
# ----------------------------------------------------------------------
# Identify the files that 'configure' is to produce:
# ----------------------------------------------------------------------
......@@ -149,6 +158,7 @@ case "$target" in
;;
*-*-solaris*)
COPY_P="cp -p";DIFF_Q="diff -b"
use_gmake="yes"
;;
*-*-linux*)
COPY_P="cp -p";DIFF_Q="diff -q -b"
......@@ -157,6 +167,8 @@ case "$target" in
COPY_P="cp -p";DIFF_Q="diff -q -b"
esac
AM_CONDITIONAL(USE_GMAKE, test x$use_gmake = xyes)
AC_SUBST(COPY_P)
AC_SUBST(DIFF_Q)
......@@ -168,16 +180,19 @@ g++)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
c++)
case "$target" in
......@@ -185,19 +200,23 @@ c++)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
CC)
......@@ -207,25 +226,31 @@ CC)
MY_SHFLAGS="-KPIC -DPIC"; MY_SHLINK="-G"; SHEXT=so
MY_SHNAME="-h"; MY_LD="-R"
AM_LDFLAGS="-lsunmath"
AR="CC"; ARFLAGS="-xar -o"
;;
*-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
*-*-irix*) AM_CXXFLAGS="-O -OPT:Olimit=0 -pta"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
*) echo UNEXPECTED CHOICE OF OPERATING SYSTEM FOR $CXX: $target
esac;;
aCC)
AM_CXXFLAGS="-O -Aa +DAportable +Onolimit"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
cxx)
AM_CXXFLAGS="-O -std strict_ansi -timplicit_local"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
xlC)
AM_CXXFLAGS="-O3 -qtwolink -+"
AR="ar"; ARFLAGS="cru"
build_shared="no"
;;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
......@@ -241,6 +266,8 @@ AC_SUBST(MY_SHLINK)
AC_SUBST(MY_SHNAME)
AC_SUBST(MY_LD)
AC_SUBST(SHEXT)
AC_SUBST(AR)
AC_SUBST(ARFLAGS)
# ----------------------------------------------------------------------
# Set system-dependent options:
......
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
TEX = latex
doc_srcdir = $(top_srcdir)/doc
doc_builddir = $(top_builddir)/doc
......
## Process this file with automake to produce Makefile.in
if USE_GMAKE
MAKE = gmake
endif
INCLUDES = -I$(top_builddir)
libCLHEP_Exceptions_@VERSION@_a_SOURCES = \
......
# Applicable to each test program:
if USE_GMAKE
MAKE = gmake
endif
INCLUDES = -I$(top_builddir)/
# libraries to link, and whence
......
2005-04-07 Lynn Garren <garren@fnal.gov>
* configure.in: set AR and ARFLAGS
2005-02-18 Lynn Garren <garren@fnal.gov>
* configure.in, Makefile.am: Stop using libtool.
The newer releases of libtool seem to have dropped support for
Windows Visual C++.
2005-02-14 Lynn Garren <garren@fnal.gov>
* configure.in: Visual C++ flags are now "-EHsc -nologo -GR -GX -MD"
Fri Feb 11 2005 Mark Fischler <mf@fnal.gov>
* LogGamma.h
......@@ -10,6 +24,17 @@ Fri Feb 11 2005 Mark Fischler <mf@fnal.gov>
Declared methods inline to prevent double-inclusion problem (Bug 2166)
2005-02-03 Lynn Garren <garren@fnal.gov>
* configure.in: install step creates libCLHEP.a, libCLHEP.so,
and/or libCLHEP.dylib by adding a symbolic link.