7 files changed, 49 insertions, 167 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 236abbbcbb2..f3ca073c875 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,20 @@
+Sun Jul 31 11:14:23 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/generate_doxygen.pl:
+          Don't generate man pages, not used
+
+        * debian/*:
+          Pull in latest version from debian packaging
+
+        * protocols/ace/INet/ACE_INet.pc.in:
+        * protocols/ace/INet/ACE_INet_SSL.pc.in:
+        * protocols/ace/INet/inet.mpc:
+        * protocols/ace/INet/inet_ssl.mpc:
+          Added pc.in files
+
+        * etc/ace_man.doxygen:
+          Removed this file.
+
 Sat Jul 30 13:11:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/config-windows.h:
diff --git a/ACE/bin/generate_doxygen.pl b/ACE/bin/generate_doxygen.pl
index 3fd02934168..f2c50a02578 100755
--- a/ACE/bin/generate_doxygen.pl
+++ b/ACE/bin/generate_doxygen.pl
@@ -44,7 +44,6 @@ if (defined $DDS_ROOT && -r "$DDS_ROOT/VERSION") {
 }
 
 @ACE_DOCS = ('ace',
-             'ace_man',
              'ace_rmcast',
              'ace_ssl',
              'ace_qos',
diff --git a/ACE/etc/ace_man.doxygen b/ACE/etc/ace_man.doxygen
deleted file mode 100644
index 6fad36d0dfe..00000000000
--- a/ACE/etc/ace_man.doxygen
+++ /dev/null
@@ -1,166 +0,0 @@
-# Doxyfile 1.1.5
-#
-# $Id$
-#
-
-PROJECT_NAME          = ACE
-PROJECT_NUMBER        = Snapshot
-OUTPUT_DIRECTORY      = .
-OUTPUT_LANGUAGE       = English
-DISABLE_INDEX         = NO
-EXTRACT_ALL           = YES
-EXTRACT_PRIVATE       = YES
-EXTRACT_STATIC        = YES
-HIDE_UNDOC_MEMBERS    = NO
-HIDE_UNDOC_CLASSES    = NO
-BRIEF_MEMBER_DESC     = YES
-REPEAT_BRIEF          = YES
-ALWAYS_DETAILED_SEC   = NO
-FULL_PATH_NAMES       = NO
-STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
-CLASS_DIAGRAMS        = NO
-SOURCE_BROWSER        = NO
-INLINE_SOURCES        = NO
-STRIP_CODE_COMMENTS   = NO
-CASE_SENSE_NAMES      = YES
-HIDE_SCOPE_NAMES      = NO
-VERBATIM_HEADERS      = NO
-SHOW_INCLUDE_FILES    = YES
-JAVADOC_AUTOBRIEF     = NO
-INHERIT_DOCS          = YES
-INLINE_INFO           = YES
-SORT_MEMBER_DOCS      = YES
-DISTRIBUTE_GROUP_DOC  = YES
-TAB_SIZE              = 8
-ENABLED_SECTIONS      =
-SHORT_NAMES           = YES
-GENERATE_DEPRECATEDLIST = YES
-GENERATE_TODOLIST       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-QUIET                 = YES
-WARNINGS              = YES
-WARN_IF_UNDOCUMENTED  = YES
-WARN_FORMAT           = "$file:$line: $text"
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-INPUT                 = ace
-FILE_PATTERNS         = *.h
-RECURSIVE             = NO
-EXCLUDE               = ace/config.h
-EXCLUDE_PATTERNS      = config-*.h
-EXAMPLE_PATH          =
-EXAMPLE_PATTERNS      =
-IMAGE_PATH            =
-INPUT_FILTER          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-ALPHABETICAL_INDEX    = YES
-COLS_IN_ALPHA_INDEX   = 1
-IGNORE_PREFIX         =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-GENERATE_HTML         = NO
-HTML_OUTPUT           =
-HTML_HEADER           =
-HTML_FOOTER           =
-HTML_STYLESHEET       =
-HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-GENERATE_LATEX        = NO
-LATEX_OUTPUT          = latex
-COMPACT_LATEX         = NO
-PAPER_TYPE            = a4wide
-EXTRA_PACKAGES        =
-LATEX_HEADER          =
-PDF_HYPERLINKS        = NO
-LATEX_BATCHMODE       = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-GENERATE_RTF          = NO
-RTF_OUTPUT            = rtf
-COMPACT_RTF           = NO
-RTF_HYPERLINKS        = NO
-RTF_STYLESHEET_FILE   =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-GENERATE_MAN          = YES
-MAN_OUTPUT            = man
-MAN_EXTENSION         = .3
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-ENABLE_PREPROCESSING  = YES
-MACRO_EXPANSION       = YES
-EXPAND_ONLY_PREDEF    = YES
-SEARCH_INCLUDES       = YES
-INCLUDE_PATH          = .
-PREDEFINED            = __ACE_INLINE__ \
-                        ACE_TEMPLATES_REQUIRE_SOURCE \
-                        ACE_BEGIN_VERSIONED_NAMESPACE_DECL \
-                        ACE_END_VERSIONED_NAMESPACE_DECL \
-                        ACE_INLINE=inline
-EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-TAGFILES              =
-GENERATE_TAGFILE      =
-ALLEXTERNALS          = NO
-PERL_PATH             = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz
-
-HAVE_DOT              = NO
-CLASS_GRAPH           = NO
-COLLABORATION_GRAPH   = NO
-INCLUDE_GRAPH         = NO
-INCLUDED_BY_GRAPH     = NO
-GRAPHICAL_HIERARCHY   = NO
-DOT_MULTI_TARGETS     = YES
-MAX_DOT_GRAPH_DEPTH   = 3
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found on the path.
-DOT_PATH              =
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-
-SEARCHENGINE          = NO
-
diff --git a/ACE/protocols/ace/INet/ACE_INet.pc.in b/ACE/protocols/ace/INet/ACE_INet.pc.in
new file mode 100644
index 00000000000..5784ea3b40f
--- /dev/null
+++ b/ACE/protocols/ace/INet/ACE_INet.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ACE_INet
+Description: ACE INet Client Protocols Library
+Requires: ACE
+Version: @VERSION@
+Libs: -L${libdir} -lACE_INet
+Cflags: -I${includedir}
diff --git a/ACE/protocols/ace/INet/ACE_INet_SSL.pc.in b/ACE/protocols/ace/INet/ACE_INet_SSL.pc.in
new file mode 100644
index 00000000000..7e6720b5a70
--- /dev/null
+++ b/ACE/protocols/ace/INet/ACE_INet_SSL.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ACE_INet_SSL
+Description: ACE INet Client Protocols With SSL Library
+Requires: ACE_SSL
+Version: @VERSION@
+Libs: -L${libdir} -lACE_INet_SSL
+Cflags: -I${includedir}
diff --git a/ACE/protocols/ace/INet/inet.mpc b/ACE/protocols/ace/INet/inet.mpc
index 9492f8a668f..d7b676a4b76 100644
--- a/ACE/protocols/ace/INet/inet.mpc
+++ b/ACE/protocols/ace/INet/inet.mpc
@@ -54,6 +54,11 @@ project(INet) : acelib, ace_output, install {
   specific {
     install_dir = ace/INet
   }
+
+  Pkgconfig_Files {
+    ACE_INet.pc.in
+  }
+
 }
 
 // This project will be generated with and without ssl=1 feature
diff --git a/ACE/protocols/ace/INet/inet_ssl.mpc b/ACE/protocols/ace/INet/inet_ssl.mpc
index 5f4ea9989c6..143e1dd0e2c 100644
--- a/ACE/protocols/ace/INet/inet_ssl.mpc
+++ b/ACE/protocols/ace/INet/inet_ssl.mpc
@@ -25,4 +25,9 @@ project(INet_SSL) : acelib, ace_output, install, inet, ssl {
   specific {
     install_dir = ace/INet
   }
+
+  Pkgconfig_Files {
+    ACE_INet_SSL.pc.in
+  }
+
 }