diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-01-13 04:57:10 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-01-13 04:57:10 +0000 |
| commit | 9c07c725dada44f7a1eb60c55d4bf489f36f9da0 (patch) | |
| tree | a5fc80db6144bea34242d9378fd920d2fa4c35db | |
| parent | 1fc32076bbb28f75b0a9a5e2a2e88f821c1d084e (diff) | |
| download | ATCD-9c07c725dada44f7a1eb60c55d4bf489f36f9da0.tar.gz | |
ChangeLogTag: Fri Jan 13 04:49:41 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 19 |
2 files changed, 21 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 3ce50d0a57c..9d1dcef1d3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Jan 13 04:49:41 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * configure.ac: + + Changed to use AC_SEARCH_LIBS for the -lsocket and -lnsl + libraries before calling ACE_CONFIGURATION_OPTIONS. Third party + libraries may those libraries, and if they haven't been added to + $LIBS, the feature tests will fail. + Thu Jan 12 20:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_time.inl: diff --git a/configure.ac b/configure.ac index 29e55e8806b..bbd2cb07e02 100644 --- a/configure.ac +++ b/configure.ac @@ -208,6 +208,18 @@ dnl Determine which subsets to build dnl This is done using the autoconf "--enable-foobar" mechanism. ACE_CHECK_SUBSETS +dnl Some of the third party libraries (X11, openssl, etc.) depend on +dnl other libraries. Check for those before the processing --enable +dnl options. + +dnl Check if the socket library is available +AC_SEARCH_LIBS([socket],[socket],,,[-lnsl]) + +dnl Check for gethostbyname in -lnsl since some platforms (e.g. Solaris) +dnl put it there. +AC_SEARCH_LIBS([gethostbyname],[nsl],,) + + dnl Add --{enable,disable,with,without}-feature options. ACE_CONFIGURATION_OPTIONS ACE_COMPILATION_OPTIONS @@ -312,13 +324,6 @@ AC_SEARCH_LIBS([dlopen],[dl svld],[ace_has_svr4_dynamic_linking=yes], AC_CHECK_LIB([dld],[shl_get],,) ]) -dnl Check if the socket library is available -AC_SEARCH_LIBS([socket],[socket],,,[-lnsl]) - -dnl Check for gethostbyname in -lnsl since some platforms (e.g. Solaris) -dnl put it there. -AC_SEARCH_LIBS([gethostbyname],[nsl],,) - dnl Check for getservbyname in -lxnet since some platforms (e.g. Solaris) dnl may put it there. AC_SEARCH_LIBS([getservbyname],[socket xnet],,[AC_DEFINE([ACE_LACKS_GETSERVBYNAME])],[-lnsl]) |