65 lines
2.3 KiB
Text
65 lines
2.3 KiB
Text
$NetBSD: patch-aa,v 1.6 2006/07/02 10:21:14 rillig Exp $
|
|
|
|
See libscigraphica/patches/patch-aa.
|
|
|
|
--- configure.orig 2005-06-24 03:44:25.000000000 +0200
|
|
+++ configure 2006-06-28 20:11:19.000000000 +0200
|
|
@@ -2007,7 +2007,6 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
|
|
|
|
|
|
|
|
-/* print extra warning messages when compiling CVS */
|
|
test "`echo ${SCIGRAPHICA_VERSION} || grep -i cvs`" && CFLAGS="$CFLAGS -g -O -W -Wall -DWITH_WARNINGS"
|
|
|
|
|
|
@@ -10544,10 +10543,7 @@ fi;
|
|
PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
|
|
PY_LIBS="python$PY_VERSION"
|
|
PY_LIB_LOC="$PY_EXEC_PREFIX/lib/python$PY_VERSION/"
|
|
- array_loc=`find $python_numeric_path -name arrayobject.h | sed s/arrayobject\.h//`
|
|
- if test x$array_loc = x; then
|
|
- array_loc=`find $PY_PREFIX/ -name arrayobject.h | sed s/arrayobject\.h//`
|
|
- fi
|
|
+ array_loc="${PY_PREFIX}/include/python${PY_VERSION}/numarray"
|
|
if test -n $array_loc -a -d $array_loc; then
|
|
echo "$array_loc"
|
|
PY_CFLAGS="$PY_CFLAGS -I$array_loc -DWITH_NUMERIC_PYTHON"
|
|
@@ -10604,22 +10600,6 @@ GTK_EXTRA_VERSION=`$GTK_EXTRA_CONFIG --v
|
|
GTK_VERSION=`$GTK_CONFIG --version`
|
|
XML_VERSION=`$XML_CONFIG --version`
|
|
|
|
-# strip duplicate entries in compiler flags
|
|
-echo "stripping compiler flags"
|
|
-COMPILER_FLAGS=""
|
|
-for i in $CC \
|
|
- $CFLAGS $XML_CFLAGS $GDK_IMLIB_CFLAGS $GTK_CFLAGS $GTK_EXTRA_CFLAGS $PY_CFLAGS \
|
|
- $LIBS $XML_LIBS $GDK_IMLIB_LIBS $GTK_LIBS $GTK_EXTRA_LIBS \
|
|
- $LDFLAGS
|
|
-do
|
|
- found="false"
|
|
- for k in $COMPILER_FLAGS
|
|
- do
|
|
- test "$i" = "$k" && { found="true" ; break ; }
|
|
- done
|
|
- test "$found" = "false" && COMPILER_FLAGS="$COMPILER_FLAGS $i"
|
|
-done
|
|
-
|
|
scigraphica_prefix="${prefix}"
|
|
scigraphica_exec_prefix="${exec_prefix}"
|
|
scigraphica_version="$SCIGRAPHICA_VERSION"
|
|
@@ -10637,12 +10617,9 @@ scigraphica_icondir="${datadir}/pixmaps/
|
|
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define VERSION_INFO "sg-$VERSION\\n$UNAME\\n\
|
|
-gtk-$GTK_VERSION gtkextra-$GTK_EXTRA_VERSION $GNOME_VERSION\\n\
|
|
-xml-$XML_VERSION python-$PY_VVERSION $array_loc\\n"\
|
|
-__DATE__ " " __TIME__ "\\n\
|
|
-Compiler flags:$COMPILER_FLAGS\\n\
|
|
-(C) 2000 Adrian E. Feiguin\\n"
|
|
+#define VERSION_INFO \
|
|
+ "sg-$VERSION\\n" \
|
|
+ "(C) 2000 Adrian E. Feiguin\\n"
|
|
|
|
_ACEOF
|
|
|