diff options
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | ecpg.mk | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 2c38fdd..930d495 100644 --- a/configure.ac +++ b/configure.ac @@ -261,9 +261,6 @@ AS_IF([test "$with_default_basedb" == postgresql], AC_MSG_NOTICE([using PotgreSQL version $POSTGRESQL_VERSION]) AC_DEFINE([BASEDB_PGSQL]) - EMBEDDEDSQLEXT="pgc" - EMBEDDEDSQLOUT="cc" - BASEDB_CFLAGS=" $POSTGRESQL_CFLAGS" BASEDB_LIBS="$POSTGRESQL_LDFLAGS -lz -lecpg" LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS" @@ -274,7 +271,6 @@ AS_IF([test "$with_default_basedb" == postgresql], # TODO: change main to something sensible AC_CHECK_LIB([pq], [main], , [AC_MSG_FAILURE([Library not found! Please install...])]) AC_CHECK_LIB([pgtypes], [main], , [AC_MSG_FAILURE([Library not found! Please install...])]) - EMBEDDEDSQLPRECOMPILER="\$(ECPG)" BASEDBSTRING=pgsql ], [AC_MSG_ERROR([unsupported base DBMS: $with_default_basedb])]) @@ -347,9 +343,6 @@ AC_SUBST([rdmexecbindir], ["\${pkglibdir}/bin"]) # --------------- Makefile Substitutions -------------------------- #################################################################### -AC_SUBST(EMBEDDEDSQLPRECOMPILER) -AC_SUBST(EMBEDDEDSQLEXT) -AC_SUBST(EMBEDDEDSQLOUT) AC_SUBST(BASEDB_CPPFLAGS) AC_SUBST(BASEDB_LIBS) AC_SUBST(CLIENT_CPPFLAGS) @@ -1,8 +1,8 @@ # -*- Makefile -*- # ecpg.mk -SUFFIXES += .@EMBEDDEDSQLEXT@ .@EMBEDDEDSQLOUT@ +SUFFIXES += .pgc .cc -.@EMBEDDEDSQLEXT@.@EMBEDDEDSQLOUT@: +.pgc.cc: $(MKDIR_P) "$$(dirname "$@")" - cwd="$$PWD"; cd "$$(dirname "$<")" && $(EMBEDDEDSQLPRECOMPILER) -o "$$cwd/$@" "$$(basename "$<")" + cwd="$$PWD"; cd "$$(dirname "$<")" && $(ECPG) -o "$$cwd/$@" "$$(basename "$<")" |