r2835: Since we always have -I. and -I$(srcdir) in CFLAGS, we can get rid of

'..' from all #include preprocessor commands.   This fixes bugzilla #1880
where OpenVMS gets confused about the '.' characters.
(This used to be commit 7f161702fa)

source3/aparser/parser.h

@@ -4,7 +4,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "../include/byteorder.h"
+#include "include/byteorder.h"
 
 #define PARSE_SCALARS (1<<0)
 #define PARSE_BUFFERS (1<<1)

source3/client/client.c

@@ -23,7 +23,7 @@
 #define NO_SYSLOG
 
 #include "includes.h"
-#include "../client/client_proto.h"
+#include "client/client_proto.h"
 #ifndef REGISTER
 #define REGISTER 0
 #endif

source3/client/clitar.c

@@ -37,7 +37,7 @@
 
 #include "includes.h"
 #include "clitar.h"
-#include "../client/client_proto.h"
+#include "client/client_proto.h"
 
 static int clipfind(char **aret, int ret, char *tok);
 

source3/include/includes.h

@@ -793,9 +793,9 @@ extern int errno;
 #include "ubi_sLinkList.h"
 #include "ubi_dLinkList.h"
 #include "dlinklist.h"
-#include "../tdb/tdb.h"
-#include "../tdb/spinlock.h"
-#include "../tdb/tdbutil.h"
+#include "tdb/tdb.h"
+#include "tdb/spinlock.h"
+#include "tdb/tdbutil.h"
 #include "talloc.h"
 #include "nt_status.h"
 #include "ads.h"

source3/include/libsmb_internal.h

@@ -6,7 +6,7 @@
 #define SMBC_DIR_MODE  (S_IFDIR | 0555)
 
 
-#include "../include/libsmbclient.h"
+#include "include/libsmbclient.h"
 
 
 struct _SMBCSRV {

source3/libsmb/libsmb_cache.c

@@ -27,7 +27,7 @@
  * Define this to get the real SMBCFILE and SMBCSRV structures 
  */
 #define _SMBC_INTERNAL
-#include "../include/libsmbclient.h"
+#include "include/libsmbclient.h"
 
 /*
  * Structure we use if internal caching mechanism is used 

source3/libsmb/libsmb_compat.c

@@ -25,7 +25,7 @@
 
 #include "includes.h"
 
-#include "../include/libsmb_internal.h"
+#include "include/libsmb_internal.h"
 
 struct smbc_compat_fdlist {
 	SMBCFILE * file;

source3/libsmb/libsmbclient.c

@@ -24,7 +24,7 @@
 
 #include "includes.h"
 
-#include "../include/libsmb_internal.h"
+#include "include/libsmb_internal.h"
 
 /*
  * Internal flags for extended attributes

source3/nsswitch/winbindd.h

@@ -230,7 +230,7 @@ struct winbindd_idmap_methods {
   void (*status)(void);
 };
 
-#include "../nsswitch/winbindd_proto.h"
+#include "nsswitch/winbindd_proto.h"
 
 #include "rpc_parse.h"
 #include "rpc_client.h"

source3/utils/net.c

@@ -38,7 +38,7 @@
 /*****************************************************/
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 /***********************************************************************/
 /* Beginning of internationalization section.  Translatable constants  */

source3/utils/net.h

@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include "../utils/net_proto.h"
+#include "utils/net_proto.h"
  
 #define NET_FLAGS_MASTER 1
 #define NET_FLAGS_DMB 2

source3/utils/net_ads.c

@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 #ifdef HAVE_ADS
 

source3/utils/net_ads_cldap.c

@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 #ifdef HAVE_ADS
 

source3/utils/net_groupmap.c

@@ -22,7 +22,7 @@
 
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 
 /*********************************************************

source3/utils/net_help.c

@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 int net_common_methods_usage(int argc, const char**argv)
 {

source3/utils/net_idmap.c

@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 
 /***********************************************************

source3/utils/net_lookup.c

@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 int net_lookup_usage(int argc, const char **argv)
 {

source3/utils/net_rap.c

@@ -24,7 +24,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 /* The following messages were for error checking that is not properly 
    reported at the moment.  Which should be reinstated? */

source3/utils/net_rpc.c

@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 /**
  * @file net_rpc.c

source3/utils/net_rpc_join.c

@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 /* Macro for checking RPC error codes to make things more readable */
 

source3/utils/net_rpc_printer.c

@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 struct table_node {
 	const char *long_archi;

source3/utils/net_rpc_samsync.c

@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 extern DOM_SID global_sid_Builtin; 
 

source3/utils/net_status.c

@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 static int show_session(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
 			void *state)

source3/utils/net_time.c

@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 
 /*

source3/utils/ntlm_auth.c

@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "../utils/ntlm_auth.h"
+#include "utils/ntlm_auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

source3/utils/ntlm_auth.h

@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include "../utils/ntlm_auth_proto.h"
+#include "utils/ntlm_auth_proto.h"
  
 /* Some of the popt variables are needed in the diagnostics code */
 extern const char *opt_username;

source3/utils/ntlm_auth_diagnostics.c

@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "../utils/ntlm_auth.h"
+#include "utils/ntlm_auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

source3/web/cgi.c

@@ -19,7 +19,7 @@
 
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 #define MAX_VARIABLES 10000
 

source3/web/diagnose.c

@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 #ifdef WITH_WINBIND
 

source3/web/neg_lang.c

@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 /*
   during a file download we first check to see if there is a language

source3/web/startstop.c

@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 #include "dynconfig.h"
 
 

source3/web/statuspage.c

@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 #define PIDMAP		struct PidMap
 

source3/web/swat.c

@@ -29,7 +29,7 @@
  **/
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 static BOOL demo_mode = False;
 static BOOL have_write_access = False;