mirror of https://github.com/GNOME/gimp.git
libgimp/gimp.c app/datafiles.c app/docindex.c app/gimprc.c app/gradient.c
* libgimp/gimp.c
* app/datafiles.c
* app/docindex.c
* app/gimprc.c
* app/gradient.c
* app/palette.c: use g_get_home_dir () instead of getenv ("HOME")
* app/fileops.c: #warning is a gccism
* app/invert.[ch]: minor cleanup
* app/menus.c: more cleanups
* app/blob.c: even more cleanups
* libgimp/parasite.c: YACU
* ltconfig
* ltmain.sh: CVS libtool 1.2e
* modules/Makefile.am: use -module and -avoid-version flags
* lic/Makefile.am
* mapcolor/Makefile.am
* xbm/Makefile.am: don't link with libjpeg here
-Yosh
This commit is contained in:
Manish Singh
parent
0b810d1ab9
commit
a4213cf85e
|
|
@ -13,3 +13,4 @@ gimprc_user
|
|||
gimptool
|
||||
intl
|
||||
config.h.in
|
||||
stamp-h.in
|
||||
|
|
|
|||
34
ChangeLog
34
ChangeLog
|
|
@ -1,3 +1,33 @@
|
|||
Tue Feb 2 23:34:37 PST 1999 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* libgimp/gimp.c
|
||||
* app/datafiles.c
|
||||
* app/docindex.c
|
||||
* app/gimprc.c
|
||||
* app/gradient.c
|
||||
* app/palette.c: use g_get_home_dir () instead of getenv ("HOME")
|
||||
|
||||
* app/fileops.c: #warning is a gccism
|
||||
|
||||
* app/invert.[ch]: minor cleanup
|
||||
|
||||
* app/menus.c: more cleanups
|
||||
|
||||
* app/blob.c: even more cleanups
|
||||
|
||||
* libgimp/parasite.c: YACU
|
||||
|
||||
* ltconfig
|
||||
* ltmain.sh: CVS libtool 1.2e
|
||||
|
||||
* modules/Makefile.am: use -module and -avoid-version flags
|
||||
|
||||
* lic/Makefile.am
|
||||
* mapcolor/Makefile.am
|
||||
* xbm/Makefile.am: don't link with libjpeg here
|
||||
|
||||
* gimp1_1_splash.ppm: new Adrian splash
|
||||
|
||||
1999-02-02 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* app/blob.[ch] app/ink.c: Let the user choose between
|
||||
|
|
@ -99,8 +129,8 @@ Wed Jan 27 21:52:43 GMT 1999 Austin Donnelly <austin@gimp.org>
|
|||
|
||||
Wed Jan 27 12:25:00 CST 1999 Seth Burgess <sbjurges@gimp.org>
|
||||
|
||||
* plug-ins/script-fu/scripts/add-bevel.scm: fixed the SF-ADJUSTMENT so that
|
||||
it shows up again.
|
||||
* plug-ins/script-fu/scripts/add-bevel.scm: fixed the SF-ADJUSTMENT
|
||||
so that it shows up again.
|
||||
|
||||
Tue Jan 26 22:17:57 PST 1999 Manish Singh <yosh@gimp.org>
|
||||
|
||||
|
|
|
|||
302
acinclude.m4
302
acinclude.m4
|
|
@ -1,5 +1,5 @@
|
|||
## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
|
||||
## Copyright (C) 1996-1998 Free Software Foundation, Inc.
|
||||
## Copyright (C) 1996-1999 Free Software Foundation, Inc.
|
||||
## Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||
##
|
||||
## This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -21,18 +21,19 @@
|
|||
## configuration script generated by Autoconf, you may include it under
|
||||
## the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# serial 29 AM_PROG_LIBTOOL
|
||||
AC_DEFUN(AM_PROG_LIBTOOL,
|
||||
[AC_REQUIRE([AM_ENABLE_SHARED])dnl
|
||||
AC_REQUIRE([AM_ENABLE_STATIC])dnl
|
||||
# serial 30 AC_PROG_LIBTOOL
|
||||
AC_DEFUN(AC_PROG_LIBTOOL,
|
||||
[AC_PREREQ(2.12.2)dnl
|
||||
AC_REQUIRE([AC_ENABLE_SHARED])dnl
|
||||
AC_REQUIRE([AC_ENABLE_STATIC])dnl
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
|
||||
AC_REQUIRE([AC_PROG_RANLIB])dnl
|
||||
AC_REQUIRE([AC_PROG_CC])dnl
|
||||
AC_REQUIRE([AM_PROG_LD])dnl
|
||||
AC_REQUIRE([AM_PROG_NM])dnl
|
||||
AC_REQUIRE([AM_SYS_NM_PARSE])dnl
|
||||
AC_REQUIRE([AM_SYS_SYMBOL_UNDERSCORE])dnl
|
||||
AC_REQUIRE([AC_PROG_LD])dnl
|
||||
AC_REQUIRE([AC_PROG_NM])dnl
|
||||
AC_REQUIRE([AC_SYS_NM_PARSE])dnl
|
||||
AC_REQUIRE([AC_SYS_SYMBOL_UNDERSCORE])dnl
|
||||
AC_REQUIRE([AC_PROG_LN_S])dnl
|
||||
dnl
|
||||
# Always use our own libtool.
|
||||
|
|
@ -82,7 +83,7 @@ case "$host" in
|
|||
;;
|
||||
|
||||
*-*-cygwin32*)
|
||||
AM_SYS_LIBTOOL_CYGWIN32
|
||||
AC_SYS_LIBTOOL_CYGWIN32
|
||||
;;
|
||||
|
||||
esac
|
||||
|
|
@ -107,20 +108,23 @@ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
|
|||
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|
||||
|| AC_MSG_ERROR([libtool configure failed])
|
||||
|
||||
# This can be used to rebuild libtool when needed
|
||||
LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
|
||||
|
||||
# Redirect the config.log output again, so that the ltconfig log is not
|
||||
# clobbered by the next message.
|
||||
exec 5>>./config.log
|
||||
])
|
||||
|
||||
# AM_ENABLE_SHARED - implement the --enable-shared flag
|
||||
# Usage: AM_ENABLE_SHARED[(DEFAULT)]
|
||||
# AC_ENABLE_SHARED - implement the --enable-shared flag
|
||||
# Usage: AC_ENABLE_SHARED[(DEFAULT)]
|
||||
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
||||
# `yes'.
|
||||
AC_DEFUN(AM_ENABLE_SHARED,
|
||||
[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||
AC_DEFUN(AC_ENABLE_SHARED,
|
||||
[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||
AC_ARG_ENABLE(shared,
|
||||
changequote(<<, >>)dnl
|
||||
<< --enable-shared[=PKGS] build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT],
|
||||
<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
|
||||
changequote([, ])dnl
|
||||
[p=${PACKAGE-default}
|
||||
case "$enableval" in
|
||||
|
|
@ -138,26 +142,26 @@ no) enable_shared=no ;;
|
|||
IFS="$ac_save_ifs"
|
||||
;;
|
||||
esac],
|
||||
enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl
|
||||
enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
|
||||
])
|
||||
|
||||
# AM_DISABLE_SHARED - set the default shared flag to --disable-shared
|
||||
AC_DEFUN(AM_DISABLE_SHARED,
|
||||
[AM_ENABLE_SHARED(no)])
|
||||
# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
|
||||
AC_DEFUN(AC_DISABLE_SHARED,
|
||||
[AC_ENABLE_SHARED(no)])
|
||||
|
||||
# AM_DISABLE_STATIC - set the default static flag to --disable-static
|
||||
AC_DEFUN(AM_DISABLE_STATIC,
|
||||
[AM_ENABLE_STATIC(no)])
|
||||
# AC_DISABLE_STATIC - set the default static flag to --disable-static
|
||||
AC_DEFUN(AC_DISABLE_STATIC,
|
||||
[AC_ENABLE_STATIC(no)])
|
||||
|
||||
# AM_ENABLE_STATIC - implement the --enable-static flag
|
||||
# Usage: AM_ENABLE_STATIC[(DEFAULT)]
|
||||
# AC_ENABLE_STATIC - implement the --enable-static flag
|
||||
# Usage: AC_ENABLE_STATIC[(DEFAULT)]
|
||||
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
||||
# `yes'.
|
||||
AC_DEFUN(AM_ENABLE_STATIC,
|
||||
[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||
AC_DEFUN(AC_ENABLE_STATIC,
|
||||
[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||
AC_ARG_ENABLE(static,
|
||||
changequote(<<, >>)dnl
|
||||
<< --enable-static[=PKGS] build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT],
|
||||
<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
|
||||
changequote([, ])dnl
|
||||
[p=${PACKAGE-default}
|
||||
case "$enableval" in
|
||||
|
|
@ -175,12 +179,12 @@ no) enable_static=no ;;
|
|||
IFS="$ac_save_ifs"
|
||||
;;
|
||||
esac],
|
||||
enable_static=AM_ENABLE_STATIC_DEFAULT)dnl
|
||||
enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
|
||||
])
|
||||
|
||||
|
||||
# AM_PROG_LD - find the path to the GNU or non-GNU linker
|
||||
AC_DEFUN(AM_PROG_LD,
|
||||
# AC_PROG_LD - find the path to the GNU or non-GNU linker
|
||||
AC_DEFUN(AC_PROG_LD,
|
||||
[AC_ARG_WITH(gnu-ld,
|
||||
[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
|
||||
test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
|
||||
|
|
@ -201,15 +205,15 @@ changequote(,)dnl
|
|||
sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%'
|
||||
changequote([,])dnl
|
||||
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
||||
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
||||
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
||||
done
|
||||
case "$host_os" in
|
||||
cygwin*)
|
||||
# Convert to a UNC path for cygwin
|
||||
test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive"`
|
||||
# Convert to a UNC path for cygwin
|
||||
test -z "$LD" && LD=`echo X$ac_prog | sed -e "1s/^X//" -e "$sub_uncdrive"`
|
||||
;;
|
||||
*)
|
||||
test -z "$LD" && LD="$ac_prog"
|
||||
test -z "$LD" && LD="$ac_prog"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
|
@ -225,15 +229,15 @@ changequote(,)dnl
|
|||
changequote([,])dnl
|
||||
sub_uncdir='s%\\%/%g'
|
||||
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
||||
ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
|
||||
ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
|
||||
done
|
||||
case "$host_os" in
|
||||
cygwin*)
|
||||
# Convert to a UNC path for cygwin
|
||||
test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"`
|
||||
# Convert to a UNC path for cygwin
|
||||
test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"`
|
||||
;;
|
||||
*)
|
||||
test -z "$LD" && LD="$ac_prog"
|
||||
test -z "$LD" && LD="$ac_prog"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
|
@ -264,7 +268,7 @@ AC_CACHE_VAL(ac_cv_path_LD,
|
|||
if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
|
||||
test "$with_gnu_ld" != no && break
|
||||
else
|
||||
test "$with_gnu_ld" != yes && break
|
||||
test "$with_gnu_ld" != yes && break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
|
@ -280,10 +284,10 @@ else
|
|||
fi
|
||||
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
||||
AC_SUBST(LD)
|
||||
AM_PROG_LD_GNU
|
||||
AC_PROG_LD_GNU
|
||||
])
|
||||
|
||||
AC_DEFUN(AM_PROG_LD_GNU,
|
||||
AC_DEFUN(AC_PROG_LD_GNU,
|
||||
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
|
||||
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
||||
if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
|
||||
|
|
@ -293,8 +297,8 @@ else
|
|||
fi])
|
||||
])
|
||||
|
||||
# AM_PROG_NM - find the path to a BSD-compatible name lister
|
||||
AC_DEFUN(AM_PROG_NM,
|
||||
# AC_PROG_NM - find the path to a BSD-compatible name lister
|
||||
AC_DEFUN(AC_PROG_NM,
|
||||
[AC_MSG_CHECKING([for BSD-compatible nm])
|
||||
AC_CACHE_VAL(ac_cv_path_NM,
|
||||
[if test -n "$NM"; then
|
||||
|
|
@ -302,20 +306,22 @@ AC_CACHE_VAL(ac_cv_path_NM,
|
|||
ac_cv_path_NM="$NM"
|
||||
else
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
||||
for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
|
||||
for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/nm; then
|
||||
# Check to see if the nm accepts a BSD-compat flag.
|
||||
# Adding the `sed 1q' prevents false positives on HP-UX, which says:
|
||||
# nm: unknown option "B" ignored
|
||||
if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
|
||||
ac_cv_path_NM="$ac_dir/nm -B"
|
||||
ac_cv_path_NM="$ac_dir/nm -B"
|
||||
break
|
||||
elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
|
||||
ac_cv_path_NM="$ac_dir/nm -p"
|
||||
ac_cv_path_NM="$ac_dir/nm -p"
|
||||
break
|
||||
else
|
||||
ac_cv_path_NM="$ac_dir/nm"
|
||||
ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
|
||||
continue # so that we can try to find one that supports BSD flags
|
||||
fi
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
|
|
@ -326,11 +332,11 @@ AC_MSG_RESULT([$NM])
|
|||
AC_SUBST(NM)
|
||||
])
|
||||
|
||||
# AM_SYS_NM_PARSE - Check for command ro grab the raw symbol name followed
|
||||
# AC_SYS_NM_PARSE - Check for command ro grab the raw symbol name followed
|
||||
# by C symbol name from nm.
|
||||
AC_DEFUN(AM_SYS_NM_PARSE,
|
||||
AC_DEFUN(AC_SYS_NM_PARSE,
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
AC_REQUIRE([AM_PROG_NM])dnl
|
||||
AC_REQUIRE([AC_PROG_NM])dnl
|
||||
# Check for command to grab the raw symbol name followed by C symbol from nm.
|
||||
AC_MSG_CHECKING([command to parse $NM output])
|
||||
AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe,
|
||||
|
|
@ -339,7 +345,7 @@ AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe,
|
|||
|
||||
changequote(,)dnl
|
||||
# Character class describing NM global symbol codes.
|
||||
ac_symcode='[BCDEGRSTU]'
|
||||
ac_symcode='[BCDEGRST]'
|
||||
|
||||
# Regexp to match symbols that can be accessed directly from C.
|
||||
ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
|
||||
|
|
@ -350,41 +356,37 @@ ac_symxfrm='\1 \1'
|
|||
# Define system-specific variables.
|
||||
case "$host_os" in
|
||||
aix*)
|
||||
ac_symcode='[BCDTU]'
|
||||
ac_symcode='[BCDT]'
|
||||
;;
|
||||
sunos* | cygwin32* | mingw32*)
|
||||
ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
|
||||
ac_symxfrm='_\1 \1'
|
||||
cygwin32* | mingw32*)
|
||||
ac_symcode='[ABCDGISTW]'
|
||||
;;
|
||||
irix*)
|
||||
# Cannot use undefined symbols on IRIX because inlined functions mess us up.
|
||||
ac_symcode='[BCDEGRST]'
|
||||
;;
|
||||
solaris*)
|
||||
ac_symcode='[BDTU]'
|
||||
ac_symcode='[BDT]'
|
||||
;;
|
||||
esac
|
||||
|
||||
# If we're using GNU nm, then use its standard symbol codes.
|
||||
if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
|
||||
ac_symcode='[ABCDGISTUW]'
|
||||
fi
|
||||
|
||||
case "$host_os" in
|
||||
cygwin32* | mingw32*)
|
||||
# We do not want undefined symbols on cygwin32. The user must
|
||||
# arrange to define them via -l arguments.
|
||||
ac_symcode='[ABCDGISTW]'
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
changequote([,])dnl
|
||||
|
||||
# Write the raw and C identifiers.
|
||||
ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_sympat$/$ac_symxfrm/p'"
|
||||
# Try without a prefix undercore, then with it.
|
||||
for ac_symprfx in "" "_"; do
|
||||
|
||||
# Check to see that the pipe works correctly.
|
||||
ac_pipe_works=no
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
# Write the raw and C identifiers.
|
||||
# Unlike in ltconfig.in, we need $ac_symprfx before $ac_symxfrm here,
|
||||
# otherwise AC_SYS_SYMBOL_UNDERSCORE will always be false
|
||||
ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_symprfx$ac_sympat$/$ac_symprfx$ac_symxfrm/p'"
|
||||
|
||||
# Check to see that the pipe works correctly.
|
||||
ac_pipe_works=no
|
||||
rm -f conftest.$ac_ext
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
|
@ -395,96 +397,100 @@ void nm_test_func(){}
|
|||
#endif
|
||||
int main(){nm_test_var='a';nm_test_func;return 0;}
|
||||
EOF
|
||||
if AC_TRY_EVAL(ac_compile); then
|
||||
# Now try to grab the symbols.
|
||||
ac_nlist=conftest.nm
|
||||
if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
|
||||
|
||||
# Try sorting and uniquifying the output.
|
||||
if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
|
||||
mv -f "$ac_nlist"T "$ac_nlist"
|
||||
ac_wcout=`wc "$ac_nlist" 2>/dev/null`
|
||||
changequote(,)dnl
|
||||
ac_count=`echo "X$ac_wcout" | sed -e 's,^X,,' -e 's/^[ ]*\([0-9][0-9]*\).*$/\1/'`
|
||||
changequote([,])dnl
|
||||
(test "$ac_count" -ge 0) 2>/dev/null || ac_count=-1
|
||||
else
|
||||
rm -f "$ac_nlist"T
|
||||
ac_count=-1
|
||||
fi
|
||||
if AC_TRY_EVAL(ac_compile); then
|
||||
# Now try to grab the symbols.
|
||||
ac_nlist=conftest.nm
|
||||
|
||||
if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
|
||||
|
||||
# Make sure that we snagged all the symbols we need.
|
||||
if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
|
||||
if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
|
||||
cat <<EOF > conftest.c
|
||||
# Try sorting and uniquifying the output.
|
||||
if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
|
||||
mv -f "$ac_nlist"T "$ac_nlist"
|
||||
else
|
||||
rm -f "$ac_nlist"T
|
||||
fi
|
||||
|
||||
# Make sure that we snagged all the symbols we need.
|
||||
if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
|
||||
if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
|
||||
cat <<EOF > conftest.c
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
EOF
|
||||
# Now generate the symbol file.
|
||||
sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
|
||||
# Now generate the symbol file.
|
||||
sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
|
||||
|
||||
cat <<EOF >> conftest.c
|
||||
cat <<EOF >> conftest.c
|
||||
#if defined (__STDC__) && __STDC__
|
||||
# define __ptr_t void *
|
||||
# define lt_ptr_t void *
|
||||
#else
|
||||
# define __ptr_t char *
|
||||
# define lt_ptr_t char *
|
||||
# define const
|
||||
#endif
|
||||
|
||||
/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
|
||||
int dld_preloaded_symbol_count = $ac_count;
|
||||
|
||||
/* The mapping between symbol names and symbols. */
|
||||
struct {
|
||||
char *name;
|
||||
__ptr_t address;
|
||||
const struct {
|
||||
const char *name;
|
||||
lt_ptr_t address;
|
||||
}
|
||||
changequote(,)dnl
|
||||
dld_preloaded_symbols[] =
|
||||
lt_preloaded_symbols[] =
|
||||
changequote([,])dnl
|
||||
{
|
||||
EOF
|
||||
sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
|
||||
cat <<\EOF >> conftest.c
|
||||
{0, (__ptr_t) 0}
|
||||
sed 's/^\(.*\) \(.*\)$/ {"\1", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
|
||||
cat <<\EOF >> conftest.c
|
||||
{0, (lt_ptr_t) 0}
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
EOF
|
||||
# Now try linking the two files.
|
||||
mv conftest.$ac_objext conftestm.$ac_objext
|
||||
ac_save_LIBS="$LIBS"
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
LIBS="conftestm.$ac_objext"
|
||||
CFLAGS="$CFLAGS$no_builtin_flag"
|
||||
if AC_TRY_EVAL(ac_link) && test -s conftest; then
|
||||
ac_pipe_works=yes
|
||||
else
|
||||
echo "configure: failed program was:" >&AC_FD_CC
|
||||
cat conftest.c >&AC_FD_CC
|
||||
fi
|
||||
LIBS="$ac_save_LIBS"
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
# Now try linking the two files.
|
||||
mv conftest.$ac_objext conftestm.$ac_objext
|
||||
ac_save_LIBS="$LIBS"
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
LIBS="conftestm.$ac_objext"
|
||||
CFLAGS="$CFLAGS$no_builtin_flag"
|
||||
if AC_TRY_EVAL(ac_link) && test -s conftest; then
|
||||
ac_pipe_works=yes
|
||||
else
|
||||
echo "configure: failed program was:" >&AC_FD_CC
|
||||
cat conftest.c >&AC_FD_CC
|
||||
fi
|
||||
LIBS="$ac_save_LIBS"
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
else
|
||||
echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
|
||||
fi
|
||||
else
|
||||
echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
|
||||
echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
|
||||
fi
|
||||
else
|
||||
echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
|
||||
echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
|
||||
fi
|
||||
else
|
||||
echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
|
||||
echo "$progname: failed program was:" >&AC_FD_CC
|
||||
cat conftest.c >&AC_FD_CC
|
||||
fi
|
||||
else
|
||||
echo "$progname: failed program was:" >&AC_FD_CC
|
||||
cat conftest.c >&AC_FD_CC
|
||||
fi
|
||||
rm -rf conftest*
|
||||
rm -rf conftest*
|
||||
|
||||
# Do not use the global_symbol_pipe unless it works.
|
||||
test "$ac_pipe_works" = yes || ac_cv_sys_global_symbol_pipe=
|
||||
# Do not use the global_symbol_pipe unless it works.
|
||||
if test "$ac_pipe_works" = yes; then
|
||||
if test x"$ac_symprfx" = x"_"; then
|
||||
ac_cv_sys_symbol_underscore=yes
|
||||
else
|
||||
ac_cv_sys_symbol_underscore=no
|
||||
fi
|
||||
break
|
||||
else
|
||||
ac_cv_sys_global_symbol_pipe=
|
||||
fi
|
||||
done
|
||||
])
|
||||
|
||||
ac_result=yes
|
||||
|
|
@ -494,17 +500,17 @@ fi
|
|||
AC_MSG_RESULT($ac_result)
|
||||
])
|
||||
|
||||
# AM_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32
|
||||
AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN32,
|
||||
# AC_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32
|
||||
AC_DEFUN(AC_SYS_LIBTOOL_CYGWIN32,
|
||||
[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
||||
AC_CHECK_TOOL(AS, as, false)
|
||||
])
|
||||
|
||||
# AM_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
|
||||
# AC_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
|
||||
# with an underscore?
|
||||
AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE,
|
||||
[AC_REQUIRE([AM_PROG_NM])dnl
|
||||
AC_REQUIRE([AM_SYS_NM_PARSE])dnl
|
||||
AC_DEFUN(AC_SYS_SYMBOL_UNDERSCORE,
|
||||
[AC_REQUIRE([AC_PROG_NM])dnl
|
||||
AC_REQUIRE([AC_SYS_NM_PARSE])dnl
|
||||
AC_MSG_CHECKING([for _ prefix in compiled symbols])
|
||||
AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
|
||||
[ac_cv_sys_symbol_underscore=no
|
||||
|
|
@ -521,9 +527,9 @@ if AC_TRY_EVAL(ac_compile); then
|
|||
ac_cv_sys_symbol_underscore=yes
|
||||
else
|
||||
if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then
|
||||
:
|
||||
:
|
||||
else
|
||||
echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
|
||||
echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
|
||||
fi
|
||||
fi
|
||||
else
|
||||
|
|
@ -536,8 +542,18 @@ fi
|
|||
rm -rf conftest*
|
||||
])
|
||||
AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
|
||||
if test x$ac_cv_sys_symbol_underscore = xyes; then
|
||||
AC_DEFINE(WITH_SYMBOL_UNDERSCORE,1,
|
||||
[define if compiled symbols have a leading underscore])
|
||||
fi
|
||||
USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
|
||||
AC_SUBST(USE_SYMBOL_UNDERSCORE)dnl
|
||||
])
|
||||
|
||||
dnl old names
|
||||
AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
|
||||
AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
|
||||
AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
|
||||
AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
|
||||
AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
|
||||
AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
|
||||
AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
|
||||
AC_DEFUN(AM_SYS_NM_PARSE, [indir([AC_SYS_NM_PARSE])])dnl
|
||||
AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE, [indir([AC_SYS_SYMBOL_UNDERSCORE])])dnl
|
||||
AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN32, [indir([AC_SYS_LIBTOOL_CYGWIN32])])dnl
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ datafiles_read_directories (char *path_str,
|
|||
/* Set local path to contain temp_path, where (supposedly)
|
||||
* there may be working files.
|
||||
*/
|
||||
home = getenv("HOME");
|
||||
home = g_get_home_dir ();
|
||||
local_path = g_strdup (path_str);
|
||||
|
||||
/* Search through all directories in the local path */
|
||||
|
|
|
|||
|
|
@ -31,15 +31,12 @@ static Argument * invert_invoker (Argument *);
|
|||
|
||||
|
||||
void
|
||||
image_invert (gimage_ptr)
|
||||
void *gimage_ptr;
|
||||
image_invert (GImage *gimage)
|
||||
{
|
||||
GImage *gimage;
|
||||
GimpDrawable *drawable;
|
||||
Argument *return_vals;
|
||||
int nreturn_vals;
|
||||
|
||||
gimage = (GImage *) gimage_ptr;
|
||||
drawable = gimage_active_drawable (gimage);
|
||||
|
||||
if (drawable_indexed (drawable))
|
||||
|
|
@ -63,8 +60,7 @@ image_invert (gimage_ptr)
|
|||
/* Inverter */
|
||||
|
||||
static void
|
||||
invert (drawable)
|
||||
GimpDrawable *drawable;
|
||||
invert (GimpDrawable *drawable)
|
||||
{
|
||||
PixelRegion srcPR, destPR;
|
||||
unsigned char *src, *s;
|
||||
|
|
|
|||
|
|
@ -18,10 +18,11 @@
|
|||
#ifndef __INVERT_H__
|
||||
#define __INVERT_H__
|
||||
|
||||
#include "gimage.h"
|
||||
#include "procedural_db.h"
|
||||
|
||||
/* invert functions */
|
||||
void image_invert (void *);
|
||||
void image_invert (GImage *);
|
||||
|
||||
/* Procedure definition and marshalling function */
|
||||
extern ProcRecord invert_proc;
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ datafiles_read_directories (char *path_str,
|
|||
/* Set local path to contain temp_path, where (supposedly)
|
||||
* there may be working files.
|
||||
*/
|
||||
home = getenv("HOME");
|
||||
home = g_get_home_dir ();
|
||||
local_path = g_strdup (path_str);
|
||||
|
||||
/* Search through all directories in the local path */
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ load_idea_manager( idea_manager *ideas )
|
|||
|
||||
if ( ! idea_list )
|
||||
{
|
||||
home_dir = getenv( "HOME" );
|
||||
home_dir = g_get_home_dir();
|
||||
|
||||
/* open persistant desktop file. */
|
||||
desktopfile = append2( home_dir, FALSE, IDEAPATH, FALSE );
|
||||
|
|
@ -292,7 +292,7 @@ save_idea_manager( idea_manager *ideas )
|
|||
gchar *desktopfile;
|
||||
gchar *home_dir;
|
||||
|
||||
home_dir = getenv( "HOME" );
|
||||
home_dir = g_get_home_dir();
|
||||
|
||||
/* open persistant desktop file. */
|
||||
desktopfile = append2( home_dir, FALSE, IDEAPATH, FALSE );
|
||||
|
|
@ -436,7 +436,7 @@ static void idea_add_in_position_with_select( gchar *title, gint position, gbool
|
|||
gchar *desktopfile;
|
||||
gchar *home_dir;
|
||||
|
||||
home_dir = getenv( "HOME" );
|
||||
home_dir = g_get_home_dir();
|
||||
|
||||
/* open persistant desktop file. */
|
||||
desktopfile = append2( home_dir, FALSE, IDEAPATH, FALSE );
|
||||
|
|
|
|||
|
|
@ -868,7 +868,9 @@ file_save (GimpImage* gimage,
|
|||
attention --Adam */
|
||||
/* gimage_set_save_proc(gimage, file_proc); */
|
||||
|
||||
#ifdef __GNUC__
|
||||
#warning CRUFTY THUMBNAIL SAVING
|
||||
#endif
|
||||
/* If you have problems, blame Adam... not quite finished. */
|
||||
{
|
||||
TempBuf* tempbuf;
|
||||
|
|
|
|||
|
|
@ -31,15 +31,12 @@ static Argument * invert_invoker (Argument *);
|
|||
|
||||
|
||||
void
|
||||
image_invert (gimage_ptr)
|
||||
void *gimage_ptr;
|
||||
image_invert (GImage *gimage)
|
||||
{
|
||||
GImage *gimage;
|
||||
GimpDrawable *drawable;
|
||||
Argument *return_vals;
|
||||
int nreturn_vals;
|
||||
|
||||
gimage = (GImage *) gimage_ptr;
|
||||
drawable = gimage_active_drawable (gimage);
|
||||
|
||||
if (drawable_indexed (drawable))
|
||||
|
|
@ -63,8 +60,7 @@ image_invert (gimage_ptr)
|
|||
/* Inverter */
|
||||
|
||||
static void
|
||||
invert (drawable)
|
||||
GimpDrawable *drawable;
|
||||
invert (GimpDrawable *drawable)
|
||||
{
|
||||
PixelRegion srcPR, destPR;
|
||||
unsigned char *src, *s;
|
||||
|
|
|
|||
|
|
@ -18,10 +18,11 @@
|
|||
#ifndef __INVERT_H__
|
||||
#define __INVERT_H__
|
||||
|
||||
#include "gimage.h"
|
||||
#include "procedural_db.h"
|
||||
|
||||
/* invert functions */
|
||||
void image_invert (void *);
|
||||
void image_invert (GImage *);
|
||||
|
||||
/* Procedure definition and marshalling function */
|
||||
extern ProcRecord invert_proc;
|
||||
|
|
|
|||
|
|
@ -293,7 +293,7 @@ gimp_directory ()
|
|||
return gimp_dir;
|
||||
|
||||
env_gimp_dir = getenv ("GIMP_DIRECTORY");
|
||||
env_home_dir = getenv ("HOME");
|
||||
env_home_dir = g_get_home_dir ();
|
||||
if (NULL != env_home_dir)
|
||||
len_env_home_dir = strlen (env_home_dir);
|
||||
|
||||
|
|
@ -386,7 +386,7 @@ parse_gimprc_file (char *filename)
|
|||
if (filename[0] != '/')
|
||||
{
|
||||
if (!home_dir)
|
||||
home_dir = g_strdup (getenv ("HOME"));
|
||||
home_dir = g_strdup (g_get_home_dir ());
|
||||
g_snprintf (rfilename, MAXPATHLEN, "%s/%s", home_dir, filename);
|
||||
filename = rfilename;
|
||||
}
|
||||
|
|
@ -1457,7 +1457,7 @@ transform_path (char *path,
|
|||
int is_env;
|
||||
UnknownToken *ut;
|
||||
|
||||
home = getenv ("HOME");
|
||||
home = g_get_home_dir ();
|
||||
length = 0;
|
||||
substituted = FALSE;
|
||||
is_env = FALSE;
|
||||
|
|
|
|||
|
|
@ -5967,7 +5967,7 @@ build_user_filename(char *name, char *path_str)
|
|||
|
||||
/* Get the first path specified in the list */
|
||||
|
||||
home = getenv("HOME");
|
||||
home = g_get_home_dir ();
|
||||
local_path = g_strdup(path_str);
|
||||
first_token = local_path;
|
||||
token = xstrsep(&first_token, ":");
|
||||
|
|
|
|||
|
|
@ -5967,7 +5967,7 @@ build_user_filename(char *name, char *path_str)
|
|||
|
||||
/* Get the first path specified in the list */
|
||||
|
||||
home = getenv("HOME");
|
||||
home = g_get_home_dir ();
|
||||
local_path = g_strdup(path_str);
|
||||
first_token = local_path;
|
||||
token = xstrsep(&first_token, ":");
|
||||
|
|
|
|||
|
|
@ -5967,7 +5967,7 @@ build_user_filename(char *name, char *path_str)
|
|||
|
||||
/* Get the first path specified in the list */
|
||||
|
||||
home = getenv("HOME");
|
||||
home = g_get_home_dir ();
|
||||
local_path = g_strdup(path_str);
|
||||
first_token = local_path;
|
||||
token = xstrsep(&first_token, ":");
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
#define MRU_MENU_ENTRY_SIZE (strlen (_("/File/MRU00 ")) + 1)
|
||||
#define MRU_MENU_ACCEL_SIZE sizeof ("<control>0")
|
||||
|
||||
static char* dummyMRU = N_("/File/MRU00 ");
|
||||
static G_GNUC_UNUSED char* dummyMRU = N_("/File/MRU00 ");
|
||||
|
||||
static void menus_init (void);
|
||||
static GtkItemFactoryEntry * translate_entries (const GtkItemFactoryEntry *, gint);
|
||||
|
|
@ -66,7 +66,7 @@ static const GtkItemFactoryEntry toolbox_entries[] =
|
|||
{ N_("/File/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 },
|
||||
{ N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
|
||||
{ N_("/File/Dialogs/Module Browser..."), NULL, dialogs_module_browser_cmd_callback, 0 },
|
||||
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" },
|
||||
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" }
|
||||
};
|
||||
static guint n_toolbox_entries = sizeof (toolbox_entries) / sizeof (toolbox_entries[0]);
|
||||
static GtkItemFactory *toolbox_factory = NULL;
|
||||
|
|
|
|||
|
|
@ -1254,7 +1254,7 @@ palette_create_entries(gpointer client_data,
|
|||
if (palette_path)
|
||||
{
|
||||
/* Get the first path specified in the palette path list */
|
||||
home = getenv("HOME");
|
||||
home = g_get_home_dir ();
|
||||
local_path = g_strdup (palette_path);
|
||||
first_token = local_path;
|
||||
token = xstrsep(&first_token, ":");
|
||||
|
|
|
|||
|
|
@ -31,15 +31,12 @@ static Argument * invert_invoker (Argument *);
|
|||
|
||||
|
||||
void
|
||||
image_invert (gimage_ptr)
|
||||
void *gimage_ptr;
|
||||
image_invert (GImage *gimage)
|
||||
{
|
||||
GImage *gimage;
|
||||
GimpDrawable *drawable;
|
||||
Argument *return_vals;
|
||||
int nreturn_vals;
|
||||
|
||||
gimage = (GImage *) gimage_ptr;
|
||||
drawable = gimage_active_drawable (gimage);
|
||||
|
||||
if (drawable_indexed (drawable))
|
||||
|
|
@ -63,8 +60,7 @@ image_invert (gimage_ptr)
|
|||
/* Inverter */
|
||||
|
||||
static void
|
||||
invert (drawable)
|
||||
GimpDrawable *drawable;
|
||||
invert (GimpDrawable *drawable)
|
||||
{
|
||||
PixelRegion srcPR, destPR;
|
||||
unsigned char *src, *s;
|
||||
|
|
|
|||
|
|
@ -18,10 +18,11 @@
|
|||
#ifndef __INVERT_H__
|
||||
#define __INVERT_H__
|
||||
|
||||
#include "gimage.h"
|
||||
#include "procedural_db.h"
|
||||
|
||||
/* invert functions */
|
||||
void image_invert (void *);
|
||||
void image_invert (GImage *);
|
||||
|
||||
/* Procedure definition and marshalling function */
|
||||
extern ProcRecord invert_proc;
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
#define MRU_MENU_ENTRY_SIZE (strlen (_("/File/MRU00 ")) + 1)
|
||||
#define MRU_MENU_ACCEL_SIZE sizeof ("<control>0")
|
||||
|
||||
static char* dummyMRU = N_("/File/MRU00 ");
|
||||
static G_GNUC_UNUSED char* dummyMRU = N_("/File/MRU00 ");
|
||||
|
||||
static void menus_init (void);
|
||||
static GtkItemFactoryEntry * translate_entries (const GtkItemFactoryEntry *, gint);
|
||||
|
|
@ -66,7 +66,7 @@ static const GtkItemFactoryEntry toolbox_entries[] =
|
|||
{ N_("/File/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 },
|
||||
{ N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
|
||||
{ N_("/File/Dialogs/Module Browser..."), NULL, dialogs_module_browser_cmd_callback, 0 },
|
||||
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" },
|
||||
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" }
|
||||
};
|
||||
static guint n_toolbox_entries = sizeof (toolbox_entries) / sizeof (toolbox_entries[0]);
|
||||
static GtkItemFactory *toolbox_factory = NULL;
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
#define MRU_MENU_ENTRY_SIZE (strlen (_("/File/MRU00 ")) + 1)
|
||||
#define MRU_MENU_ACCEL_SIZE sizeof ("<control>0")
|
||||
|
||||
static char* dummyMRU = N_("/File/MRU00 ");
|
||||
static G_GNUC_UNUSED char* dummyMRU = N_("/File/MRU00 ");
|
||||
|
||||
static void menus_init (void);
|
||||
static GtkItemFactoryEntry * translate_entries (const GtkItemFactoryEntry *, gint);
|
||||
|
|
@ -66,7 +66,7 @@ static const GtkItemFactoryEntry toolbox_entries[] =
|
|||
{ N_("/File/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 },
|
||||
{ N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
|
||||
{ N_("/File/Dialogs/Module Browser..."), NULL, dialogs_module_browser_cmd_callback, 0 },
|
||||
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" },
|
||||
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" }
|
||||
};
|
||||
static guint n_toolbox_entries = sizeof (toolbox_entries) / sizeof (toolbox_entries[0]);
|
||||
static GtkItemFactory *toolbox_factory = NULL;
|
||||
|
|
|
|||
|
|
@ -1254,7 +1254,7 @@ palette_create_entries(gpointer client_data,
|
|||
if (palette_path)
|
||||
{
|
||||
/* Get the first path specified in the palette path list */
|
||||
home = getenv("HOME");
|
||||
home = g_get_home_dir ();
|
||||
local_path = g_strdup (palette_path);
|
||||
first_token = local_path;
|
||||
token = xstrsep(&first_token, ":");
|
||||
|
|
|
|||
|
|
@ -5967,7 +5967,7 @@ build_user_filename(char *name, char *path_str)
|
|||
|
||||
/* Get the first path specified in the list */
|
||||
|
||||
home = getenv("HOME");
|
||||
home = g_get_home_dir ();
|
||||
local_path = g_strdup(path_str);
|
||||
first_token = local_path;
|
||||
token = xstrsep(&first_token, ":");
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
#define MRU_MENU_ENTRY_SIZE (strlen (_("/File/MRU00 ")) + 1)
|
||||
#define MRU_MENU_ACCEL_SIZE sizeof ("<control>0")
|
||||
|
||||
static char* dummyMRU = N_("/File/MRU00 ");
|
||||
static G_GNUC_UNUSED char* dummyMRU = N_("/File/MRU00 ");
|
||||
|
||||
static void menus_init (void);
|
||||
static GtkItemFactoryEntry * translate_entries (const GtkItemFactoryEntry *, gint);
|
||||
|
|
@ -66,7 +66,7 @@ static const GtkItemFactoryEntry toolbox_entries[] =
|
|||
{ N_("/File/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 },
|
||||
{ N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
|
||||
{ N_("/File/Dialogs/Module Browser..."), NULL, dialogs_module_browser_cmd_callback, 0 },
|
||||
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" },
|
||||
{ N_("/File/---"), NULL, NULL, 0, "<Separator>" }
|
||||
};
|
||||
static guint n_toolbox_entries = sizeof (toolbox_entries) / sizeof (toolbox_entries[0]);
|
||||
static GtkItemFactory *toolbox_factory = NULL;
|
||||
|
|
|
|||
|
|
@ -1254,7 +1254,7 @@ palette_create_entries(gpointer client_data,
|
|||
if (palette_path)
|
||||
{
|
||||
/* Get the first path specified in the palette path list */
|
||||
home = getenv("HOME");
|
||||
home = g_get_home_dir ();
|
||||
local_path = g_strdup (palette_path);
|
||||
first_token = local_path;
|
||||
token = xstrsep(&first_token, ":");
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
# Written by Per Bothner <bothner@cygnus.com>.
|
||||
# The master version of this file is at the FSF in /home/gd/gnu/lib.
|
||||
# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
|
||||
#
|
||||
# This script attempts to guess a canonical system name similar to
|
||||
# config.sub. If it succeeds, it prints the system name on stdout, and
|
||||
|
|
@ -46,7 +47,8 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
|
|||
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
||||
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
||||
|
||||
trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
|
||||
dummy=dummy-$$
|
||||
trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
|
||||
|
||||
# Note: order is significant - the case branches are not exclusive.
|
||||
|
||||
|
|
@ -59,7 +61,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
# A Tn.n version is a released field test version.
|
||||
# A Xn.n version is an unreleased experimental baselevel.
|
||||
# 1.2 uses "1.2" for uname -r.
|
||||
cat <<EOF >dummy.s
|
||||
cat <<EOF >$dummy.s
|
||||
.globl main
|
||||
.ent main
|
||||
main:
|
||||
|
|
@ -76,9 +78,9 @@ main:
|
|||
ret \$31,(\$26),1
|
||||
.end main
|
||||
EOF
|
||||
${CC-cc} dummy.s -o dummy 2>/dev/null
|
||||
${CC-cc} $dummy.s -o $dummy 2>/dev/null
|
||||
if test "$?" = 0 ; then
|
||||
./dummy
|
||||
./$dummy
|
||||
case "$?" in
|
||||
7)
|
||||
UNAME_MACHINE="alpha"
|
||||
|
|
@ -97,7 +99,7 @@ EOF
|
|||
;;
|
||||
esac
|
||||
fi
|
||||
rm -f dummy.s dummy
|
||||
rm -f $dummy.s $dummy
|
||||
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
|
||||
exit 0 ;;
|
||||
21064:Windows_NT:50:3)
|
||||
|
|
@ -150,7 +152,7 @@ EOF
|
|||
echo pyramid-pyramid-bsd
|
||||
fi
|
||||
exit 0 ;;
|
||||
NILE:*:*:dcosx)
|
||||
NILE*:*:*:dcosx)
|
||||
echo pyramid-pyramid-svr4
|
||||
exit 0 ;;
|
||||
sun4H:SunOS:5.*:*)
|
||||
|
|
@ -238,7 +240,7 @@ EOF
|
|||
echo clipper-intergraph-clix${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
mips:*:*:UMIPS | mips:*:*:RISCos)
|
||||
sed 's/^ //' << EOF >dummy.c
|
||||
sed 's/^ //' << EOF >$dummy.c
|
||||
int main (argc, argv) int argc; char **argv; {
|
||||
#if defined (host_mips) && defined (MIPSEB)
|
||||
#if defined (SYSTYPE_SYSV)
|
||||
|
|
@ -254,10 +256,10 @@ EOF
|
|||
exit (-1);
|
||||
}
|
||||
EOF
|
||||
${CC-cc} dummy.c -o dummy \
|
||||
&& ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
|
||||
&& rm dummy.c dummy && exit 0
|
||||
rm -f dummy.c dummy
|
||||
${CC-cc} $dummy.c -o $dummy \
|
||||
&& ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
|
||||
&& rm $dummy.c $dummy && exit 0
|
||||
rm -f $dummy.c $dummy
|
||||
echo mips-mips-riscos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
Night_Hawk:Power_UNIX:*:*)
|
||||
|
|
@ -309,7 +311,7 @@ EOF
|
|||
exit 0 ;;
|
||||
*:AIX:2:3)
|
||||
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
|
||||
sed 's/^ //' << EOF >dummy.c
|
||||
sed 's/^ //' << EOF >$dummy.c
|
||||
#include <sys/systemcfg.h>
|
||||
|
||||
main()
|
||||
|
|
@ -320,8 +322,8 @@ EOF
|
|||
exit(0);
|
||||
}
|
||||
EOF
|
||||
${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
|
||||
rm -f dummy.c dummy
|
||||
${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
|
||||
rm -f $dummy.c $dummy
|
||||
echo rs6000-ibm-aix3.2.5
|
||||
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
|
||||
echo rs6000-ibm-aix3.2.4
|
||||
|
|
@ -369,24 +371,24 @@ EOF
|
|||
9000/31? ) HP_ARCH=m68000 ;;
|
||||
9000/[34]?? ) HP_ARCH=m68k ;;
|
||||
9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 )
|
||||
sed 's/^ //' << EOF >dummy.c
|
||||
sed 's/^ //' << EOF >$dummy.c
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
int main ()
|
||||
{
|
||||
#if defined(_SC_KERNEL_BITS)
|
||||
long bits = sysconf(_SC_KERNEL_BITS);
|
||||
#endif
|
||||
#endif
|
||||
long cpu = sysconf (_SC_CPU_VERSION);
|
||||
|
||||
switch (cpu)
|
||||
|
||||
switch (cpu)
|
||||
{
|
||||
case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
|
||||
case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
|
||||
case CPU_PA_RISC2_0:
|
||||
case CPU_PA_RISC2_0:
|
||||
#if defined(_SC_KERNEL_BITS)
|
||||
switch (bits)
|
||||
switch (bits)
|
||||
{
|
||||
case 64: puts ("hppa2.0w"); break;
|
||||
case 32: puts ("hppa2.0n"); break;
|
||||
|
|
@ -394,20 +396,20 @@ EOF
|
|||
} break;
|
||||
#else /* !defined(_SC_KERNEL_BITS) */
|
||||
puts ("hppa2.0"); break;
|
||||
#endif
|
||||
#endif
|
||||
default: puts ("hppa1.0"); break;
|
||||
}
|
||||
exit (0);
|
||||
}
|
||||
EOF
|
||||
(${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
|
||||
rm -f dummy.c dummy
|
||||
(${CC-cc} $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
|
||||
rm -f $dummy.c $dummy
|
||||
esac
|
||||
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
|
||||
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
|
||||
exit 0 ;;
|
||||
3050*:HI-UX:*:*)
|
||||
sed 's/^ //' << EOF >dummy.c
|
||||
sed 's/^ //' << EOF >$dummy.c
|
||||
#include <unistd.h>
|
||||
int
|
||||
main ()
|
||||
|
|
@ -432,8 +434,8 @@ EOF
|
|||
exit (0);
|
||||
}
|
||||
EOF
|
||||
${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
|
||||
rm -f dummy.c dummy
|
||||
${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
|
||||
rm -f $dummy.c $dummy
|
||||
echo unknown-hitachi-hiuxwe2
|
||||
exit 0 ;;
|
||||
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
|
||||
|
|
@ -490,6 +492,9 @@ EOF
|
|||
CRAY*TS:*:*:*)
|
||||
echo t90-cray-unicos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
CRAY*T3E:*:*:*)
|
||||
echo t3e-cray-unicosmk${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
CRAY-2:*:*:*)
|
||||
echo cray2-cray-unicos
|
||||
exit 0 ;;
|
||||
|
|
@ -510,9 +515,12 @@ EOF
|
|||
sparc*:BSD/OS:*:*)
|
||||
echo sparc-unknown-bsdi${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
i?86:BSD/386:*:* | *:BSD/OS:*:*)
|
||||
i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:BSD/OS:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:FreeBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
||||
exit 0 ;;
|
||||
|
|
@ -523,13 +531,13 @@ EOF
|
|||
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
|
||||
exit 0 ;;
|
||||
i*:CYGWIN*:*)
|
||||
echo ${UNAME_MACHINE}-pc-cygwin32
|
||||
echo ${UNAME_MACHINE}-pc-cygwin
|
||||
exit 0 ;;
|
||||
i*:MINGW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-mingw32
|
||||
exit 0 ;;
|
||||
p*:CYGWIN*:*)
|
||||
echo powerpcle-unknown-cygwin32
|
||||
echo powerpcle-unknown-cygwin
|
||||
exit 0 ;;
|
||||
prep*:SunOS:5.*:*)
|
||||
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
|
|
@ -541,6 +549,7 @@ EOF
|
|||
# uname on the ARM produces all sorts of strangeness, and we need to
|
||||
# filter it out.
|
||||
case "$UNAME_MACHINE" in
|
||||
armv*) ;;
|
||||
arm* | sa110*) UNAME_MACHINE="arm" ;;
|
||||
esac
|
||||
|
||||
|
|
@ -563,7 +572,7 @@ EOF
|
|||
esac
|
||||
|
||||
if test "${UNAME_MACHINE}" = "alpha" ; then
|
||||
sed 's/^ //' <<EOF >dummy.s
|
||||
sed 's/^ //' <<EOF >$dummy.s
|
||||
.globl main
|
||||
.ent main
|
||||
main:
|
||||
|
|
@ -581,9 +590,9 @@ EOF
|
|||
.end main
|
||||
EOF
|
||||
LIBC=""
|
||||
${CC-cc} dummy.s -o dummy 2>/dev/null
|
||||
${CC-cc} $dummy.s -o $dummy 2>/dev/null
|
||||
if test "$?" = 0 ; then
|
||||
./dummy
|
||||
./$dummy
|
||||
case "$?" in
|
||||
7)
|
||||
UNAME_MACHINE="alpha"
|
||||
|
|
@ -600,18 +609,18 @@ EOF
|
|||
16)
|
||||
UNAME_MACHINE="alphaev6"
|
||||
;;
|
||||
esac
|
||||
esac
|
||||
|
||||
objdump --private-headers dummy | \
|
||||
objdump --private-headers $dummy | \
|
||||
grep ld.so.1 > /dev/null
|
||||
if test "$?" = 0 ; then
|
||||
LIBC="libc1"
|
||||
fi
|
||||
fi
|
||||
rm -f dummy.s dummy
|
||||
fi
|
||||
rm -f $dummy.s $dummy
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
|
||||
elif test "${UNAME_MACHINE}" = "mips" ; then
|
||||
cat >dummy.c <<EOF
|
||||
cat >$dummy.c <<EOF
|
||||
main(argc, argv)
|
||||
int argc;
|
||||
char *argv[];
|
||||
|
|
@ -625,8 +634,8 @@ main(argc, argv)
|
|||
return 0;
|
||||
}
|
||||
EOF
|
||||
${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
|
||||
rm -f dummy.c dummy
|
||||
${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
|
||||
rm -f $dummy.c $dummy
|
||||
else
|
||||
# Either a pre-BFD a.out linker (linux-gnuoldld)
|
||||
# or one that does not give us useful --help.
|
||||
|
|
@ -645,7 +654,7 @@ EOF
|
|||
;;
|
||||
esac
|
||||
# Determine whether the default compiler is a.out or elf
|
||||
cat >dummy.c <<EOF
|
||||
cat >$dummy.c <<EOF
|
||||
#include <features.h>
|
||||
main(argc, argv)
|
||||
int argc;
|
||||
|
|
@ -667,8 +676,8 @@ main(argc, argv)
|
|||
return 0;
|
||||
}
|
||||
EOF
|
||||
${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
|
||||
rm -f dummy.c dummy
|
||||
${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
|
||||
rm -f $dummy.c $dummy
|
||||
fi ;;
|
||||
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
|
||||
# are messed up and put the nodename in both sysname and nodename.
|
||||
|
|
@ -810,12 +819,24 @@ EOF
|
|||
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
|
||||
echo i586-pc-beos
|
||||
exit 0 ;;
|
||||
SX-4:SUPER-UX:*:*)
|
||||
echo sx4-nec-superux${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
SX-5:SUPER-UX:*:*)
|
||||
echo sx5-nec-superux${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
Power*:Rhapsody:*:*)
|
||||
echo powerpc-apple-rhapsody${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:Rhapsody:*:*)
|
||||
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
esac
|
||||
|
||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
||||
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
|
||||
|
||||
cat >dummy.c <<EOF
|
||||
cat >$dummy.c <<EOF
|
||||
#ifdef _SEQUENT_
|
||||
# include <sys/types.h>
|
||||
# include <sys/utsname.h>
|
||||
|
|
@ -853,7 +874,10 @@ main ()
|
|||
#endif
|
||||
int version;
|
||||
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
|
||||
printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
|
||||
if (version < 4)
|
||||
printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
|
||||
else
|
||||
printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
|
||||
exit (0);
|
||||
#endif
|
||||
|
||||
|
|
@ -913,8 +937,8 @@ main ()
|
|||
}
|
||||
EOF
|
||||
|
||||
${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
|
||||
rm -f dummy.c dummy
|
||||
${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
|
||||
rm -f $dummy.c $dummy
|
||||
|
||||
# Apollos put the system type in the environment.
|
||||
|
||||
|
|
|
|||
|
|
@ -152,10 +152,11 @@ case $basic_machine in
|
|||
tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
|
||||
| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
|
||||
| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
|
||||
| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
|
||||
| alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
|
||||
| alphapca57 | alphaev7 | we32k | ns16k | clipper \
|
||||
| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
|
||||
| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
|
||||
| mipstx39 | mipstx39el \
|
||||
| mipstx39 | mipstx39el | armv[34][lb] \
|
||||
| sparc | sparclet | sparclite | sparc64 | v850)
|
||||
basic_machine=$basic_machine-unknown
|
||||
;;
|
||||
|
|
@ -176,13 +177,14 @@ case $basic_machine in
|
|||
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
|
||||
| power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
|
||||
| xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
|
||||
| alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
|
||||
| alpha-* | alphaev5-* | alphaev56-* | alphapca56-* \
|
||||
| alphaev6-* | alphapca57-* | alphaev7-* | we32k-* | cydra-* \
|
||||
| ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
|
||||
| sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
|
||||
| sparc64-* | mips64-* | mipsel-* \
|
||||
| sparc64-* | mips64-* | mipsel-* | armv[34][lb]-* \
|
||||
| mips64el-* | mips64orion-* | mips64orionel-* \
|
||||
| mipstx39-* | mipstx39el-* \
|
||||
| f301-*)
|
||||
| f301-* | armv*-*)
|
||||
;;
|
||||
# Recognize the various machine names and aliases which stand
|
||||
# for a CPU type and a company and sometimes even an OS.
|
||||
|
|
@ -412,6 +414,10 @@ case $basic_machine in
|
|||
basic_machine=i486-ncr
|
||||
os=-sysv4
|
||||
;;
|
||||
netwinder)
|
||||
basic_machine=armv4l-corel
|
||||
os=-linux
|
||||
;;
|
||||
news | news700 | news800 | news900)
|
||||
basic_machine=m68k-sony
|
||||
os=-newsos
|
||||
|
|
@ -713,8 +719,9 @@ case $os in
|
|||
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
|
||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
| -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -mingw32* | -linux-gnu* | -uxpv* | -beos*)
|
||||
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \
|
||||
| -openstep*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-linux*)
|
||||
|
|
@ -800,6 +807,9 @@ case $basic_machine in
|
|||
*-acorn)
|
||||
os=-riscix1.2
|
||||
;;
|
||||
arm*-corel)
|
||||
os=-linux
|
||||
;;
|
||||
arm*-semi)
|
||||
os=-aout
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -886,7 +886,7 @@ gimp_gtkrc ()
|
|||
static char filename[MAXPATHLEN];
|
||||
char *home_dir;
|
||||
|
||||
home_dir = getenv ("HOME");
|
||||
home_dir = g_get_home_dir ();
|
||||
if (!home_dir)
|
||||
return NULL;
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ parasite_new (const char *name, guint32 flags,
|
|||
guint32 size, const void *data)
|
||||
{
|
||||
Parasite *p;
|
||||
p = (Parasite *)g_malloc(sizeof(Parasite));
|
||||
p = g_new (Parasite, 1);
|
||||
if (name)
|
||||
p->name = g_strdup(name);
|
||||
else
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ parasite_new (const char *name, guint32 flags,
|
|||
guint32 size, const void *data)
|
||||
{
|
||||
Parasite *p;
|
||||
p = (Parasite *)g_malloc(sizeof(Parasite));
|
||||
p = g_new (Parasite, 1);
|
||||
if (name)
|
||||
p->name = g_strdup(name);
|
||||
else
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ datafiles_read_directories (char *path_str,
|
|||
/* Set local path to contain temp_path, where (supposedly)
|
||||
* there may be working files.
|
||||
*/
|
||||
home = getenv("HOME");
|
||||
home = g_get_home_dir ();
|
||||
local_path = g_strdup (path_str);
|
||||
|
||||
/* Search through all directories in the local path */
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ parasite_new (const char *name, guint32 flags,
|
|||
guint32 size, const void *data)
|
||||
{
|
||||
Parasite *p;
|
||||
p = (Parasite *)g_malloc(sizeof(Parasite));
|
||||
p = g_new (Parasite, 1);
|
||||
if (name)
|
||||
p->name = g_strdup(name);
|
||||
else
|
||||
|
|
|
|||
|
|
@ -8,9 +8,14 @@ INCLUDES = \
|
|||
$(GTK_CFLAGS) \
|
||||
-I$(includedir)
|
||||
|
||||
module_LTLIBRARIES = libcolorsel_gtk.la libcolorsel_triangle.la
|
||||
module_LTLIBRARIES = \
|
||||
libcolorsel_gtk.la \
|
||||
libcolorsel_triangle.la
|
||||
|
||||
libcolorsel_gtk_la_SOURCES = colorsel_gtk.c
|
||||
libcolorsel_gtk_la_LDFLAGS = -avoid-version -module
|
||||
libcolorsel_gtk_la_LIBADD = @GTK_LIBS@
|
||||
|
||||
libcolorsel_triangle_la_SOURCES = colorsel_triangle.c
|
||||
|
||||
libcolorsel_triangle_la_LDFLAGS = -avoid-version -module
|
||||
libcolorsel_triangle_la_LIBADD = @GTK_LIBS@
|
||||
|
|
|
|||
|
|
@ -15,8 +15,7 @@ INCLUDES = \
|
|||
LDADD = \
|
||||
$(top_builddir)/libgimp/libgimpui.la \
|
||||
$(top_builddir)/libgimp/libgimp.la \
|
||||
$(GTK_LIBS) \
|
||||
@LIBJPEG_LIB@
|
||||
$(GTK_LIBS)
|
||||
|
||||
DEPS = \
|
||||
$(top_builddir)/libgimp/libgimpui.la \
|
||||
|
|
|
|||
|
|
@ -14,8 +14,7 @@ INCLUDES = \
|
|||
|
||||
LDADD = \
|
||||
$(top_builddir)/libgimp/libgimp.la \
|
||||
$(GTK_LIBS) \
|
||||
@LIBJPEG_LIB@
|
||||
$(GTK_LIBS)
|
||||
|
||||
DEPS = \
|
||||
$(top_builddir)/libgimp/libgimp.la
|
||||
|
|
|
|||
|
|
@ -14,8 +14,7 @@ INCLUDES = \
|
|||
|
||||
LDADD = \
|
||||
$(top_builddir)/libgimp/libgimp.la \
|
||||
$(GTK_LIBS) \
|
||||
@LIBJPEG_LIB@
|
||||
$(GTK_LIBS)
|
||||
|
||||
DEPS = \
|
||||
$(top_builddir)/libgimp/libgimp.la
|
||||
|
|
|
|||
Loading…
Reference in New Issue