SVN Commit by dpage: r4222 - trunk/pgadmin3

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

SVN Commit by dpage: r4222 - trunk/pgadmin3

SVN-13
Author: dpage
Date: 2005-05-20 09:34:11 +0100 (Fri, 20 May 2005)
New Revision: 4222

Modified:
   trunk/pgadmin3/acinclude.m4
Log:
Fix static build.
[Rapha?\195?\171l Enrici]

Modified: trunk/pgadmin3/acinclude.m4
===================================================================
--- trunk/pgadmin3/acinclude.m4 2005-05-20 08:29:57 UTC (rev 4221)
+++ trunk/pgadmin3/acinclude.m4 2005-05-20 08:34:11 UTC (rev 4222)
@@ -59,6 +59,18 @@
 AC_SUBST(pg_debug_build)
 
 ############################
+# Static build of pgAdmin3 #
+############################
+AC_DEFUN([ENABLE_STATIC],
+[AC_ARG_ENABLE(static,
+[ --enable-static      build a static version of pgAdmin3],
+[pg_static_build=yes
+WX_STATIC="--static"],
+[pg_static_build=no
+WX_STATIC=""])
+])
+
+############################
 # Build an pgAdmin III.app  #
 ############################
 AC_DEFUN([ENABLE_APPBUNDLE],
@@ -255,8 +267,8 @@
     LDFLAGS="$LDFLAGS -L${WX_HOME}/lib"
     WX_OLD_LDFLAGS="$LDFLAGS"
     WX_OLD_CPPFLAGS="$CPPFLAGS"
-    WX_NEW_LIBS=`${WX_CONFIG} --libs`
-    WX_NEW_CONTRIB_LIBS=`${WX_CONFIG} --libs stc,ogl`
+    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"


---------------------------(end of broadcast)---------------------------
TIP 9: the planner will ignore your desire to choose an index scan if your
      joining column's datatypes do not match