mirror of https://github.com/GNOME/gimp.git
define and export version number parts. Check for gtk 1.0.1
* configure.in: define and export version number parts. Check for gtk 1.0.1 * gimptool.in: do some arg check for --build * app/fileops.c: handle file overwrite dialog too -Yosh
This commit is contained in:
Manish Singh
parent
7e6f58e0b3
commit
8785eaaedc
|
|
@ -1,3 +1,12 @@
|
|||
Mon May 4 04:12:54 PDT 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* configure.in: define and export version number parts. Check for
|
||||
gtk 1.0.1
|
||||
|
||||
* gimptool.in: do some arg check for --build
|
||||
|
||||
* app/fileops.c: handle file overwrite dialog too
|
||||
|
||||
Sun May 3 22:10:05 EDT 1998 Matthew Wilson <msw@gimp.org>
|
||||
|
||||
* app/fileops.c: make fileselectors insensitive during
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@
|
|||
Leave the following blank line there!! Autoheader needs it. */
|
||||
|
||||
|
||||
#undef GIMP_MAJOR_VERSION
|
||||
#undef GIMP_MINOR_VERSION
|
||||
#undef GIMP_MICRO_VERSION
|
||||
#undef GIMP_VERSION
|
||||
|
||||
#undef HAVE_DIRENT_H
|
||||
|
|
|
|||
|
|
@ -1019,6 +1019,8 @@ file_overwrite_yes_callback (GtkWidget *w,
|
|||
g_free (overwrite_box->full_filename);
|
||||
g_free (overwrite_box->raw_filename);
|
||||
g_free (overwrite_box);
|
||||
|
||||
gtk_widget_set_sensitive (GTK_WIDGET(filesave), TRUE);
|
||||
}
|
||||
|
||||
static gint
|
||||
|
|
@ -1043,6 +1045,8 @@ file_overwrite_no_callback (GtkWidget *w,
|
|||
g_free (overwrite_box->full_filename);
|
||||
g_free (overwrite_box->raw_filename);
|
||||
g_free (overwrite_box);
|
||||
|
||||
gtk_widget_set_sensitive (GTK_WIDGET(filesave), TRUE);
|
||||
}
|
||||
|
||||
static PlugInProcDef*
|
||||
|
|
|
|||
|
|
@ -46,6 +46,9 @@
|
|||
/* Define if you can safely include both <sys/time.h> and <time.h>. */
|
||||
#undef TIME_WITH_SYS_TIME
|
||||
|
||||
#undef GIMP_MAJOR_VERSION
|
||||
#undef GIMP_MINOR_VERSION
|
||||
#undef GIMP_MICRO_VERSION
|
||||
#undef GIMP_VERSION
|
||||
|
||||
#undef HAVE_DIRENT_H
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ fi)
|
|||
|
||||
AC_DEFUN(AC_GIMP_CHECK,
|
||||
[
|
||||
AM_PATH_GTK(1.0.0,,
|
||||
AM_PATH_GTK(1.0.1,,
|
||||
AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.))
|
||||
X_LIBS=$GTK_LIBS
|
||||
X_CFLAGS=$GTK_CFLAGS
|
||||
|
|
@ -382,9 +382,16 @@ if test $ac_cv_path_LPC_COMMAND != ":"; then
|
|||
LPC_DEF="-DLPC_COMMAND=\\\"$ac_cv_path_LPC_COMMAND\\\""
|
||||
fi
|
||||
|
||||
AC_DEFINE_UNQUOTED(GIMP_MAJOR_VERSION, $GIMP_MAJOR_VERSION)
|
||||
AC_DEFINE_UNQUOTED(GIMP_MINOR_VERSION, $GIMP_MINOR_VERSION)
|
||||
AC_DEFINE_UNQUOTED(GIMP_MICRO_VERSION, $GIMP_MICRO_VERSION)
|
||||
AC_DEFINE_UNQUOTED(GIMP_VERSION, "$GIMP_VERSION")
|
||||
|
||||
AC_SUBST(GIMP_MAJOR_VERSION)
|
||||
AC_SUBST(GIMP_MINOR_VERSION)
|
||||
AC_SUBST(GIMP_MICRO_VERSION)
|
||||
AC_SUBST(GIMP_VERSION)
|
||||
|
||||
AC_SUBST(gimpdir)
|
||||
AC_SUBST(gimpdatadir)
|
||||
AC_SUBST(gimpplugindir)
|
||||
|
|
|
|||
|
|
@ -7,6 +7,12 @@ exec_prefix_set=no
|
|||
usage="\
|
||||
Usage: gimptool [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--build plug-in.c]"
|
||||
|
||||
noarg="\
|
||||
Error: --build needs a filename to work with"
|
||||
|
||||
notfound="\
|
||||
Error: Couldn't find source file to build"
|
||||
|
||||
if test $# -eq 0; then
|
||||
echo "${usage}" 1>&2
|
||||
exit 1
|
||||
|
|
@ -70,9 +76,21 @@ while test $# -gt 0; do
|
|||
includes=-I@includedir@
|
||||
fi
|
||||
shift
|
||||
cmd="$cc $cflags $includes `gtk-config --cflags` -o `echo $1|sed 's/\.[^\.]*$//'` $1 -L@libdir@ -lgimpui -lgimp `$gtk_config --libs`"
|
||||
echo $cmd
|
||||
eval $cmd
|
||||
if test "x$1" != "x"; then
|
||||
if test -e "$1"; then
|
||||
cmd="$cc $cflags $includes `gtk-config --cflags` -o `echo $1|sed 's/\.[^\.]*$//'` $1 -L@libdir@ -lgimpui -lgimp `$gtk_config --libs`"
|
||||
echo $cmd
|
||||
eval $cmd
|
||||
else
|
||||
echo "${notfound}" 1>&2
|
||||
echo "${usage}" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "${noarg}" 1>&2
|
||||
echo "${usage}" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "${usage}" 1>&2
|
||||
|
|
|
|||
24
gimptool.in
24
gimptool.in
|
|
@ -7,6 +7,12 @@ exec_prefix_set=no
|
|||
usage="\
|
||||
Usage: gimptool [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--build plug-in.c]"
|
||||
|
||||
noarg="\
|
||||
Error: --build needs a filename to work with"
|
||||
|
||||
notfound="\
|
||||
Error: Couldn't find source file to build"
|
||||
|
||||
if test $# -eq 0; then
|
||||
echo "${usage}" 1>&2
|
||||
exit 1
|
||||
|
|
@ -70,9 +76,21 @@ while test $# -gt 0; do
|
|||
includes=-I@includedir@
|
||||
fi
|
||||
shift
|
||||
cmd="$cc $cflags $includes `gtk-config --cflags` -o `echo $1|sed 's/\.[^\.]*$//'` $1 -L@libdir@ -lgimpui -lgimp `$gtk_config --libs`"
|
||||
echo $cmd
|
||||
eval $cmd
|
||||
if test "x$1" != "x"; then
|
||||
if test -e "$1"; then
|
||||
cmd="$cc $cflags $includes `gtk-config --cflags` -o `echo $1|sed 's/\.[^\.]*$//'` $1 -L@libdir@ -lgimpui -lgimp `$gtk_config --libs`"
|
||||
echo $cmd
|
||||
eval $cmd
|
||||
else
|
||||
echo "${notfound}" 1>&2
|
||||
echo "${usage}" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "${noarg}" 1>&2
|
||||
echo "${usage}" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "${usage}" 1>&2
|
||||
|
|
|
|||
Loading…
Reference in New Issue