Commit ed9b7f79 authored by Manish Singh's avatar Manish Singh

more sanity checking for the gtkxmhtml test. Also changed datadir to

* configure.in: more sanity checking for the gtkxmhtml test. Also
changed datadir to include the gimp version too. So right now
only the development headers conflict between versions in the same
prefix.

* gimptool.in
* gimptool.1: added and documented configure variable query options
(bindir, sbindir, sysconfdir, etc.)

* tips/Makefile.am: add gimp_tips.uk.txt

-Yosh
parent 998f28ed
Fri Mar 24 01:53:07 PST 2000 Manish Singh <yosh@gimp.org>
* configure.in: more sanity checking for the gtkxmhtml test. Also
changed datadir to include the gimp version too. So right now
only the development headers conflict between versions in the same
prefix.
* gimptool.in
* gimptool.1: added and documented configure variable query options
(bindir, sbindir, sysconfdir, etc.)
* tips/Makefile.am: add gimp_tips.uk.txt
Wed Mar 22 18:35:25 CST 2000 Seth Burgess <sjburges@gimp.org>
* app/gdisplay_ops.c: Applied Thomas Koester's patch for
......
......@@ -431,7 +431,7 @@ if test "x$with_mp" = "xyes"; then
GIMP_MP_FLAGS="-D_REENTRANT -D_THREAD_SAFE"]))
fi
gimpdatadir=$datadir/gimp
gimpdatadir=$datadir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
localedir='${prefix}/${DATADIRNAME}/locale'
......@@ -540,8 +540,8 @@ if test "$GNOME_CONFIG" = "no"; then
HELPBROWSER=
dnl Test for standalone GtkXMHTML widget
AC_CHECK_LIB(gtkxmhtml, gtk_xmhtml_new,
GTKXMHTML_CFLAGS=$GLIB_CFLAGS
GTKXMHTML_LIBS="$GLIB_LIBS -lgtkxmhtml"
GTKXMHTML_CFLAGS=$GTK_CFLAGS
GTKXMHTML_LIBS="lgtkxmhtml $GTK_LIBS"
HELPBROWSER=helpbrowser,
AC_MSG_WARN(*** Help browser plug-in will not be built (GtkXMHTML library not found) ***))
else
......@@ -550,6 +550,32 @@ else
HELPBROWSER=helpbrowser
fi
dnl Sanity check to make sure the headers are there too and that gnome-config
dnl didn't lie to us
if test -n $HELPBROWSER; then
gimp_save_CPPFLAGS="$CPPFLAGS"
gimp_save_LDFLAGS="$LDFLAGS"
gimp_save_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS $GTKXMHTML_CFLAGS"
LDFLAGS="$LDFLAGS `echo $GTKXMHTML_LIBS | sed 's/\(.*\)\(-lgtkxmhtml.*\)/\1/'`"
LIBS="$LIBS $GTKXMHTML_LIBS"
AC_MSG_CHECKING([to see if we can build with GtkXMHTML])
AC_TRY_LINK([#include <gtk-xmhtml/gtk-xmhtml.h>], [return 0;],
gtkxmhtml_ok=yes, gtkxmhtml_ok=no)
AC_MSG_RESULT($gtkxmhtml_ok)
if test "$gtkxmhtml_ok" = no; then
AC_MSG_WARN(*** Help browser plug-in will not be built (GtkXMHTML setup busted) ***)
HELPBROWSER=
fi
CPPFLAGS="$gimp_save_CPPFLAGS"
LDFLAGS="$gimp_save_LDFLAGS"
LIBS="$gimp_save_LIBS"
fi
dnl This is for the gimp-perl plug-in
AC_ARG_ENABLE(perl, [ --disable-perl do not build perl extension [by default enabled]
--enable-perl[=prefix] use specified prefix for perl (see INSTALL)])
......
......@@ -3,8 +3,21 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=no
plug_in_dir=@gimpplugindir@
data_dir=@gimpdatadir@
bindir=@bindir@
sbindir=@sbindir@
libexecdir=@libexecdir@
datadir=@datadir@
sysconfdir=@sysconfdir@
sharedstatedir=@sharedstatedir@
localstatedir=@localstatedir@
libdir=@libdir@
infodir=@infodir@
mandir=@mandir@
includedir=@includedir@
gimpplugindir=@gimpplugindir@
gimpdatadir=@gimpdatadir@
usage()
{
......@@ -29,6 +42,11 @@ Developer options:
that GIMP was built when computing the output for
--cflags and --libs
Installation directory options:
--prefix --exec-prefix --bindir --sbindir --libexecdir --datadir --sysconfdir
--sharedstatedir --localstatedir --libdir --infodir --mandir --includedir
--gimpplugindir --gimpdatadir
The --cflags and --libs options can be appended with -noui to get appropriate
settings for plug-ins which do not use GTK+.
......@@ -147,6 +165,13 @@ while test $# -gt 0; do
--exec-prefix)
echo $exec_prefix
;;
--*dir)
dirname=\$`echo $1 | sed -e 's,^--,,'`
dirname=`eval echo $dirname`
test -z "$dirname" && exit 1
echo $dirname
exit 0
;;
--cflags | --cflags-noui | --cflags-nogimpui)
case $1 in
--cflags | --cflags-nogimpui)
......
......@@ -5,6 +5,9 @@ gimptool - script to perform various Gimpy functions
.B gimptool
[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version]
[\-\-help] [\-\-quiet] [\-\-silent] [\-n] [\-\-just-print] [\-\-dry-run] [\-\-recon]
[\-\-bindir] [\-\-sbindir] [\-\-libexecdir] [\-\-datadir] [\-\-sysconfdir]
[\-\-sharedstatedir] [\-\-localstatedir] [-\-libdir] [\-\-infodir] [\-\-mandir]
[\-\-includedir] [\-\-gimpplugindir] [\-\-gimpdatadir]
[\-\-libs] [\-\-libs-noui] [\-\-cflags] [\-\-cflags-noi] [\-\-build \fIplug\-in.c\fP]
[\-\-build\-strip \fIplug\-in.c\fP] [\-\-install \fIplug\-in.c\fP]
[\-\-install-strip \fIplug\-in.c\fP] [\-\-install-admin \fIplug-in.c\fP]
......@@ -54,6 +57,45 @@ Test mode. Print the commands but dont actually execute them. Same as \-n.
.B \-\-recon
Test mode. Print the commands but dont actually execute them. Same as \-n.
.TP 8
.B \-\-bindir
Outputs the bindir used to install the \fIGimp\fP.
.TP 8
.B \-\-sbindir
Outputs the sbindir used to install the \fIGimp\fP.
.TP 8
.B \-\-libexecdir
Outputs the libexecdir used to install the \fIGimp\fP.
.TP 8
.B \-\-datadir
Outputs the datadir used to install the \fIGimp\fP.
.TP 8
.B \-\-sysconfdir
Outputs the sysconfdir used to install the \fIGimp\fP.
.TP 8
.B \-\-sharedstatedir
Outputs the sharedstatedir used to install the \fIGimp\fP.
.TP 8
.B \-\-localstatedir
Outputs the localstatedir used to install the \fIGimp\fP.
.TP 8
.B \-\-libdir
Outputs the libdir used to install the \fIGimp\fP.
.TP 8
.B \-\-infodir
Outputs the infodir used to install the \fIGimp\fP.
.TP 8
.B \-\-mandir
Outputs the mandir used to install the \fIGimp\fP.
.TP 8
.B \-\-includedir
Outputs the includedir used to install the \fIGimp\fP.
.TP 8
.B \-\-gimpdatadir
Outputs the actual directory where the \fIGimp\fP data files were installed.
.TP 8
.B \-\-gimpplugindir
Outputs the actual directory where the \fIGimp\fP plugins were installed.
.TP 8
.B \-\-build \fIplug-in.c\fP
Compile and link \fIplug-in.c\fP into a \fIGimp\fP plug-in.
.TP 8
......
......@@ -3,8 +3,21 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=no
plug_in_dir=@gimpplugindir@
data_dir=@gimpdatadir@
bindir=@bindir@
sbindir=@sbindir@
libexecdir=@libexecdir@
datadir=@datadir@
sysconfdir=@sysconfdir@
sharedstatedir=@sharedstatedir@
localstatedir=@localstatedir@
libdir=@libdir@
infodir=@infodir@
mandir=@mandir@
includedir=@includedir@
gimpplugindir=@gimpplugindir@
gimpdatadir=@gimpdatadir@
usage()
{
......@@ -29,6 +42,11 @@ Developer options:
that GIMP was built when computing the output for
--cflags and --libs
Installation directory options:
--prefix --exec-prefix --bindir --sbindir --libexecdir --datadir --sysconfdir
--sharedstatedir --localstatedir --libdir --infodir --mandir --includedir
--gimpplugindir --gimpdatadir
The --cflags and --libs options can be appended with -noui to get appropriate
settings for plug-ins which do not use GTK+.
......@@ -147,6 +165,13 @@ while test $# -gt 0; do
--exec-prefix)
echo $exec_prefix
;;
--*dir)
dirname=\$`echo $1 | sed -e 's,^--,,'`
dirname=`eval echo $dirname`
test -z "$dirname" && exit 1
echo $dirname
exit 0
;;
--cflags | --cflags-noui | --cflags-nogimpui)
case $1 in
--cflags | --cflags-nogimpui)
......
......@@ -3,15 +3,16 @@
tipsdatadir = $(gimpdatadir)/tips
tipsdata_DATA = \
gimp_tips.txt \
gimp_tips.cs.txt \
gimp_tips.de.txt \
gimp_tips.ja.txt \
gimp_tips.it.txt \
gimp_tips.ko.txt \
gimp_conseils.fr.txt \
gimp_tips.ru.txt \
gimp_tips.pl.txt
gimp_tips.txt \
gimp_tips.cs.txt \
gimp_tips.de.txt \
gimp_tips.ja.txt \
gimp_tips.it.txt \
gimp_tips.ko.txt \
gimp_conseils.fr.txt \
gimp_tips.ru.txt \
gimp_tips.pl.txt \
gimp_tips.uk.txt
EXTRA_DIST = $(tipsdata_DATA)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment