summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>1995-09-18 20:30:21 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>1995-09-18 20:30:21 +0000
commit5c93ea40ac44aad973fce11806cfd6e99413ad46 (patch)
treeb5f1cbde03ee413a5fc11d360ab5e878888cfa8b /x11
parentUpgrade 4.41->4.42 (diff)
Add -fno-strength-reduce to compilation flags
Ask the user if he/she wants to use gnu malloc
Notes
Notes: svn path=/head/; revision=2163
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-4-clients/scripts/configure9
-rw-r--r--x11/XFree86-4-libraries/scripts/configure9
-rw-r--r--x11/XFree86-4/scripts/configure9
-rw-r--r--x11/XFree86/scripts/configure9
4 files changed, 20 insertions, 16 deletions
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 3e8788b3ca56..3a997b35f82f 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -92,6 +92,9 @@ if [ $answ = NO ]; then
echo "#define BuildXIE NO" >> $F
fi
echo
+yesno "Do you want your X applications linked with gnu malloc? [YES] "
+gnumalloc=$answ
+echo
echo "End of configuration questions. No more user input required"
echo
}
@@ -193,11 +196,9 @@ sed -e "s/2.0.5/$version/" \
-e "s/OSMajorVersion *2/OSMajorVersion $1/" \
-e "s/OSMinorVersion *0/OSMinorVersion $2/" \
-e "s/OSTeenyVersion *5/OSTeenyVersion $3/" \
+ -e "s/m486/m486 -fno-strength-reduce/" \
+ -e "s/UseGnuMalloc.*YES/UseGnuMalloc $gnumalloc/" \
<FreeBSD.cf.old >FreeBSD.cf
-#you may change ExtraLibraries too:
-#echo "#undef ExtraLibraries >> FreeBSD.cf
-#echo "#define ExtraLibraries -lgnumalloc >>FreeBSD.cf
-
exit 0
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index 3e8788b3ca56..3a997b35f82f 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -92,6 +92,9 @@ if [ $answ = NO ]; then
echo "#define BuildXIE NO" >> $F
fi
echo
+yesno "Do you want your X applications linked with gnu malloc? [YES] "
+gnumalloc=$answ
+echo
echo "End of configuration questions. No more user input required"
echo
}
@@ -193,11 +196,9 @@ sed -e "s/2.0.5/$version/" \
-e "s/OSMajorVersion *2/OSMajorVersion $1/" \
-e "s/OSMinorVersion *0/OSMinorVersion $2/" \
-e "s/OSTeenyVersion *5/OSTeenyVersion $3/" \
+ -e "s/m486/m486 -fno-strength-reduce/" \
+ -e "s/UseGnuMalloc.*YES/UseGnuMalloc $gnumalloc/" \
<FreeBSD.cf.old >FreeBSD.cf
-#you may change ExtraLibraries too:
-#echo "#undef ExtraLibraries >> FreeBSD.cf
-#echo "#define ExtraLibraries -lgnumalloc >>FreeBSD.cf
-
exit 0
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 3e8788b3ca56..3a997b35f82f 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -92,6 +92,9 @@ if [ $answ = NO ]; then
echo "#define BuildXIE NO" >> $F
fi
echo
+yesno "Do you want your X applications linked with gnu malloc? [YES] "
+gnumalloc=$answ
+echo
echo "End of configuration questions. No more user input required"
echo
}
@@ -193,11 +196,9 @@ sed -e "s/2.0.5/$version/" \
-e "s/OSMajorVersion *2/OSMajorVersion $1/" \
-e "s/OSMinorVersion *0/OSMinorVersion $2/" \
-e "s/OSTeenyVersion *5/OSTeenyVersion $3/" \
+ -e "s/m486/m486 -fno-strength-reduce/" \
+ -e "s/UseGnuMalloc.*YES/UseGnuMalloc $gnumalloc/" \
<FreeBSD.cf.old >FreeBSD.cf
-#you may change ExtraLibraries too:
-#echo "#undef ExtraLibraries >> FreeBSD.cf
-#echo "#define ExtraLibraries -lgnumalloc >>FreeBSD.cf
-
exit 0
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index 3e8788b3ca56..3a997b35f82f 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -92,6 +92,9 @@ if [ $answ = NO ]; then
echo "#define BuildXIE NO" >> $F
fi
echo
+yesno "Do you want your X applications linked with gnu malloc? [YES] "
+gnumalloc=$answ
+echo
echo "End of configuration questions. No more user input required"
echo
}
@@ -193,11 +196,9 @@ sed -e "s/2.0.5/$version/" \
-e "s/OSMajorVersion *2/OSMajorVersion $1/" \
-e "s/OSMinorVersion *0/OSMinorVersion $2/" \
-e "s/OSTeenyVersion *5/OSTeenyVersion $3/" \
+ -e "s/m486/m486 -fno-strength-reduce/" \
+ -e "s/UseGnuMalloc.*YES/UseGnuMalloc $gnumalloc/" \
<FreeBSD.cf.old >FreeBSD.cf
-#you may change ExtraLibraries too:
-#echo "#undef ExtraLibraries >> FreeBSD.cf
-#echo "#define ExtraLibraries -lgnumalloc >>FreeBSD.cf
-
exit 0