diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-03-31 08:45:34 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-03-31 08:45:34 +0000 |
| commit | 6da33d9677c4c1354c66af9b741adc2e3ab0335b (patch) | |
| tree | 558fc9814a69e184c93c806c210a818525c6d847 /TAO | |
| parent | 400bcf9c449085b6b28b28d1e93fa3fde559d0d7 (diff) | |
| download | ATCD-6da33d9677c4c1354c66af9b741adc2e3ab0335b.tar.gz | |
Mon Mar 31 08:45:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/configure.ac | 31 |
2 files changed, 34 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 06f9bc8917e..7126d7d0042 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Mar 31 08:45:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * configure.ac: + Improved TAO autoconf support, fixes bugzilla 3274 + This to Thomas Girard <thomas dot g dot girard at free dot fr> + for reporting this + Mon Mar 31 08:39:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp: diff --git a/TAO/configure.ac b/TAO/configure.ac index 470f1e3e57c..e40f57c7ad4 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -124,10 +124,6 @@ dnl Check the C++ compiler and preprocessor. AC_PROG_CXX AC_PROG_CXXCPP -dnl Configure libtool -AC_DISABLE_STATIC -AC_PROG_LIBTOOL - ACE_CHECK_THREADS dnl Set the test language as C++ @@ -188,6 +184,33 @@ ACE_PATH_ZLIB TAO_ENABLE_EXAMPLES TAO_ENABLE_TESTS +dnl The user's/default C++ flags are stored in "CXXFLAGS." We use +dnl the variable "ACE_CXXFLAGS" to set the C++ flags we want. At the end +dnl of the configuration process we combine ACE_CXXFLAGS and CXXFLAGS +dnl into CXXFLAGS (e.g., CXXFLAGS="$ACE_CXXFLAGS $CXXFLAGS"). CXXFLAGS +dnl goes after ACE_CXXFLAGS so that the user's C++ flag command line +dnl choices always override the configure script's choices. +ACE_CXXFLAGS="" +ACE_CFLAGS="" + +ACE_SET_COMPILER_FLAGS + +dnl Disable building of static libraries by default +AC_DISABLE_STATIC + +dnl Enable Libtool module support +AC_LIBTOOL_DLOPEN + +dnl Enable support for "clean" DLLs. +AC_LIBTOOL_WIN32_DLL + +dnl Check for libtool and turn on Automake processing for Libtool +AC_PROG_LIBTOOL + +CXXFLAGS="$ACE_CXXFLAGS $X_CFLAGS $CXXFLAGS" +CFLAGS="$ACE_CFLAGS $X_CFLAGS $CFLAGS" +CPPFLAGS="$ACE_CPPFLAGS $CPPFLAGS" +LDFLAGS="$ACE_LDFLAGS $LDFLAGS" dnl dnl SECTION 16: AC_CONFIG_FILES([FILE...]) |