[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] gui/configure.ac -- wrong inclusion paths
From: |
Kazunobu Kuriyama |
Subject: |
[PATCH] gui/configure.ac -- wrong inclusion paths |
Date: |
Wed, 18 Feb 2004 15:00:58 +0900 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; ja-JP; rv:1.4) Gecko/20030624 Netscape/7.1 |
Hi,
Due to the wrong order of the inclusion paths set by configure.ac,
cpp first includes the gui's header files in $(GNUSTEP_SYSTEM_ROOT),
not in the source tree. This may cause a compilation failure if a
header file installed there is not consistent with the one coming
with the source.
More specifically, such a failure is caused by the wrong configure
script together with the recent changes of NSFont or GSDrawFunctions,
for example.
The attached patch fixes this.
- Kazunobu Kuriyama
Index: configure.ac
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/gui/configure.ac,v
retrieving revision 1.17
diff -u -r1.17 configure.ac
--- configure.ac 9 Feb 2004 02:12:47 -0000 1.17
+++ configure.ac 18 Feb 2004 05:56:18 -0000
@@ -72,7 +72,6 @@
obj_dir=$clean_target_cpu/$clean_target_os
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$obj_dir
fi
-CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
#--------------------------------------------------------------------
@@ -299,6 +298,7 @@
AC_SUBST(GNUSTEP_GUI_MINOR_VERSION)
AC_SUBST(GNUSTEP_GUI_SUBMINOR_VERSION)
+ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS -I$GNUSTEP_HDIR"
AC_SUBST(ADDITIONAL_LIB_DIRS)
AC_SUBST(ADDITIONAL_INCLUDE_DIRS)
- [PATCH] gui/configure.ac -- wrong inclusion paths,
Kazunobu Kuriyama <=