SVN Commit by dpage: r4556 - in trunk/pgadmin3: . src xtra/pgagent

Author: dpage
Date: 2005-10-17 16:08:11 +0100 (Mon, 17 Oct 2005)
New Revision: 4556

Modified:
trunk/pgadmin3/BUGS.txt
trunk/pgadmin3/acinclude.m4
trunk/pgadmin3/configure.ac
trunk/pgadmin3/src/Makefile.am
trunk/pgadmin3/xtra/pgagent/Makefile.am
Log:
Cleanup *nix build in an attempt to fix the debug/non debug compile/link options which were far from right before.

Modified: trunk/pgadmin3/BUGS.txt
===================================================================
--- trunk/pgadmin3/BUGS.txt 2005-10-17 14:30:35 UTC (rev 4555)
+++ trunk/pgadmin3/BUGS.txt 2005-10-17 15:08:11 UTC (rev 4556)
@@ -23,6 +23,7 @@
</ul><br>
<b>Fixed issues</b>
<ul>
+ <li>DP 2005-10-17 [Unix build] --enable-debug tries to use wx-config which hasn't been found yet
<li>AP 2004-07-27 [all] suppressed public. prefix leads to modified objects in wrong schema if found in search_path
<li>DP 2004-09-18 [Object Tree] Dropped servers reappear when changing "display system objects" due to the disconnect/tree refresh.
<li>AP 2004-09-18 [Database property] db creation with owner fails
@@ -55,4 +56,4 @@
<li>AP 2003-05-04 [Schema Browser] OPERATOR CLASSES need work. Secondary (onclick) discovery SQL has an error.
<li>AP 2003-06-17 [Edit/Results Grids] Scrollbars often do not appear until the window is resized following data load.
<li>AP 2003-08-11 [Table Editor] Generates invalid SQL when table includes Foreign Key.
-</ul><br>
\ No newline at end of file
+</ul><br>

Modified: trunk/pgadmin3/acinclude.m4
===================================================================
--- trunk/pgadmin3/acinclude.m4 2005-10-17 14:30:35 UTC (rev 4555)
+++ trunk/pgadmin3/acinclude.m4 2005-10-17 15:08:11 UTC (rev 4556)
@@ -48,12 +48,8 @@
###########################
AC_DEFUN([ENABLE_DEBUG],
[AC_ARG_ENABLE(debug,
-[ --enable-debug build a debug version of pgAdmin3],
-[pg_debug_build=yes
-CLFAGS=`${WX_CONFIG} --cflags --debug`
-CFLAGS="$CFLAGS -Wall -g -O0"
-CPPFLAGS=`${WX_CONFIG} --cppflags --debug`
-CPPFLAGS="$CPPFLAGS -Wall -g -O0"],
+[ --enable-debug build a debug version of pgAdmin3],
+[pg_debug_build=yes],
[pg_debug_build=no])
])
AC_SUBST(pg_debug_build)
@@ -63,11 +59,11 @@
############################
AC_DEFUN([ENABLE_STATIC],
[AC_ARG_ENABLE(static,
-[ --enable-static build a static version of pgAdmin3],
+[ --enable-static build a statically linked version of pgAdmin3],
[pg_static_build=yes
-WX_STATIC="--static"],
+WX_STATIC="--static=yes"],
[pg_static_build=no
-WX_STATIC=""])
+WX_STATIC="--static=no"])
])

############################
@@ -75,7 +71,7 @@
############################
AC_DEFUN([ENABLE_APPBUNDLE],
[AC_ARG_ENABLE(appbundle,
-[ --enable-appbundle Build pgAdmin3.app],
+[ --enable-appbundle Build Mac OS X appbundle],
[pg_appbundle=yes
prefix=$(pwd)/tmp
bundledir="$(pwd)/pgAdmin3.app"
@@ -217,14 +213,14 @@
])

#####################################################################
-# WxWindows linking checks #
+# wxWidgets linking checks #
# This check should be specified last in configure.ac, since all of #
# the above checks affect this test in some way or another. #
#####################################################################
-AC_DEFUN([CHECK_WXWINDOWS],
-[AC_MSG_CHECKING(for wxWindows)
+AC_DEFUN([CHECK_WXWIDGETS],
+[AC_MSG_CHECKING(for wxWidgets)
AC_ARG_WITH(wx,
-[ --with-wx=DIR root directory for wxWindows installation],
+[ --with-wx=DIR root directory for wxWidgets installation],
[if test "$withval" != no
then
AC_MSG_RESULT(yes)
@@ -277,11 +273,24 @@
LDFLAGS="$LDFLAGS -L${WX_HOME}/lib"
WX_OLD_LDFLAGS="$LDFLAGS"
WX_OLD_CPPFLAGS="$CPPFLAGS"
- WX_NEW_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs`
- WX_NEW_CONTRIB_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs stc,ogl`
- LIBS="$LIBS $WX_NEW_LIBS $WX_NEW_CONTRIB_LIBS"
- WX_NEW_CPPFLAGS=`${WX_CONFIG} --cppflags`
- CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS"
+
+ if test "$pg_debug_build" == yes
+ then
+ WX_NEW_CPPFLAGS=`${WX_CONFIG} --cppflags --debug=yes`
+ CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -g -O0"
+
+ WX_NEW_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs --debug=yes`
+ WX_NEW_CONTRIB_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs stc,ogl --debug=yes`
+ LIBS="$LIBS $WX_NEW_LIBS $WX_NEW_CONTRIB_LIBS"
+ else
+ WX_NEW_CPPFLAGS=`${WX_CONFIG} --cppflags --debug=no`
+ CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -O2"
+
+ WX_NEW_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs --debug=no`
+ WX_NEW_CONTRIB_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs stc,ogl --debug=no`
+ LIBS="$LIBS $WX_NEW_LIBS $WX_NEW_CONTRIB_LIBS"
+ fi
+
case "${host}" in
*-apple-darwin*)
CPPFLAGS="$CPPFLAGS -no-cpp-precomp -fno-rtti"
@@ -293,5 +302,32 @@
;;
esac
fi
+
+# Print a configuration summary
+echo
+if test "$pg_debug_build" == yes
+then
+ echo "Building a debug version of pgAdmin: Yes"
+else
+ echo "Building a debug version of pgAdmin: No"
+fi
+if test "$pg_static_build" == yes
+then
+ echo "Statically linking pgAdmin: Yes"
+else
+ echo "Statically linking pgAdmin: No"
+fi
+if test "$pg_appbundle" == yes
+then
+ echo "Building a Mac OS X appbundle: Yes"
+else
+ echo "Building a Mac OS X appbundle: No"
+fi
+echo
+
+# CFLAGS/CXXFLAGS may well contain unwanted settings, so clear them.
+CFLAGS=""
+CXXFLAGS=""
+
])
AC_SUBST(WX_CONFIG)

Modified: trunk/pgadmin3/configure.ac
===================================================================
--- trunk/pgadmin3/configure.ac 2005-10-17 14:30:35 UTC (rev 4555)
+++ trunk/pgadmin3/configure.ac 2005-10-17 15:08:11 UTC (rev 4556)
@@ -37,11 +37,11 @@
ENABLE_DEBUG
ENABLE_STATIC
CHECK_PGSQL
-CHECK_WXWINDOWS
+CHECK_WXWIDGETS

AC_CONFIG_FILES([Makefile
i18n/Makefile
- src/Makefile
+ src/Makefile
pkg/Makefile
pkg/debian/Makefile
pkg/fc1/Makefile
@@ -50,7 +50,7 @@
pkg/redhat/Makefile
pkg/slackware/Makefile
pkg/src/Makefile
- pkg/suse/Makefile
+ pkg/suse/Makefile
pkg/win32/Makefile
xtra/Makefile
xtra/pgagent/Makefile

Modified: trunk/pgadmin3/src/Makefile.am
===================================================================
--- trunk/pgadmin3/src/Makefile.am 2005-10-17 14:30:35 UTC (rev 4555)
+++ trunk/pgadmin3/src/Makefile.am 2005-10-17 15:08:11 UTC (rev 4556)
@@ -153,9 +153,9 @@
if !APPBUNDLE

nobase_dist_pkgdata_DATA = $(TMP_ui)
-AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
-AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
+AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
+AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
+AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include

# Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
# for non-APPBUNDLE cases.
@@ -164,9 +164,9 @@
else

nobase_dist_data_DATA = $(TMP_ui)
-AM_CXXFLAGS = -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
-AM_CPPFLAGS = -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
-AM_CFLAGS = -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
+AM_CXXFLAGS = -Wall -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
+AM_CPPFLAGS = -Wall -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
+AM_CFLAGS = -Wall -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
install-exec-hook:
cd $(bindir) ;\
mv pgadmin3 tmp ;\

Modified: trunk/pgadmin3/xtra/pgagent/Makefile.am
===================================================================
--- trunk/pgadmin3/xtra/pgagent/Makefile.am 2005-10-17 14:30:35 UTC (rev 4555)
+++ trunk/pgadmin3/xtra/pgagent/Makefile.am 2005-10-17 15:08:11 UTC (rev 4556)
@@ -33,9 +33,9 @@

if !APPBUNDLE

-AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(srcdir)/include
-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(srcdir)/include
-AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(srcdir)/include
+AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(srcdir)/include
+AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(srcdir)/include
+AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(srcdir)/include

# Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
# for non-APPBUNDLE cases.
@@ -43,9 +43,9 @@

else

-AM_CXXFLAGS = -Wall -g -I$(srcdir)/include
-AM_CPPFLAGS = -Wall -g -I$(srcdir)/include
-AM_CFLAGS = -Wall -g -I$(srcdir)/include
+AM_CXXFLAGS = -Wall -I$(srcdir)/include
+AM_CPPFLAGS = -Wall -I$(srcdir)/include
+AM_CFLAGS = -Wall -I$(srcdir)/include
install-exec-hook:
cd $(bindir) ;\
mv pgagent tmp ;\