Fix for bug #548083



See
http://bugzilla.gnome.org/show_bug.cgi?id=548083

for the explanation.

IIRC this fixes a bunch of warnings about -I- being used in ORBit2 as
well so I'd like to get this in before 2.24.0 if that's ok?

Cheers
Kjartan

Index: util.c
===================================================================
--- util.c	(revision 591)
+++ util.c	(arbetskopia)
@@ -227,10 +227,10 @@
 	FILE *input;
 	char *cmd;
 #ifdef HAVE_CPP_PIPE_STDIN
-	char *fmt = CPP_PROGRAM " " CPP_NOSTDINC " - %s%s %s < \"%s\" %s";
+	char *fmt = CPP_PROGRAM " - %s%s %s < \"%s\" %s";
 	char *wd;
 #else
-	char *fmt = CPP_PROGRAM " " CPP_NOSTDINC " -I- -I%s %s \"%s\" %s";
+	char *fmt = CPP_PROGRAM " -I%s %s \"%s\" %s";
 	char cwd[2048];
 #ifdef HAVE_SYMLINK
 	char *s, *tmpfilename;
Index: configure.in
===================================================================
--- configure.in	(revision 591)
+++ configure.in	(arbetskopia)
@@ -55,7 +55,6 @@
 	AC_MSG_WARN(CPP does not accept IDL)
 fi
 AC_CPP_PIPE_STDIN
-AC_CPP_NOSTDINC
 CPP_PROGRAM="$CPP"
 AC_DEFINE_UNQUOTED(CPP_PROGRAM, "$CPP")
 
Index: Makefile.msc.in
===================================================================
--- Makefile.msc.in	(revision 591)
+++ Makefile.msc.in	(arbetskopia)
@@ -37,7 +37,7 @@
 # All .c files go into the DLL except tstidl.c, so we can use _DLIBIDL_COMPILATION
 # in general, correspondingly then build tstidl.exe directly from tstidl.c
 DEFS = -DLIBIDL_VERSION=\"@LIBIDL_VERSION \" \
-       -DCPP_PROGRAM="\"cl.exe /E /nologo\"" -DCPP_NOSTDINC=\"\" \
+       -DCPP_PROGRAM="\"cl.exe /E /nologo\"" \
        -DSTDC_HEADERS -DHAVE_POPEN -DHAVE_STDDEF_H -DHAVE_WCHAR_H \
        -DYYTEXT_POINTER -DYYDEBUG \
        -DG_LOG_DOMAIN=\"libIDL\" \
Index: acinclude.m4
===================================================================
--- acinclude.m4	(revision 591)
+++ acinclude.m4	(arbetskopia)
@@ -37,14 +37,3 @@
 			cp "$2" "$1"
 		fi
 	fi])
-
-AC_DEFUN([AC_CPP_NOSTDINC],
-       [AC_CACHE_CHECK([how to ignore standard include path],
-               ac_cv_cpp_nostdinc,
-               [saved_CPPFLAGS="$CPPFLAGS"
-               CPPFLAGS="$CPPFLAGS -I-"
-               AC_TRY_CPP(,ac_cv_cpp_nostdinc=-I-,
-                       [CPPFLAGS="$saved_CPPFLAGS -I"
-                       AC_TRY_CPP(,ac_cv_cpp_nostdinc=-I,)])
-               CPPFLAGS="$saved_CPPFLAGS"])
-       AC_DEFINE_UNQUOTED(CPP_NOSTDINC, "$ac_cv_cpp_nostdinc")])


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]