mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-05-24 00:37:27 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
do not hardcode /usr/include paths
|
|
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -668,6 +668,8 @@ AC_ARG_WITH(cxx_main,
|
|
])
|
|
AC_MSG_RESULT($with_cxx_main)
|
|
|
|
+AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
|
|
+
|
|
preset_cxx="$CXX"
|
|
if test -z "$CXX"
|
|
then
|
|
@@ -1513,7 +1515,7 @@ dnl AC_MSG_RESULT($cpp_type)
|
|
# checks for header files
|
|
AC_HEADER_STDC
|
|
ac_save_cppflags="$CPPFLAGS"
|
|
-CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
|
|
+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`"
|
|
AC_CHECK_HEADERS(asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \
|
|
fcntl.h grp.h \
|
|
ieeefp.h io.h langinfo.h libintl.h ncurses.h process.h pthread.h \
|
|
@@ -2225,8 +2227,6 @@ LIBS="$withval $LIBS"
|
|
],
|
|
[AC_MSG_RESULT(no)])
|
|
|
|
-AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
|
|
-
|
|
# Check for use of the system expat library
|
|
AC_MSG_CHECKING(for --with-system-expat)
|
|
AC_ARG_WITH(system_expat,
|
|
@@ -4273,7 +4273,7 @@ then
|
|
fi
|
|
|
|
ac_save_cppflags="$CPPFLAGS"
|
|
-CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
|
|
+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`"
|
|
# On HP/UX 11.0, mvwdelch is a block with a return statement
|
|
AC_MSG_CHECKING(whether mvwdelch is an expression)
|
|
AC_CACHE_VAL(ac_cv_mvwdelch_is_expression,
|