Commit 239e53e7 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

INSTALL cleaned up --with-sendmail, --enable-threads and --enable-mp

2002-02-22  Sven Neumann  <sven@gimp.org>

	* INSTALL
	* configure.in: cleaned up --with-sendmail, --enable-threads and
	--enable-mp options. Added --with-gnome-desktop=PATH option.

	* data/misc/Makefile.am
	* data/misc/gimp.desktop.in.in: install a GNOME desktop file for
	The GIMP and create a link so GNOME-2.0 should be able to find it.
	Use --with-gnome-desktop=PATH to override the link location.

	* data/images/Makefile.am
	* data/images/wilber-icon.png: new file to serve as application icon.

	* plug-ins/script-fu/script-fu-scripts.c: register script-fu
	SF_ADJUSTMENT parameters as GIMP_PDB_FLOAT (spotted by Masahiro
	Sakai <zvm01052@nifty.ne.jp>).
parent ac0c4af0
2002-02-22 Sven Neumann <sven@gimp.org>
* INSTALL
* configure.in: cleaned up --with-sendmail, --enable-threads and
--enable-mp options. Added --with-gnome-desktop=PATH option.
* data/misc/Makefile.am
* data/misc/gimp.desktop.in.in: install a GNOME desktop file for
The GIMP and create a link so GNOME-2.0 should be able to find it.
Use --with-gnome-desktop=PATH to override the link location.
* data/images/Makefile.am
* data/images/wilber-icon.png: new file to serve as application icon.
* plug-ins/script-fu/script-fu-scripts.c: register script-fu
SF_ADJUSTMENT parameters as GIMP_PDB_FLOAT (spotted by Masahiro
Sakai <zvm01052@nifty.ne.jp>).
2002-02-22 Michael Natterer <mitch@gimp.org>
* app/Makefile.am
......
......@@ -83,16 +83,22 @@ recognizes. These are:
you'd like to have an English GIMP in every case then turn this option
off; this will also decrease the binary size by a few bits.
7. --with-threads and --with-mp. This options control whether to build
7. --enable-threads and --enable-mp. This options control whether to build
GIMP with or without support for multiple processors. This options are
off by default. If you do have multiply processors and run GIMP with
an OS supporting them you will like to enable this features to use
all of your horsepower. Enabling it on singleprocessor systems won't
harm but cause a bit processing overhead.
8. --with-sendmail=[]. This option is used to tell GIMP where to find
this command. Normally this options don't have to be used because
configure tries to find it in the usual places.
8. --with-sendmail=[PATH]. This option is used to tell GIMP where to find
the sendmail command. Normally this options don't have to be used
because configure tries to find it in the usual places.
9. --with-gnome-desktop=[PATH]. This option specifies where to install
a link to the gimp.desktop file for GNOME-2.0. The default value
${prefix}/share/applications should be fine if GNOME-2.0 is installed
in the same prefix. No link is created if the specified directory
doesn't exist or you use --without-gnome-desktop.
The `make' command builds several things:
- A bunch of public libraries in the directories starting with libgimp.
......
......@@ -545,9 +545,8 @@ dnl Test for libXpm
dnl Threads
dnl AC_ARG_WITH(threads, [ --with-threads=[posix] support threading ])
dnl GIMP_THREAD_LIBS=
dnl if test "x$with_threads" = "xposix" || test "x$with_threads" = "xyes"; then
dnl AC_ARG_ENABLE(threads, [ --enable-threads support POSIX threading [default=no]])
dnl if test "x$enable_threads" = "xyes"; then
dnl AC_CHECK_LIB(pthread, pthread_attr_init,
dnl [AC_DEFINE(USE_PTHREADS)
dnl GIMP_THREAD_LIBS="-lpthread"
......@@ -560,9 +559,8 @@ dnl GIMP_THREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE"]))
dnl fi
dnl Multi-Processor Support
AC_ARG_WITH(mp, [ --with-mp=[no] support multiple processors ])
GIMP_MP_LIBS=
if test "x$with_mp" = "xyes"; then
AC_ARG_ENABLE(mp, [ --enable-mp support multiple processors [default=no]])
if test "x$enable_mp" = "xyes"; then
AC_CHECK_LIB(pthread, pthread_attr_init,
[AC_DEFINE(ENABLE_MP)
GIMP_MP_LIBS="-lpthread"
......@@ -624,7 +622,7 @@ AC_SUBST(HTML_DIR)
dnl This is for the mail plug-in
sendmail_path=":"
AC_ARG_ENABLE(sendmail_path, [ --with-sendmail=DIR set sendmail command location],
AC_ARG_WITH(sendmail_path, [ --with-sendmail=DIR set sendmail command location],
if eval "test x$with_sendmail != x"; then
sendmail_path=$with_sendmail
fi)
......@@ -718,6 +716,17 @@ dnl AC_SUBST(PYGIMP_LIBS_NOUI)
dnl AM_CONDITIONAL(BUILD_PYTHON, $build_python)
AC_ARG_WITH(gnome-desktop, [ --with-gnome-desktop=PATH install a gimp.desktop link here [default=auto]])
if test "x$with_gnome_desktop" != x; then
GNOME_DESKTOP_PATH=$with_gnome_desktop
else
GNOME_DESKTOP_PATH="$datadir/applications"
fi
AM_CONDITIONAL(GNOME_DESKTOP_PATH, test "x$with_gnome_desktop" != xno)
GIMPINSTALL=
if test "$INSTALL" = "$ac_install_sh"; then
GIMPINSTALL="gimpinstall-1.3"
......@@ -730,10 +739,12 @@ fi
AM_CONDITIONAL(STATICLIBS, test x$enable_static = xyes)
AC_ARG_ENABLE(debug, [ --enable-default-binary install this as the default gimp binary [default=no]], , enable_default_binary=no)
AM_CONDITIONAL(DEFAULT_BINARY, test x$enable_default_binary = xyes)
CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
AC_SUBST(GIMP_MAJOR_VERSION)
......@@ -794,6 +805,7 @@ AC_SUBST(HELPBROWSER)
AC_SUBST(GTKXMHTML_CFLAGS)
AC_SUBST(GTKXMHTML_LIBS)
AC_SUBST(HTML_DIR)
AC_SUBST(GNOME_DESKTOP_PATH)
dnl easy way to skip the plug-in build
GIMP_PLUGINS=plug-ins
......@@ -911,6 +923,7 @@ themes/Default/images/Makefile
themes/Default/images/tools/Makefile
data/Makefile
data/misc/Makefile
data/misc/gimp.desktop.in
data/images/Makefile
data/brushes/Makefile
data/gradients/Makefile
......
......@@ -6,6 +6,7 @@ imagedata_DATA = \
gimp_logo.png \
gimp_splash.gif \
gimp_splash.png \
wilber-icon.png \
wilber-tips.png \
wilber-wizard.png
......
Makefile.in
Makefile
gimp.desktop.in
gimp.desktop
......@@ -7,4 +7,23 @@ miscdata_SCRIPTS = \
EXTRA_DIST = \
$(miscdata_SCRIPTS) \
gimp.desktop.in.in \
user_install.bat
install-data-local:
sed -e 's|.[{]prefix[}]|${prefix}|' \
${srcdir}/gimp.desktop.in > ${srcdir}/gimp.desktop \
&& $(INSTALL) ${srcdir}/gimp.desktop $(DESTDIR)$(miscdatadir)
if GNOME_DESKTOP_PATH
if test -d @GNOME_DESKTOP_PATH@; then \
cd @GNOME_DESKTOP_PATH@ \
&& rm -f gimp-1.3.desktop \
&& $(LN_S) $(DESTDIR)$(miscdatadir)/gimp.desktop gimp-1.3.desktop \
; fi
endif
uninstall-local:
if GNOME_DESKTOP_PATH
cd @GNOME_DESKTOP_PATH@ \
rm -f $(GNOME_DESKTOP_FILE)
endif
[Desktop Entry]
Name=The GIMP (unstable)
Name[bg]=GIMP
Name[ca]=El GIMP
Name[cs]=GIMP
Name[da]=Gimp'en
Name[de]=GIMP (instabil)
Name[el]=Το GIMP
Name[es]=El GIMP
Name[et]=GIMP Pilditöötlus
Name[eu]=GIMPa
Name[fi]=GIMP
Name[fr]=Le GIMP
Name[ga]=An GIMP
Name[gl]=O GIMP
Name[hu]=A GIMP
Name[it]=GIMP
Name[ja]=GIMP
Name[ko]=김프
Name[lt]=GIMP
Name[ms]=Editor Imej GIMP
Name[nl]=GIMP
Name[nn]=GIMP
Name[no]=GIMP
Name[pt]=O GIMP
Name[pt_BR]=O GIMP
Name[ro]=GIMP
Name[ru]=GIMP
Name[sk]=GIMP
Name[sl]=GIMP
Name[sp]=GNOME едитор мениja
Name[sr]=GNOME editor menija
Name[sv]=Bildredigeraren GIMP
Name[ta]=¸§É¡õ ÀðÊ À¾¢ôÀ¡ý
Name[tr]=GIMP
Name[uk]=GIMP
Name[wa]=Aspougneu di menus di GNOME
Name[zh_CN]=GIMP图像编辑器
Name[zh_TW]=GIMP
Comment=Create and edit images or photographs
Comment[bg]=Програма за Обработка на Изображения / GNU
Comment[ca]=El programa de manipulació d'imatges GNU
Comment[cs]=GNU program pro práci s obrázky
Comment[da]=Tegne- og billedbehandlingsprogram
Comment[de]=Das GNU-Bildbearbeitungsprogramm
Comment[el]=Πρόγραμμα Επεξεργασίας Εικόνων GNU
Comment[es]=Programa de manipulación de imágenes GNU
Comment[et]=Loo ja redigeeri pilte või fotosid
Comment[eu]=GNU imaginak eraldatzeko programa
Comment[fi]=GIMP-kuvankäsittelyohjelma
Comment[fr]=Le Programme de Manipulation d'Images GNU
Comment[ga]=Ríomhchlár láimhsiú íomhá GNU
Comment[gl]=O Programa de Edición de Imaxes de GNU
Comment[hu]=GNU képfeldolgozó program
Comment[it]=Programma di Manipolazione Immagini GNU
Comment[ja]=GNU画像編集プログラム
Comment[ko]=GNU 그림 편집 프로그램
Comment[lt]=GNU atvaizdų apdorojimo programa
Comment[ms]=Cipta dan edit imej atau fotograf
Comment[nl]=GNU beeldverwerkingsprogramma
Comment[no]=GNU bildebehandlingsprogram
Comment[pt]=Programa de Edição de Imagens GNU
Comment[pt_BR]=Programa de Edição de Imagens GNU
Comment[ro]=Program GNU pentru manipulare de imagine
Comment[ru]=Программа манипуляции изображения GNU
Comment[sk]=GNU Program pre spracovanie obrázkov
Comment[sl]=Program za manipuliranje s slikami GNU
Comment[sv]=Skapa eller redigera bilder eller fotografier
Comment[tr]=GNU Resim değiştirme uygulaması
Comment[uk]=Програма GNU маніпуляції зображенням
Comment[wa]=Li programe da GNU po-z aspougnî des imådjes
Comment[zh_CN]=创建和编辑图片或照片
Comment[zh_TW]=GNU 圖像處理程式
Exec=gimp-1.3
Icon=@gimpdatadir@/images/wilber-icon.png
Terminal=0
Type=Application
Categories=Application;Graphics;RasterGraphics;
......@@ -593,7 +593,7 @@ script_fu_add_script (LISP a)
script->arg_values[i].sfa_adjustment.value =
script->arg_defaults[i].sfa_adjustment.value;
args[i + 1].type = GIMP_PDB_STRING;
args[i + 1].type = GIMP_PDB_FLOAT;
args[i + 1].name = "value";
args[i + 1].description = script->arg_labels[i];
break;
......
......@@ -593,7 +593,7 @@ script_fu_add_script (LISP a)
script->arg_values[i].sfa_adjustment.value =
script->arg_defaults[i].sfa_adjustment.value;
args[i + 1].type = GIMP_PDB_STRING;
args[i + 1].type = GIMP_PDB_FLOAT;
args[i + 1].name = "value";
args[i + 1].description = script->arg_labels[i];
break;
......
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