Log Message:
-----------
Clean up detection of lex/yacc as well as check for perl's location

Modified Files:
--------------
    slony1-engine:
        configure.ac (r1.38 -> r1.39)
        Makefile.global.in (r1.21 -> r1.22)
        aclocal.m4 (r1.6 -> r1.7)

Added Files:
-----------
    slony1-engine/config:
        perl.m4 (r1.1)

-------------- next part --------------
Index: Makefile.global.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile.global.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -LMakefile.global.in -LMakefile.global.in -u -w -r1.21 -r1.22
--- Makefile.global.in
+++ Makefile.global.in
@@ -55,6 +55,9 @@
 COLLATEINDEX = @COLLATEINDEX@
 PGAUTODOC = @PGAUTODOC@
 
+# support programs
+PERL=			@PERL@
+
 subdir=$(slony_subdir)
 
 override CPPFLAGS := -I${pgincludedir} -I${pgincludeserverdir} $(CPPFLAGS)
Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v
retrieving revision 1.38
retrieving revision 1.39
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.38 -r1.39
--- configure.ac
+++ configure.ac
@@ -58,9 +58,10 @@
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_LD
-AC_PROG_LEX
-AC_PROG_YACC
+PGAC_PATH_PERL
 AC_PATH_PROG(TAR, tar)
+AC_CHECK_PROGS(LEX, ['flex', 'lex'])
+AC_CHECK_PROGS(YACC, ['bison -y', 'yacc'])
 
 AC_SUBST(LD)
 AC_SUBST(CC)
@@ -68,8 +69,9 @@
 AC_SUBST(YFLAGS)
 AC_SUBST(LEXFLAGS)
 AC_SUBST(YFLAGS)
-
+AC_SUBST(SLONREL_VERSION)
 AC_SUBST(with_gnu_ld)
+AC_SUBST(PERL)
 
 SLON_AC_COMPILER()
 
Index: aclocal.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/aclocal.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -Laclocal.m4 -Laclocal.m4 -u -w -r1.6 -r1.7
--- aclocal.m4
+++ aclocal.m4
@@ -1,4 +1,5 @@
 m4_include([config/general.m4])
+m4_include([config/perl.m4])
 m4_include([config/libtool.m4])
 m4_include([config/compiler.m4])
 m4_include([config/acx_pthread.m4])
--- /dev/null
+++ config/perl.m4
@@ -0,0 +1,35 @@
+# $PostgreSQL: pgsql/config/perl.m4,v 1.3 2003/11/29 19:51:17 pgsql Exp $
+
+
+# PGAC_PATH_PERL
+# --------------
+AC_DEFUN([PGAC_PATH_PERL],
+[AC_PATH_PROG(PERL, perl)])
+
+
+# PGAC_CHECK_PERL_CONFIG(NAME)
+# ----------------------------
+AC_DEFUN([PGAC_CHECK_PERL_CONFIG],
+[AC_REQUIRE([PGAC_PATH_PERL])
+AC_MSG_CHECKING([for Perl $1])
+perl_$1=`$PERL -MConfig -e 'print $Config{$1}'`
+AC_SUBST(perl_$1)dnl
+AC_MSG_RESULT([$perl_$1])])
+
+
+# PGAC_CHECK_PERL_CONFIGS(NAMES)
+# ------------------------------
+AC_DEFUN([PGAC_CHECK_PERL_CONFIGS],
+[m4_foreach([pgac_item], [$1], [PGAC_CHECK_PERL_CONFIG(pgac_item)])])
+
+
+# PGAC_CHECK_PERL_EMBED_LDFLAGS
+# -----------------------------
+AC_DEFUN([PGAC_CHECK_PERL_EMBED_LDFLAGS],
+[AC_REQUIRE([PGAC_PATH_PERL])
+AC_MSG_CHECKING(for flags to link embedded Perl)
+pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+perl_embed_ldflags=`echo X"$pgac_tmp1" | sed "s/^X//;s%$pgac_tmp2%%"`
+AC_SUBST(perl_embed_ldflags)dnl
+AC_MSG_RESULT([$perl_embed_ldflags])])