diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-01-21 23:57:44 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-01-21 23:57:44 +0000 |
| commit | 582a998543d0792e648f95354b1b44109fc05236 (patch) | |
| tree | 6a39a92fe48314e429d3f6436baab5368bf06a16 /packaging/svr4 | |
| parent | b9fbf593de0f7a9643c7f2bba491b66675daab6f (diff) | |
| download | wireshark-582a998543d0792e648f95354b1b44109fc05236.tar.gz wireshark-582a998543d0792e648f95354b1b44109fc05236.tar.bz2 wireshark-582a998543d0792e648f95354b1b44109fc05236.zip | |
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
Diffstat (limited to 'packaging/svr4')
| -rwxr-xr-x | packaging/svr4/checkinstall.in | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/packaging/svr4/checkinstall.in b/packaging/svr4/checkinstall.in index afac48b4be..d753fa8f08 100755 --- a/packaging/svr4/checkinstall.in +++ b/packaging/svr4/checkinstall.in @@ -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 |