osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Andrew Feren: 

The original checkinstall assumed /usr/local as the GTK+ install
	install directory even if an alternate directory directory was
	specified when configure was run.  checkinstall now checks for
	GTK+ in the configured directory and punts (checks if gtk-config
	is in the path) if it doesn't find GTK+ in the configured
	location.

svn path=/trunk/; revision=4595
This commit is contained in:
Guy Harris 2002-01-21 23:57:44 +00:00
parent b9fbf593de
commit 582a998543
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -895,7 +895,7 @@ Shinsuke Suzuki <suz[AT]kame.net> {
Andrew C. Feren <aferen[AT]cetacean.com> {
Makefile fix
Solaris packaging fix
Solaris packaging fixes
}
Tomas Kukosa <tomas.kukosa[AT]anfdata.cz> {

17
packaging/svr4/checkinstall.in
View File

@ -5,6 +5,8 @@
# This is a modified version of a script written by mark@metalab.unc.edu .
# The original is at http://metalab.unc.edu/pub/packages/solaris/sparc/html/creating.solaris.packages.html .
GTK_CONFIG=@GTK_CONFIG@
gtk_major_needed="1"
gtk_minor_needed="2"
@ -16,8 +18,17 @@ platform=`uname -p`
expected_platform="@host_cpu@"
if [ -x /usr/local/bin/gtk-config ] ; then
gtk_installed=`/usr/local/bin/gtk-config --version`
if [ -x $GTK_CONFIG ] ; then
# First try the GTK location that was used to build ethereal. This
# is probably the safest bet.
gtk_installed=`$GTK_CONFIG --version`
gtk_major_installed=`echo $gtk_installed | cut -f1 -d.`
gtk_minor_installed=`echo $gtk_installed | cut -f2 -d.`
elif gtk_installed=`gtk-config --version 2>&-`; then
# Punt!
# If gtk-config is in the $PATH then ethereal should install fine.
# Some modifications to $LD_LIBRARY_PATH (or non Solaris equivalent)
# may be required by the user. Should there be a warning here?
gtk_major_installed=`echo $gtk_installed | cut -f1 -d.`
gtk_minor_installed=`echo $gtk_installed | cut -f2 -d.`
else
@ -39,7 +50,7 @@ fi
if [ "$gtk_major_installed" -lt "$gtk_major_needed" -a \
"$gtk_minor_installed" -lt "$gtk_minor_needed" ] ; then
echo "\n\n\n\tThis package requires gtk+ version >= $gtk_major_needed.$gtk_minor_needed installed in /usr/local."
echo "\n\n\n\tThis package requires gtk+ version >= $gtk_major_needed.$gtk_minor_needed installed in `dirname ${GTK_CONFIG}`."
echo "\tAborting installation.\n\n\n"
exit 1
fi