Skip site navigation (1) Skip section navigation (2)

SVN Commit by dpage: r4557 - trunk/pgadmin3

From: svn(at)pgadmin(dot)org
To: pgadmin-hackers(at)postgresql(dot)org
Subject: SVN Commit by dpage: r4557 - trunk/pgadmin3
Date: 2005-10-17 15:40:59
Message-ID: 200510171540.j9HFexYN003289@developer.pgadmin.org (view raw or flat)
Thread:
Lists: pgadmin-hackers
Author: dpage
Date: 2005-10-17 16:40:59 +0100 (Mon, 17 Oct 2005)
New Revision: 4557

Modified:
   trunk/pgadmin3/acinclude.m4
Log:
Make sure that --disable-xxx works as expected.


Modified: trunk/pgadmin3/acinclude.m4
===================================================================
--- trunk/pgadmin3/acinclude.m4	2005-10-17 15:08:11 UTC (rev 4556)
+++ trunk/pgadmin3/acinclude.m4	2005-10-17 15:40:59 UTC (rev 4557)
@@ -49,7 +49,14 @@
 AC_DEFUN([ENABLE_DEBUG],
 [AC_ARG_ENABLE(debug,
 [  --enable-debug       build a debug version of pgAdmin3],
-[pg_debug_build=yes],
+[
+if test "$enableval" = yes
+then
+	pg_debug_build=yes
+else
+	pg_debug_build=no
+fi
+],
 [pg_debug_build=no])
 ])
 AC_SUBST(pg_debug_build)
@@ -60,8 +67,16 @@
 AC_DEFUN([ENABLE_STATIC],
 [AC_ARG_ENABLE(static,
 [  --enable-static      build a statically linked version of pgAdmin3],
-[pg_static_build=yes
-WX_STATIC="--static=yes"],
+[
+if test "$enableval" = yes
+then
+    pg_static_build=yes
+    WX_STATIC="--static=yes"
+else
+    pg_static_build=no
+    WX_STATIC="--static=no"
+fi
+],
 [pg_static_build=no
 WX_STATIC="--static=no"])
 ])
@@ -72,12 +87,18 @@
 AC_DEFUN([ENABLE_APPBUNDLE],
 [AC_ARG_ENABLE(appbundle,
 [  --enable-appbundle   Build Mac OS X appbundle],
-[pg_appbundle=yes
-prefix=$(pwd)/tmp
-bundledir="$(pwd)/pgAdmin3.app"
-bindir="$bundledir/Contents/MacOS"
-datadir="$bundledir/Contents/SharedSupport"
-AC_SUBST(bundledir)
+[
+if test "$enableval" = yes
+then
+    pg_appbundle=yes
+    prefix=$(pwd)/tmp
+    bundledir="$(pwd)/pgAdmin3.app"
+    bindir="$bundledir/Contents/MacOS"
+    datadir="$bundledir/Contents/SharedSupport"
+    AC_SUBST(bundledir)
+else
+    pg_appbundle=no
+fi
 ],
 [pg_appbundle=no])
 ])
@@ -290,6 +311,11 @@
         WX_NEW_CONTRIB_LIBS=`${WX_CONFIG} ${WX_STATIC} --libs stc,ogl --debug=no`
         LIBS="$LIBS $WX_NEW_LIBS $WX_NEW_CONTRIB_LIBS"
 	fi
+	
+	if test "$WX_NEW_CPPFLAGS" = "" -o "$WX_NEW_LIBS" = "" -o "$WX_NEW_CONTRIB_LIBS" = ""
+	then
+	    AC_MSG_ERROR([the combination of static/shared and debug/non-debug options selected can not be supported by your wxWidgets installation.])
+	fi
 
     case "${host}" in
         *-apple-darwin*)


pgadmin-hackers by date

Next:From: Dave PageDate: 2005-10-17 16:12:13
Subject: Refresh Servers bug
Previous:From: svnDate: 2005-10-17 15:08:11
Subject: SVN Commit by dpage: r4556 - in trunk/pgadmin3: . src xtra/pgagent

Privacy Policy | About PostgreSQL
Copyright © 1996-2014 The PostgreSQL Global Development Group