SVN Commit by dpage: r4740 - trunk/pgadmin3

Author: dpage
Date: 2005-11-11 21:35:39 +0000 (Fri, 11 Nov 2005)
New Revision: 4740

Added:
trunk/pgadmin3/configure.ac.in
Removed:
trunk/pgadmin3/configure.ac
Modified:
trunk/pgadmin3/bootstrap
Log:
Write the version number into configure.ac at bootstrap from version.h.

Modified: trunk/pgadmin3/bootstrap
===================================================================
--- trunk/pgadmin3/bootstrap 2005-11-11 21:25:05 UTC (rev 4739)
+++ trunk/pgadmin3/bootstrap 2005-11-11 21:35:39 UTC (rev 4740)
@@ -8,6 +8,10 @@
#
#######################################################################

+# Create configure.ac
+VERSION=`grep '#define VERSION_PACKAGE' src/include/version.h | awk '{print $3}'`
+sed "s/PGADMIN_VERSION/$VERSION/" configure.ac.in > configure.ac
+
set -x
if ! ([ -x config ]); then
mkdir config

Deleted: trunk/pgadmin3/configure.ac
===================================================================
--- trunk/pgadmin3/configure.ac 2005-11-11 21:25:05 UTC (rev 4739)
+++ trunk/pgadmin3/configure.ac 2005-11-11 21:35:39 UTC (rev 4740)
@@ -1,65 +0,0 @@
-AC_PREREQ(2.57)
-AC_REVISION($Revision$)
-AC_COPYRIGHT(Copyright 2002 - 2005 The pgAdmin Development Team)
-AC_INIT(pgadmin3, 1.5.0, pgadmin-support(at)postgresql(dot)org)
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_SRCDIR([src/pgAdmin3.cpp])
-AM_CONFIG_HEADER([config.h])
-AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([tar-ustar])
-AC_PREFIX_DEFAULT([/usr/local/pgadmin3])
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_CXX
-
-# Checks for libraries.
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h stdlib.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-
-# Checks for library functions.
-AC_FUNC_STRTOD
-AC_CHECK_FUNCS([gethostbyname inet_ntoa memmove memset strchr])
-
-# Custom checks
-ENABLE_DEBUG
-ENABLE_STATIC
-ENABLE_APPBUNDLE
-AM_CONDITIONAL([APPBUNDLE], [test x$BUILD_APPBUNDLE = xyes])
-
-LOCATE_POSTGRESQL
-SETUP_POSTGRESQL
-
-SET_WX_VERSION
-LOCATE_WXWIDGETS
-SETUP_WXWIDGETS
-
-CLEANUP
-
-AC_CONFIG_FILES([Makefile
- i18n/Makefile
- src/Makefile
- pkg/Makefile
- pkg/debian/Makefile
- pkg/fc1/Makefile
- pkg/mac/Makefile
- pkg/mandrake/Makefile
- pkg/redhat/Makefile
- pkg/slackware/Makefile
- pkg/src/Makefile
- pkg/suse/Makefile
- pkg/win32/Makefile
- xtra/Makefile
- xtra/pgagent/Makefile
- xtra/pgagent/pgaevent/Makefile])
-AC_OUTPUT
-
-SUMMARY

Added: trunk/pgadmin3/configure.ac.in
===================================================================
--- trunk/pgadmin3/configure.ac.in 2005-11-11 21:25:05 UTC (rev 4739)
+++ trunk/pgadmin3/configure.ac.in 2005-11-11 21:35:39 UTC (rev 4740)
@@ -0,0 +1,65 @@
+AC_PREREQ(2.57)
+AC_REVISION($Revision: 4719 $)
+AC_COPYRIGHT(Copyright 2002 - 2005 The pgAdmin Development Team)
+AC_INIT(pgadmin3, PGADMIN_VERSION, pgadmin-support(at)postgresql(dot)org)
+AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_SRCDIR([src/pgAdmin3.cpp])
+AM_CONFIG_HEADER([config.h])
+AC_CANONICAL_HOST
+AM_INIT_AUTOMAKE([tar-ustar])
+AC_PREFIX_DEFAULT([/usr/local/pgadmin3])
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_CXX
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h stdlib.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_TYPE_SIZE_T
+AC_HEADER_TIME
+
+# Checks for library functions.
+AC_FUNC_STRTOD
+AC_CHECK_FUNCS([gethostbyname inet_ntoa memmove memset strchr])
+
+# Custom checks
+ENABLE_DEBUG
+ENABLE_STATIC
+ENABLE_APPBUNDLE
+AM_CONDITIONAL([APPBUNDLE], [test x$BUILD_APPBUNDLE = xyes])
+
+LOCATE_POSTGRESQL
+SETUP_POSTGRESQL
+
+SET_WX_VERSION
+LOCATE_WXWIDGETS
+SETUP_WXWIDGETS
+
+CLEANUP
+
+AC_CONFIG_FILES([Makefile
+ i18n/Makefile
+ src/Makefile
+ pkg/Makefile
+ pkg/debian/Makefile
+ pkg/fc1/Makefile
+ pkg/mac/Makefile
+ pkg/mandrake/Makefile
+ pkg/redhat/Makefile
+ pkg/slackware/Makefile
+ pkg/src/Makefile
+ pkg/suse/Makefile
+ pkg/win32/Makefile
+ xtra/Makefile
+ xtra/pgagent/Makefile
+ xtra/pgagent/pgaevent/Makefile])
+AC_OUTPUT
+
+SUMMARY