gnustep/libs-sqlclient
0
0
Fork 0
mirror of https://github.com/gnustep/libs-sqlclient.git synced 2025-02-19 01:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add patch to use config file environment variable

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@23716 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-10-02 14:36:53 +00:00
parent cbbde8719f
commit 2ff6ce9c1c
4 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2006-10-01 Graham J Lee <graham.lee@operatelecom.com>
* configure.ac: Fix to use GNUSTEP_CONFIG_FILE environment variable.
2006-09-14 Richard Frith-Macdonald <rfm@gnu.org> 2006-09-14 Richard Frith-Macdonald <rfm@gnu.org>
* JDBC push and pop local frames to avoid memory leaks. * JDBC push and pop local frames to avoid memory leaks.

11
JDBC.m
View file

@ -926,10 +926,21 @@ static int JDBCVARCHAR = 0;
/* Get the new connection object /* Get the new connection object
*/ */
#if 0
jo = (*env)->CallStaticObjectMethod(env, jc, jm, jo = (*env)->CallStaticObjectMethod(env, jc, jm,
JStringFromNSString(env, url), JStringFromNSString(env, url),
JStringFromNSString(env, [self user]), JStringFromNSString(env, [self user]),
JStringFromNSString(env, [self password])); JStringFromNSString(env, [self password]));
#else
jobject js1 = JStringFromNSString(env, url);
jobject js2 = JStringFromNSString(env, [self user]);
jobject js3 = JStringFromNSString(env, [self password]);
NSLog(@"CONNECT '%@', '%@', '%@'",
NSStringFromJString(env, js1),
NSStringFromJString(env, js2),
NSStringFromJString(env, js3));
jo = (*env)->CallStaticObjectMethod(env, jc, jm, js1, js2, js3);
#endif
if (jo == 0) if (jo == 0)
{ {
JExceptionClear (env); JExceptionClear (env);

5
configure vendored
View file

@ -1678,15 +1678,12 @@ echo "$as_me: error: You must have the gnustep-make package installed and set up
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
# Fetch basic path information from config file.
GNUSTEP_CONFIG_FILE=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'`
# This is for backwards compatibility with older gnustep releases, # This is for backwards compatibility with older gnustep releases,
# which have no GNUSTEP_CONFIG_FILE -- but it can be dropped in a year # which have no GNUSTEP_CONFIG_FILE -- but it can be dropped in a year
# or so ;-) -- NB: We could do better here, like checking the # or so ;-) -- NB: We could do better here, like checking the
# GNUSTEP_MAKE_VERSION or emitting a warning if no config file is # GNUSTEP_MAKE_VERSION or emitting a warning if no config file is
# found etc. # found etc.
if test -n "$GNUSTEP_CONFIG_FILE"; then if test -n "${GNUSTEP_CONFIG_FILE:=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'`}"; then
. "$GNUSTEP_CONFIG_FILE" . "$GNUSTEP_CONFIG_FILE"
fi fi

5
configure.ac
View file

@ -7,15 +7,12 @@ if test -z "$GNUSTEP_MAKEFILES"; then
AC_MSG_ERROR([You must have the gnustep-make package installed and set up the GNUSTEP_MAKEFILES environment variable to contain the path to the makefiles directory before configuring!]) AC_MSG_ERROR([You must have the gnustep-make package installed and set up the GNUSTEP_MAKEFILES environment variable to contain the path to the makefiles directory before configuring!])
fi fi
# Fetch basic path information from config file.
GNUSTEP_CONFIG_FILE=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'`
# This is for backwards compatibility with older gnustep releases, # This is for backwards compatibility with older gnustep releases,
# which have no GNUSTEP_CONFIG_FILE -- but it can be dropped in a year # which have no GNUSTEP_CONFIG_FILE -- but it can be dropped in a year
# or so ;-) -- NB: We could do better here, like checking the # or so ;-) -- NB: We could do better here, like checking the
# GNUSTEP_MAKE_VERSION or emitting a warning if no config file is # GNUSTEP_MAKE_VERSION or emitting a warning if no config file is
# found etc. # found etc.
if test -n "$GNUSTEP_CONFIG_FILE"; then if test -n "${GNUSTEP_CONFIG_FILE:=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'`}"; then
. "$GNUSTEP_CONFIG_FILE" . "$GNUSTEP_CONFIG_FILE"
fi fi