mirror of
https://github.com/gnustep/libs-gdl2.git
synced 2025-04-22 21:00:44 +00:00
* EOAdaptors/Postgres95/Makefile.preamble: Add link flags
for Darwin.
* EOAdaptors/Postgres95/LoginPanel/GNUmakefile: Ditto.
* EOAdaptors/Postgres95/LoginPanel/Postgres95LoginPanel.m:
Include GNUstep headers for non-*-gnu-* configurations.
* config/postgres.m4: Generalize test for PostgreSQL.
* configure: Regenerated.
* Makefile.postamble: Remove autom4te.cache on distclean.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@19117 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ayers
parent
594b18317b
commit
fa17714b07
7 changed files with 118 additions and 43 deletions
12
ChangeLog
12
ChangeLog
|
|
@ -1,5 +1,17 @@
|
|||
2004-04-15 David Ayers <d.ayers@inode.at>
|
||||
|
||||
* EOAdaptors/Postgres95/Makefile.preamble: Add link flags
|
||||
for Darwin.
|
||||
* EOAdaptors/Postgres95/LoginPanel/GNUmakefile: Ditto.
|
||||
|
||||
* EOAdaptors/Postgres95/LoginPanel/Postgres95LoginPanel.m:
|
||||
Include GNUstep headers for non-*-gnu-* configurations.
|
||||
|
||||
* config/postgres.m4: Generalize test for PostgreSQL.
|
||||
* configure: Regenerated.
|
||||
|
||||
* Makefile.postamble: Remove autom4te.cache on distclean.
|
||||
|
||||
* TODO: Start tracking major TODO's until formal auditing is
|
||||
available.
|
||||
|
||||
|
|
|
|||
|
|
@ -26,9 +26,20 @@
|
|||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
BUNDLE_NAME=LoginPanel
|
||||
|
||||
LoginPanel_OBJC_FILES = Postgres95LoginPanel.m
|
||||
LoginPanel_PRINCIPAL_CLASS = Postgres95LoginPanel
|
||||
ADDITIONAL_INCLUDE_DIRS = -I.. -I../../..
|
||||
|
||||
LoginPanel_INCLUDE_DIRS = -I.. -I../../..
|
||||
LoginPanel_LIB_DIRS = \
|
||||
-L../../../EOControl/$(GNUSTEP_OBJ_DIR) \
|
||||
-L../../../EOAccess/$(GNUSTEP_OBJ_DIR)
|
||||
LoginPanel_OBJC_LIBS = -lgnustep-db2control -lgnustep-db2
|
||||
|
||||
ifneq ($(FOUNDATION_LIB),gnu)
|
||||
LoginPanel_OBJC_LIBS += -lgnustep-baseadd
|
||||
endif
|
||||
|
||||
LoginPanel_COPY_INTO_DIR = ../Postgres95EOAdaptor.framework/Resources
|
||||
|
||||
include ../config.mak
|
||||
|
|
|
|||
|
|
@ -27,6 +27,12 @@
|
|||
#include <Foundation/Foundation.h>
|
||||
#include <AppKit/AppKit.h>
|
||||
#include <EOAccess/EOAccess.h>
|
||||
|
||||
#ifndef GNUSTEP
|
||||
#include <GNUstepBase/GNUstep.h>
|
||||
#include <GNUstepBase/GSCategories.h>
|
||||
#endif
|
||||
|
||||
#include "Postgres95LoginPanel.h"
|
||||
|
||||
static BOOL insideModalLoop;
|
||||
|
|
|
|||
|
|
@ -49,11 +49,16 @@ ADDITIONAL_INCLUDE_DIRS += \
|
|||
-I../../EOControl/$(GNUSTEP_TARGET_DIR) \
|
||||
-I../..
|
||||
|
||||
# Libraries linked to the framework
|
||||
LIBRARIES_DEPEND_UPON +=
|
||||
|
||||
# Additional library directories the linker should search
|
||||
ADDITIONAL_LIB_DIRS +=
|
||||
ADDITIONAL_LIB_DIRS += \
|
||||
-L../../EOControl/$(GNUSTEP_OBJ_DIR) \
|
||||
-L../../EOAccess/$(GNUSTEP_OBJ_DIR)
|
||||
|
||||
# Libraries linked to the framework
|
||||
LIBRARIES_DEPEND_UPON += -lgnustep-db2control -lgnustep-db2
|
||||
ifneq ($(FOUNDATION_LIB),gnu)
|
||||
LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
|
||||
endif
|
||||
|
||||
#
|
||||
# Flags dealing with installing and uninstalling
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@ after-uninstall::
|
|||
after-distclean::
|
||||
rm -rf config.cache config.log config.status
|
||||
rm -rf config.h gdl2.make
|
||||
rm -rf autom4te.cache
|
||||
|
||||
# Things to do before checking
|
||||
# before-check::
|
||||
|
|
|
|||
|
|
@ -1,31 +1,32 @@
|
|||
dnl AM_PATH_PGSQL([, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
|
||||
AC_DEFUN(AM_PATH_PGSQL,[
|
||||
AC_ARG_WITH(pgsql-include,
|
||||
[ --with-pgsql-include=PATH include path for postgres headers],
|
||||
pgsql_incdir="$withval", pgsql_incdir="no")
|
||||
AC_ARG_WITH(pgsql-include,
|
||||
[ --with-pgsql-include=PATH include path for postgres headers],
|
||||
pgsql_incdir="$withval", pgsql_incdir=)
|
||||
|
||||
AC_ARG_WITH(pgsql-library,
|
||||
[ --with-pgsql-library=PATH library path for pgsql libraries],
|
||||
pgsql_libdir="$withval", pgsql_libdir="no")
|
||||
AC_ARG_WITH(pgsql-library,
|
||||
[ --with-pgsql-library=PATH library path for pgsql libraries],
|
||||
pgsql_libdir="$withval", pgsql_libdir=)
|
||||
|
||||
cppflags_temp="$CPPFLAGS"
|
||||
libs_temp=$LIBS
|
||||
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/usr/local/pgsql/include \
|
||||
-I/usr/include/pgsql -I/usr/include/postgresql"
|
||||
LIBS="$LIBS -L/usr/local/lib -L/usr/local/pgsql/lib -L/usr/pgsql/lib"
|
||||
AC_CHECK_PROG(PG_CONFIG, pg_config, yes, no)
|
||||
|
||||
if test "$pgsql_incdir" != "no"; then
|
||||
CPPFLAGS="$CPPFLAGS -I$pgsql_incdir"
|
||||
fi
|
||||
if test "$pgsql_libdir" != "no"; then
|
||||
LIBS="$LIBS -L$pgsql_libdir"
|
||||
if test $PG_CONFIG = "yes" ; then
|
||||
if test -z "$pgsql_incdir" ; then
|
||||
pgsql_incdir=`pg_config --includedir`
|
||||
fi
|
||||
if test -z "$pgsql_libdir" ; then
|
||||
pgsql_libdir=`pg_config --libdir`
|
||||
fi
|
||||
fi
|
||||
|
||||
CPPFLAGS="-I$pgsql_incdir $CPPFLAGS"
|
||||
LIBS="-L$pgsql_libdir $LIBS"
|
||||
|
||||
POSTGRES_DATABASE="no"
|
||||
|
||||
AC_MSG_CHECKING(for PostgreSQL database)
|
||||
|
||||
AC_CHECK_HEADERS(libpq-fe.h)
|
||||
if test $ac_cv_header_libpq_fe_h = yes; then
|
||||
AC_CHECK_LIB(pq, main, pgsql_ok=yes, pgsql_ok=no)
|
||||
|
|
@ -35,13 +36,14 @@ AC_ARG_WITH(pgsql-library,
|
|||
POSTGRES_LIB_DIRS="$LIBS"
|
||||
POSTGRES_LIBS="-lpq"
|
||||
POSTGRES_DATABASE="yes"
|
||||
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$1], , :, [$1])
|
||||
fi
|
||||
fi
|
||||
|
||||
if test $POSTGRES_DATABASE = no; then
|
||||
AC_MSG_CHECKING(for PostgreSQL database)
|
||||
if test $POSTGRES_DATABASE = yes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$1], , :, [$1])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
ifelse([$2], , :, [$2])
|
||||
fi
|
||||
|
|
|
|||
74
configure
vendored
74
configure
vendored
|
|
@ -2360,7 +2360,7 @@ if test "${with_pgsql_include+set}" = set; then
|
|||
withval="$with_pgsql_include"
|
||||
pgsql_incdir="$withval"
|
||||
else
|
||||
pgsql_incdir="no"
|
||||
pgsql_incdir=
|
||||
fi;
|
||||
|
||||
|
||||
|
|
@ -2369,28 +2369,63 @@ if test "${with_pgsql_library+set}" = set; then
|
|||
withval="$with_pgsql_library"
|
||||
pgsql_libdir="$withval"
|
||||
else
|
||||
pgsql_libdir="no"
|
||||
pgsql_libdir=
|
||||
fi;
|
||||
|
||||
cppflags_temp="$CPPFLAGS"
|
||||
libs_temp=$LIBS
|
||||
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/usr/local/pgsql/include \
|
||||
-I/usr/include/pgsql -I/usr/include/postgresql"
|
||||
LIBS="$LIBS -L/usr/local/lib -L/usr/local/pgsql/lib -L/usr/pgsql/lib"
|
||||
# Extract the first word of "pg_config", so it can be a program name with args.
|
||||
set dummy pg_config; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_PG_CONFIG+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$PG_CONFIG"; then
|
||||
ac_cv_prog_PG_CONFIG="$PG_CONFIG" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_PG_CONFIG="yes"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
if test "$pgsql_incdir" != "no"; then
|
||||
CPPFLAGS="$CPPFLAGS -I$pgsql_incdir"
|
||||
fi
|
||||
if test "$pgsql_libdir" != "no"; then
|
||||
LIBS="$LIBS -L$pgsql_libdir"
|
||||
test -z "$ac_cv_prog_PG_CONFIG" && ac_cv_prog_PG_CONFIG="no"
|
||||
fi
|
||||
fi
|
||||
PG_CONFIG=$ac_cv_prog_PG_CONFIG
|
||||
if test -n "$PG_CONFIG"; then
|
||||
echo "$as_me:$LINENO: result: $PG_CONFIG" >&5
|
||||
echo "${ECHO_T}$PG_CONFIG" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
|
||||
if test $PG_CONFIG = "yes" ; then
|
||||
if test -z "$pgsql_incdir" ; then
|
||||
pgsql_incdir=`pg_config --includedir`
|
||||
fi
|
||||
if test -z "$pgsql_libdir" ; then
|
||||
pgsql_libdir=`pg_config --libdir`
|
||||
fi
|
||||
fi
|
||||
|
||||
CPPFLAGS="-I$pgsql_incdir $CPPFLAGS"
|
||||
LIBS="-L$pgsql_libdir $LIBS"
|
||||
|
||||
POSTGRES_DATABASE="no"
|
||||
|
||||
echo "$as_me:$LINENO: checking for PostgreSQL database" >&5
|
||||
echo $ECHO_N "checking for PostgreSQL database... $ECHO_C" >&6
|
||||
|
||||
|
||||
for ac_header in libpq-fe.h
|
||||
do
|
||||
|
|
@ -2567,14 +2602,16 @@ fi
|
|||
POSTGRES_LIB_DIRS="$LIBS"
|
||||
POSTGRES_LIBS="-lpq"
|
||||
POSTGRES_DATABASE="yes"
|
||||
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
enable_pgsql=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test $POSTGRES_DATABASE = no; then
|
||||
echo "$as_me:$LINENO: checking for PostgreSQL database" >&5
|
||||
echo $ECHO_N "checking for PostgreSQL database... $ECHO_C" >&6
|
||||
if test $POSTGRES_DATABASE = yes; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
enable_pgsql=yes
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
enable_pgsql=no
|
||||
|
|
@ -3178,6 +3215,7 @@ s,@ECHO_C@,$ECHO_C,;t t
|
|||
s,@ECHO_N@,$ECHO_N,;t t
|
||||
s,@ECHO_T@,$ECHO_T,;t t
|
||||
s,@LIBS@,$LIBS,;t t
|
||||
s,@PG_CONFIG@,$PG_CONFIG,;t t
|
||||
s,@CC@,$CC,;t t
|
||||
s,@CFLAGS@,$CFLAGS,;t t
|
||||
s,@LDFLAGS@,$LDFLAGS,;t t
|
||||
|
|
|
|||
Loading…
Reference in a new issue