Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.177
retrieving revision 1.177.4.1
diff -u -r1.177 -r1.177.4.1
--- configure.in	15 Sep 2006 11:19:11 -0000	1.177
+++ configure.in	19 Sep 2006 20:57:46 -0000	1.177.4.1
@@ -3938,6 +3938,10 @@
       AC_MSG_ERROR([no, upgrade libc])
    fi
 fi
+AC_CHECK_FUNC(getopt, HAVE_GETOPT=YES, HAVE_GETOPT=NO)
+AC_CHECK_FUNC(readdir_r, HAVE_READDIR_R=YES, HAVE_READDIR_R=NO)
+AC_SUBST(HAVE_READDIR_R)
+AC_SUBST(HAVE_GETOPT)
 
 dnl =========================================
 dnl Check for the Microsoft Platform SDK.
Index: set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.116
retrieving revision 1.116.4.1
diff -u -r1.116 -r1.116.4.1
--- set_soenv.in	15 Sep 2006 11:19:23 -0000	1.116
+++ set_soenv.in	19 Sep 2006 20:57:46 -0000	1.116.4.1
@@ -1617,6 +1617,8 @@
 ToFile( "CVER",              $CVER,              "e" );
 ToFile( "GUI",               $GUI,               "e" );
 ToFile( "GLIBC",             $GLIBC,             "e" );
+ToFile( "HAVE_GETOPT",       "@HAVE_GETOPT@",    "e" );
+ToFile( "HAVE_READDIR_R",    "@HAVE_READDIR_R@", "e" );
 ToFile( "GUIBASE",           $GUIBASE,           "e" );
 ToFile( "GUIENV",            $GUIENV,            "e" );
 ToFile( "GVER",              $GVER,              "e" );