Commit 5c107a27 authored by Manish Singh's avatar Manish Singh

acconfig.h configure.in added check for putenv and #ifdefed it's usage

* acconfig.h
* configure.in
* app/main.c: added check for putenv and #ifdefed it's usage since NeXTStep is
lame

* libgimp/gimp.c
* app/main.c
* app/plug_in.c: conditionally compile shared mem stuff so platforms without
it can still work

* plug-ins/CEL/CEL.c
* plug-ins/palette/palette.c
* plug-ins/print/print-escp2.c
* plug-ins/print/print-pcl.c
* plug-ins/print/print-ps.c: s/strdup/g_strdup/ for portability

-Yosh
parent 2f637810
Fri Aug 28 15:56:41 PDT 1998 Manish Singh <yosh@gimp.org>
* acconfig.h
* configure.in
* app/main.c: added check for putenv and #ifdefed it's usage since
NeXTStep is lame
* libgimp/gimp.c
* app/main.c
* app/plug_in.c: conditionally compile shared mem stuff so platforms
without it can still work
* plug-ins/CEL/CEL.c
* plug-ins/palette/palette.c
* plug-ins/print/print-escp2.c
* plug-ins/print/print-pcl.c
* plug-ins/print/print-ps.c: s/strdup/g_strdup/ for portability
Wed Aug 26 16:30:36 1998 Raph Levien <raph@gimp.org>
* app/gradient.c (grad_create_gradient_editor,
......
......@@ -22,7 +22,9 @@
#undef HAVE_IPC_H
#undef HAVE_LC_MESSAGES
#undef HAVE_NDIR_H
#undef HAVE_PUTENV
#undef HAVE_SHM_H
#undef HAVE_STPCPY
#undef HAVE_SYS_DIR_H
#undef HAVE_SYS_NDIR_H
#undef HAVE_SYS_SELECT_H
......
......@@ -25,12 +25,18 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#ifdef HAVE_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SHM_H
#include <sys/shm.h>
#endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
......@@ -292,6 +298,7 @@ plug_in_init ()
wire_set_writer (plug_in_write);
wire_set_flusher (plug_in_flush);
#ifdef HAVE_SHM_H
/* allocate a piece of shared memory for use in transporting tiles
* to plug-ins. if we can't allocate a piece of shared memory then
* we'll fall back on sending the data over the pipe.
......@@ -316,6 +323,7 @@ plug_in_init ()
#endif
}
}
#endif
/* search for binaries in the plug-in directory path */
datafiles_read_directories (plug_in_path, plug_in_init_file, MODE_EXECUTABLE);
......@@ -444,6 +452,7 @@ plug_in_kill ()
GSList *tmp;
PlugIn *plug_in;
#ifdef HAVE_SHM_H
#ifndef IPC_RMID_DEFERRED_RELEASE
if (shm_ID != -1)
{
......@@ -454,7 +463,8 @@ plug_in_kill ()
if (shm_ID != -1)
shmdt ((char*) shm_addr);
#endif
#endif
tmp = open_plug_ins;
while (tmp)
{
......
......@@ -25,12 +25,18 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#ifdef HAVE_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SHM_H
#include <sys/shm.h>
#endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
......@@ -292,6 +298,7 @@ plug_in_init ()
wire_set_writer (plug_in_write);
wire_set_flusher (plug_in_flush);
#ifdef HAVE_SHM_H
/* allocate a piece of shared memory for use in transporting tiles
* to plug-ins. if we can't allocate a piece of shared memory then
* we'll fall back on sending the data over the pipe.
......@@ -316,6 +323,7 @@ plug_in_init ()
#endif
}
}
#endif
/* search for binaries in the plug-in directory path */
datafiles_read_directories (plug_in_path, plug_in_init_file, MODE_EXECUTABLE);
......@@ -444,6 +452,7 @@ plug_in_kill ()
GSList *tmp;
PlugIn *plug_in;
#ifdef HAVE_SHM_H
#ifndef IPC_RMID_DEFERRED_RELEASE
if (shm_ID != -1)
{
......@@ -454,7 +463,8 @@ plug_in_kill ()
if (shm_ID != -1)
shmdt ((char*) shm_addr);
#endif
#endif
tmp = open_plug_ins;
while (tmp)
{
......
......@@ -25,12 +25,18 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#ifdef HAVE_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SHM_H
#include <sys/shm.h>
#endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
......@@ -292,6 +298,7 @@ plug_in_init ()
wire_set_writer (plug_in_write);
wire_set_flusher (plug_in_flush);
#ifdef HAVE_SHM_H
/* allocate a piece of shared memory for use in transporting tiles
* to plug-ins. if we can't allocate a piece of shared memory then
* we'll fall back on sending the data over the pipe.
......@@ -316,6 +323,7 @@ plug_in_init ()
#endif
}
}
#endif
/* search for binaries in the plug-in directory path */
datafiles_read_directories (plug_in_path, plug_in_init_file, MODE_EXECUTABLE);
......@@ -444,6 +452,7 @@ plug_in_kill ()
GSList *tmp;
PlugIn *plug_in;
#ifdef HAVE_SHM_H
#ifndef IPC_RMID_DEFERRED_RELEASE
if (shm_ID != -1)
{
......@@ -454,7 +463,8 @@ plug_in_kill ()
if (shm_ID != -1)
shmdt ((char*) shm_addr);
#endif
#endif
tmp = open_plug_ins;
while (tmp)
{
......
......@@ -89,7 +89,9 @@ main (int argc, char **argv)
int show_version;
int show_help;
int i, j;
#ifdef HAVE_PUTENV
gchar *display_name, *display_env;
#endif
ATEXIT (g_mem_profile);
......@@ -113,18 +115,24 @@ main (int argc, char **argv)
gle_init (&argc, &argv);
#endif /* !HAVE_LIBGLE */
#ifdef HAVE_PUTENV
display_name = gdk_get_display ();
display_env = g_new (gchar, strlen (display_name) + 9);
*display_env = 0;
strcat (display_env, "DISPLAY=");
strcat (display_env, display_name);
putenv (display_env);
#endif
no_interface = FALSE;
no_data = FALSE;
no_splash = FALSE;
no_splash_image = FALSE;
#ifdef HAVE_SHM_H
use_shm = TRUE;
#else
use_shm = FALSE;
#endif
use_debug_handler = FALSE;
restore_session = FALSE;
console_messages = FALSE;
......
......@@ -25,12 +25,18 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#ifdef HAVE_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SHM_H
#include <sys/shm.h>
#endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
......@@ -292,6 +298,7 @@ plug_in_init ()
wire_set_writer (plug_in_write);
wire_set_flusher (plug_in_flush);
#ifdef HAVE_SHM_H
/* allocate a piece of shared memory for use in transporting tiles
* to plug-ins. if we can't allocate a piece of shared memory then
* we'll fall back on sending the data over the pipe.
......@@ -316,6 +323,7 @@ plug_in_init ()
#endif
}
}
#endif
/* search for binaries in the plug-in directory path */
datafiles_read_directories (plug_in_path, plug_in_init_file, MODE_EXECUTABLE);
......@@ -444,6 +452,7 @@ plug_in_kill ()
GSList *tmp;
PlugIn *plug_in;
#ifdef HAVE_SHM_H
#ifndef IPC_RMID_DEFERRED_RELEASE
if (shm_ID != -1)
{
......@@ -454,7 +463,8 @@ plug_in_kill ()
if (shm_ID != -1)
shmdt ((char*) shm_addr);
#endif
#endif
tmp = open_plug_ins;
while (tmp)
{
......
......@@ -25,12 +25,18 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#ifdef HAVE_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SHM_H
#include <sys/shm.h>
#endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
......@@ -292,6 +298,7 @@ plug_in_init ()
wire_set_writer (plug_in_write);
wire_set_flusher (plug_in_flush);
#ifdef HAVE_SHM_H
/* allocate a piece of shared memory for use in transporting tiles
* to plug-ins. if we can't allocate a piece of shared memory then
* we'll fall back on sending the data over the pipe.
......@@ -316,6 +323,7 @@ plug_in_init ()
#endif
}
}
#endif
/* search for binaries in the plug-in directory path */
datafiles_read_directories (plug_in_path, plug_in_init_file, MODE_EXECUTABLE);
......@@ -444,6 +452,7 @@ plug_in_kill ()
GSList *tmp;
PlugIn *plug_in;
#ifdef HAVE_SHM_H
#ifndef IPC_RMID_DEFERRED_RELEASE
if (shm_ID != -1)
{
......@@ -454,7 +463,8 @@ plug_in_kill ()
if (shm_ID != -1)
shmdt ((char*) shm_addr);
#endif
#endif
tmp = open_plug_ins;
while (tmp)
{
......
......@@ -25,12 +25,18 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#ifdef HAVE_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SHM_H
#include <sys/shm.h>
#endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
......@@ -292,6 +298,7 @@ plug_in_init ()
wire_set_writer (plug_in_write);
wire_set_flusher (plug_in_flush);
#ifdef HAVE_SHM_H
/* allocate a piece of shared memory for use in transporting tiles
* to plug-ins. if we can't allocate a piece of shared memory then
* we'll fall back on sending the data over the pipe.
......@@ -316,6 +323,7 @@ plug_in_init ()
#endif
}
}
#endif
/* search for binaries in the plug-in directory path */
datafiles_read_directories (plug_in_path, plug_in_init_file, MODE_EXECUTABLE);
......@@ -444,6 +452,7 @@ plug_in_kill ()
GSList *tmp;
PlugIn *plug_in;
#ifdef HAVE_SHM_H
#ifndef IPC_RMID_DEFERRED_RELEASE
if (shm_ID != -1)
{
......@@ -454,7 +463,8 @@ plug_in_kill ()
if (shm_ID != -1)
shmdt ((char*) shm_addr);
#endif
#endif
tmp = open_plug_ins;
while (tmp)
{
......
......@@ -25,12 +25,18 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#ifdef HAVE_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SHM_H
#include <sys/shm.h>
#endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
......@@ -292,6 +298,7 @@ plug_in_init ()
wire_set_writer (plug_in_write);
wire_set_flusher (plug_in_flush);
#ifdef HAVE_SHM_H
/* allocate a piece of shared memory for use in transporting tiles
* to plug-ins. if we can't allocate a piece of shared memory then
* we'll fall back on sending the data over the pipe.
......@@ -316,6 +323,7 @@ plug_in_init ()
#endif
}
}
#endif
/* search for binaries in the plug-in directory path */
datafiles_read_directories (plug_in_path, plug_in_init_file, MODE_EXECUTABLE);
......@@ -444,6 +452,7 @@ plug_in_kill ()
GSList *tmp;
PlugIn *plug_in;
#ifdef HAVE_SHM_H
#ifndef IPC_RMID_DEFERRED_RELEASE
if (shm_ID != -1)
{
......@@ -454,7 +463,8 @@ plug_in_kill ()
if (shm_ID != -1)
shmdt ((char*) shm_addr);
#endif
#endif
tmp = open_plug_ins;
while (tmp)
{
......
......@@ -25,12 +25,18 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#ifdef HAVE_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SHM_H
#include <sys/shm.h>
#endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
......@@ -292,6 +298,7 @@ plug_in_init ()
wire_set_writer (plug_in_write);
wire_set_flusher (plug_in_flush);
#ifdef HAVE_SHM_H
/* allocate a piece of shared memory for use in transporting tiles
* to plug-ins. if we can't allocate a piece of shared memory then
* we'll fall back on sending the data over the pipe.
......@@ -316,6 +323,7 @@ plug_in_init ()
#endif
}
}
#endif
/* search for binaries in the plug-in directory path */
datafiles_read_directories (plug_in_path, plug_in_init_file, MODE_EXECUTABLE);
......@@ -444,6 +452,7 @@ plug_in_kill ()
GSList *tmp;
PlugIn *plug_in;
#ifdef HAVE_SHM_H
#ifndef IPC_RMID_DEFERRED_RELEASE
if (shm_ID != -1)
{
......@@ -454,7 +463,8 @@ plug_in_kill ()
if (shm_ID != -1)
shmdt ((char*) shm_addr);
#endif
#endif
tmp = open_plug_ins;
while (tmp)
{
......
......@@ -25,12 +25,18 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#ifdef HAVE_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SHM_H
#include <sys/shm.h>
#endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
......@@ -292,6 +298,7 @@ plug_in_init ()
wire_set_writer (plug_in_write);
wire_set_flusher (plug_in_flush);
#ifdef HAVE_SHM_H
/* allocate a piece of shared memory for use in transporting tiles
* to plug-ins. if we can't allocate a piece of shared memory then
* we'll fall back on sending the data over the pipe.
......@@ -316,6 +323,7 @@ plug_in_init ()
#endif
}
}
#endif
/* search for binaries in the plug-in directory path */
datafiles_read_directories (plug_in_path, plug_in_init_file, MODE_EXECUTABLE);
......@@ -444,6 +452,7 @@ plug_in_kill ()
GSList *tmp;
PlugIn *plug_in;
#ifdef HAVE_SHM_H
#ifndef IPC_RMID_DEFERRED_RELEASE
if (shm_ID != -1)
{
......@@ -454,7 +463,8 @@ plug_in_kill ()
if (shm_ID != -1)
shmdt ((char*) shm_addr);
#endif
#endif
tmp = open_plug_ins;
while (tmp)
{
......
......@@ -25,12 +25,18 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#ifdef HAVE_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SHM_H
#include <sys/shm.h>
#endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
......@@ -292,6 +298,7 @@ plug_in_init ()
wire_set_writer (plug_in_write);
wire_set_flusher (plug_in_flush);
#ifdef HAVE_SHM_H
/* allocate a piece of shared memory for use in transporting tiles
* to plug-ins. if we can't allocate a piece of shared memory then
* we'll fall back on sending the data over the pipe.
......@@ -316,6 +323,7 @@ plug_in_init ()
#endif
}
}
#endif
/* search for binaries in the plug-in directory path */
datafiles_read_directories (plug_in_path, plug_in_init_file, MODE_EXECUTABLE);
......@@ -444,6 +452,7 @@ plug_in_kill ()
GSList *tmp;
PlugIn *plug_in;
#ifdef HAVE_SHM_H
#ifndef IPC_RMID_DEFERRED_RELEASE
if (shm_ID != -1)
{
......@@ -454,7 +463,8 @@ plug_in_kill ()
if (shm_ID != -1)
shmdt ((char*) shm_addr);
#endif
#endif
tmp = open_plug_ins;
while (tmp)
{
......
......@@ -25,12 +25,18 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#ifdef HAVE_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SHM_H
#include <sys/shm.h>
#endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
......@@ -292,6 +298,7 @@ plug_in_init ()
wire_set_writer (plug_in_write);
wire_set_flusher (plug_in_flush);
#ifdef HAVE_SHM_H
/* allocate a piece of shared memory for use in transporting tiles
* to plug-ins. if we can't allocate a piece of shared memory then
* we'll fall back on sending the data over the pipe.
......@@ -316,6 +323,7 @@ plug_in_init ()
#endif
}
}
#endif
/* search for binaries in the plug-in directory path */
datafiles_read_directories (plug_in_path, plug_in_init_file, MODE_EXECUTABLE);
......@@ -444,6 +452,7 @@ plug_in_kill ()
GSList *tmp;
PlugIn *plug_in;
#ifdef HAVE_SHM_H
#ifndef IPC_RMID_DEFERRED_RELEASE
if (shm_ID != -1)
{
......@@ -454,7 +463,8 @@ plug_in_kill ()
if (shm_ID != -1)
shmdt ((char*) shm_addr);
#endif
#endif
tmp = open_plug_ins;
while (tmp)
{
......
......@@ -25,12 +25,18 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#ifdef HAVE_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SHM_H
#include <sys/shm.h>
#endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
......@@ -292,6 +298,7 @@ plug_in_init ()
wire_set_writer (plug_in_write);
wire_set_flusher (plug_in_flush);
#ifdef HAVE_SHM_H
/* allocate a piece of shared memory for use in transporting tiles
* to plug-ins. if we can't allocate a piece of shared memory then
* we'll fall back on sending the data over the pipe.
......@@ -316,6 +323,7 @@ plug_in_init ()
#endif
}
}
#endif
/* search for binaries in the plug-in directory path */
datafiles_read_directories (plug_in_path, plug_in_init_file, MODE_EXECUTABLE);
......@@ -444,6 +452,7 @@ plug_in_kill ()
GSList *tmp;
PlugIn *plug_in;
#ifdef HAVE_SHM_H
#ifndef IPC_RMID_DEFERRED_RELEASE
if (shm_ID != -1)
{
......@@ -454,7 +463,8 @@ plug_in_kill ()
if (shm_ID != -1)
shmdt ((char*) shm_addr);
#endif
#endif
tmp = open_plug_ins;
while (tmp)
{
......
......@@ -25,12 +25,18 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#ifdef HAVE_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SHM_H
#include <sys/shm.h>
#endif
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
......@@ -292,6 +298,7 @@ plug_in_init ()
wire_set_writer (plug_in_write);
wire_set_flusher (plug_in_flush);
#ifdef HAVE_SHM_H
/* allocate a piece of shared memory for use in transporting tiles
* to plug-ins. if we can't allocate a piece of shared memory then
* we'll fall back on sending the data over the pipe.
......@@ -316,6 +323,7 @@ plug_in_init ()
#endif
}
}
#endif
/* search for binaries in the plug-in directory path */
datafiles_read_directories (plug_in_path, plug_in_init_file, MODE_EXECUTABLE);
......@@ -444,6 +452,7 @@ plug_in_kill ()
GSList *tmp;
PlugIn *plug_in;
#ifdef HAVE_SHM_H
#ifndef IPC_RMID_DEFERRED_RELEASE
if (shm_ID != -1)
{
......@@ -454,7 +463,8 @@ plug_in_kill ()
if (shm_ID != -1)
shmdt ((char*) shm_addr);
#endif
#endif
tmp = open_plug_ins;
while (tmp)
{
......
......@@ -25,12 +25,18 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#ifdef HAVE_IPC_H
#include <sys/ipc.h>
#endif