Thread: 1.4 Branch & pg_config

Hi

I just noted that the OSX-build of the 1.4 build is broken
due to the inclusion of the pg_dump-in-appbundle patch. The
patch assumes that PG_CONFIG is available inside pkg/mac/Makefile.am,
but the 1.4 buildsystem doesn't know about PG_CONFIG.

Would it be feasable to backport the postgres-specific
changes in the buildsystem to 1.4? If not, please apply
the attached patch. It's the most primitiv patch possible - it adds
AC_SUBST(LIBPQ_HOME) to acinclude.m4, and then hopes
that LIBPQ_HOME/bin/pg_{dump|restore} exists. It's not
pretty, but at least it makes building possible again ;-)

If you plan to backport the buildsystem-changes, then just
ignore this patch ;-)

greetings, Florian Pflug

Index: pkg/mac/Makefile.am
===================================================================
--- pkg/mac/Makefile.am    (revision 4765)
+++ pkg/mac/Makefile.am    (working copy)
@@ -24,7 +24,7 @@
     $(install_sh_DATA) "sql.icns" "$(bundledir)/Contents/Resources/sql.icns"
     $$($(WX_CONFIG) --rezflags | sed 's/-t[[:space:]]*APPL//') \
          "$(bundledir)/Contents/Resources/pgAdmin3.rsrc" -useDF
-    $(install_sh_PROGRAM) "$$($(PG_CONFIG) --bindir)/pg_dump" "$(bundledir)/Contents/SharedSupport/helper/pg_dump"
-    $(install_sh_PROGRAM) "$$($(PG_CONFIG) --bindir)/pg_restore"
"$(bundledir)/Contents/SharedSupport/helper/pg_restore"
+    $(install_sh_PROGRAM) "$(LIBPQ_HOME)/bin/pg_dump" "$(bundledir)/Contents/SharedSupport/helper/pg_dump"
+    $(install_sh_PROGRAM) "$(LIBPQ_HOME)/bin/pg_restore" "$(bundledir)/Contents/SharedSupport/helper/pg_restore"
     ./complete-bundle.sh "$(bundledir)"
 endif
Index: acinclude.m4
===================================================================
--- acinclude.m4    (revision 4765)
+++ acinclude.m4    (working copy)
@@ -164,6 +164,7 @@
         fi
     fi
 ])
+AC_SUBST(LIBPQ_HOME)

 #
 # Check for libpq libraries and headers

Backporting is definitely not on my list of things to do, so I've
applied the patch - thanks!

Regards, Dave.

> -----Original Message-----
> From: pgadmin-hackers-owner@postgresql.org
> [mailto:pgadmin-hackers-owner@postgresql.org] On Behalf Of
> Florian G. Pflug
> Sent: 30 November 2005 20:20
> To: pgadmin-hackers
> Subject: [pgadmin-hackers] 1.4 Branch & pg_config
>
> Hi
>
> I just noted that the OSX-build of the 1.4 build is broken
> due to the inclusion of the pg_dump-in-appbundle patch. The
> patch assumes that PG_CONFIG is available inside pkg/mac/Makefile.am,
> but the 1.4 buildsystem doesn't know about PG_CONFIG.
>
> Would it be feasable to backport the postgres-specific
> changes in the buildsystem to 1.4? If not, please apply
> the attached patch. It's the most primitiv patch possible - it adds
> AC_SUBST(LIBPQ_HOME) to acinclude.m4, and then hopes
> that LIBPQ_HOME/bin/pg_{dump|restore} exists. It's not
> pretty, but at least it makes building possible again ;-)
>
> If you plan to backport the buildsystem-changes, then just
> ignore this patch ;-)
>
> greetings, Florian Pflug
>
>