mirror of https://github.com/GNOME/gimp.git
Added gimp.m4. Prolly some warning fixes in plugins too.
-Yosh
This commit is contained in:
Manish Singh
parent
7fc4de2bf4
commit
64c0c5eba0
3
TODO
3
TODO
|
|
@ -120,4 +120,5 @@ big cad style cross-hairs cursor?
|
|||
|
||||
more info available to the user in general (current brush, etc)
|
||||
|
||||
|
||||
some sort of image locking, so we don't munge images by doing >1 ops
|
||||
on them at once
|
||||
|
|
|
|||
|
|
@ -0,0 +1,152 @@
|
|||
# Configure paths for GIMP
|
||||
# Manish Singh 98-6-11
|
||||
# Shamelessly stolen from Owen Taylor
|
||||
|
||||
dnl AM_PATH_GIMP([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||
dnl Test for GIMP, and define GIMP_CFLAGS and GIMP_LIBS
|
||||
dnl
|
||||
AC_DEFUN(AM_PATH_GIMP,
|
||||
[dnl
|
||||
dnl Get the cflags and libraries from the gimptool script
|
||||
dnl
|
||||
AC_ARG_WITH(gimp-prefix,[ --with-gimp-prefix=PFX Prefix where GIMP is installed (optional)],
|
||||
gimptool_prefix="$withval", gimptool_prefix="")
|
||||
AC_ARG_WITH(gimp-exec-prefix,[ --with-gimp-exec-prefix=PFX Exec prefix where GIMP is installed (optional)],
|
||||
gimptool_exec_prefix="$withval", gimptool_exec_prefix="")
|
||||
AC_ARG_ENABLE(gimptest, [ --disable-gimptest Do not try to compile and run a test GIMP program],
|
||||
, enable_gimptest=yes)
|
||||
|
||||
if test x$gimptool_exec_prefix != x ; then
|
||||
gimptool_args="$gimptool_args --exec-prefix=$gimptool_exec_prefix"
|
||||
if test x${GIMPTOOL+set} != xset ; then
|
||||
GIMPTOOL=$gimptool_exec_prefix/bin/gimptool
|
||||
fi
|
||||
fi
|
||||
if test x$gimptool_prefix != x ; then
|
||||
gimptool_args="$gimptool_args --prefix=$gimptool_prefix"
|
||||
if test x${GIMPTOOL+set} != xset ; then
|
||||
GIMPTOOL=$gimptool_prefix/bin/gimptool
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(GIMPTOOL, gimptool, no)
|
||||
min_gimp_version=ifelse([$1], ,1.0.0,$1)
|
||||
AC_MSG_CHECKING(for GIMP - version >= $min_gimp_version)
|
||||
no_gimp=""
|
||||
if test "$GIMPTOOL" = "no" ; then
|
||||
no_gimp=yes
|
||||
else
|
||||
GIMP_CFLAGS=`$GIMPTOOL $gimptool_args --cflags`
|
||||
GIMP_LIBS=`$GIMPTOOL $gimptool_args --libs`
|
||||
gimptool_major_version=`$GIMPTOOL $gimptool_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
gimptool_minor_version=`$GIMPTOOL $gimptool_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
gimptool_micro_version=`$GIMPTOOL $gimptool_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
if test "x$enable_gimptest" = "xyes" ; then
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $GIMP_CFLAGS"
|
||||
LIBS="$LIBS $GIMP_LIBS"
|
||||
dnl
|
||||
dnl Now check if the installed GIMP is sufficiently new. (Also sanity
|
||||
dnl checks the results of gimptool to some extent
|
||||
dnl
|
||||
rm -f conf.gimptest
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <libgimp/gimp.h>
|
||||
|
||||
GPlugInInfo PLUG_IN_INFO =
|
||||
{
|
||||
NULL, /* init_proc */
|
||||
NULL, /* quit_proc */
|
||||
NULL, /* query_proc */
|
||||
NULL /* run_proc */
|
||||
};
|
||||
|
||||
int main ()
|
||||
{
|
||||
int major, minor, micro;
|
||||
char *tmp_version;
|
||||
|
||||
system ("touch conf.gimptest");
|
||||
|
||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
tmp_version = g_strdup("$min_gimp_version");
|
||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
printf("%s, bad version string\n", "$min_gimp_version");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (($gimptool_major_version > major) ||
|
||||
(($gimptool_major_version == major) && ($gimptool_minor_version > minor)) ||
|
||||
(($gimptool_major_version == major) && ($gimptool_minor_version == minor) && ($gimptool_micro_version >= micro)))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("\n*** 'gimptool --version' returned %d.%d.%d, but the minimum version\n", $gimptool_major_version, $gimptool_minor_version, $gimptool_micro_version);
|
||||
printf("*** of GIMP required is %d.%d.%d. If gimptool is correct, then it is\n", major, minor, micro);
|
||||
printf("*** best to upgrade to the required version.\n");
|
||||
printf("*** If gimptool was wrong, set the environment variable GIMPTOOL\n");
|
||||
printf("*** to point to the correct copy of gimptool, and remove the file\n");
|
||||
printf("*** config.cache before re-running configure\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
],, no_gimp=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
if test "x$no_gimp" = x ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
if test "$GIMPTOOL" = "no" ; then
|
||||
echo "*** The gimptool script installed by GIMP could not be found"
|
||||
echo "*** If GIMP was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path, or set the GIMPTOOL environment variable to the"
|
||||
echo "*** full path to gimptool."
|
||||
else
|
||||
if test -f conf.gimptest ; then
|
||||
:
|
||||
else
|
||||
echo "*** Could not run GIMP test program, checking why..."
|
||||
CFLAGS="$CFLAGS $GIMP_CFLAGS"
|
||||
LIBS="$LIBS $GIMP_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <libgimp/gimp.h>
|
||||
], [ return 0; ],
|
||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding GIMP or finding the wrong"
|
||||
echo "*** version of GIMP. If it is not finding GIMP, you'll need to set your"
|
||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
||||
echo "*** is required on your system"
|
||||
echo "***"
|
||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
|
||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
echo "*** exact error that occured. This usually means GIMP was incorrectly installed"
|
||||
echo "*** or that you have moved GIMP since it was installed. In the latter case, you"
|
||||
echo "*** may want to edit the gimptool script: $GIMPTOOL" ])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
GIMP_CFLAGS=""
|
||||
GIMP_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(GIMP_CFLAGS)
|
||||
AC_SUBST(GIMP_LIBS)
|
||||
rm -f conf.gimptest
|
||||
])
|
||||
|
|
@ -123,6 +123,7 @@
|
|||
* - split into multiple files
|
||||
****************************************************************************/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
#include "libgimp/gimp.h"
|
||||
|
|
|
|||
|
|
@ -97,4 +97,4 @@ void fli_write_copy(FILE *f, s_fli_header *fli_header, unsigned char *framebuf);
|
|||
void fli_write_lc(FILE *f, s_fli_header *fli_header, unsigned char *old_framebuf, unsigned char *framebuf);
|
||||
void fli_write_lc_2(FILE *f, s_fli_header *fli_header, unsigned char *old_framebuf, unsigned char *framebuf);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -123,6 +123,7 @@
|
|||
* - split into multiple files
|
||||
****************************************************************************/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
#include "libgimp/gimp.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue