SOURCES: pgadmin3-m4.patch (NEW) - new

[arekm]

Author: arekm                        Date: Thu Dec  7 22:45:23 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new

---- Files affected:
SOURCES:
   pgadmin3-m4.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/pgadmin3-m4.patch
diff -u /dev/null SOURCES/pgadmin3-m4.patch:1.1
--- /dev/null	Thu Dec  7 23:45:23 2006
+++ SOURCES/pgadmin3-m4.patch	Thu Dec  7 23:45:17 2006
@@ -0,0 +1,56 @@
+diff -urN pgadmin3-1.6.1.org/acinclude.m4 pgadmin3-1.6.1/acinclude.m4
+--- pgadmin3-1.6.1.org/acinclude.m4	2006-11-30 11:48:45.000000000 +0100
++++ pgadmin3-1.6.1/acinclude.m4	2006-12-08 00:29:11.747864500 +0100
+@@ -47,34 +47,10 @@
+ ####################
+ AC_DEFUN([LOCATE_WXWIDGETS],
+ [
+-	AC_ARG_WITH(wx, [  --with-wx=DIR	   root directory for wxWidgets installation],
++	WX_HOME=/usr
++	AC_ARG_WITH(wx-config, [  --with-wx-config=FILE	wx-config file],
+ 	[
+-		if test "$withval" != no
+-		then
+-			WX_HOME="$withval"
+-						if test ! -f "${WX_HOME}/bin/wx-config"
+-						then
+-								AC_MSG_ERROR([Could not find your wxWidgets installation in ${WX_HOME}])
+-						fi
+-
+-		fi
+-		WX_CONFIG=${WX_HOME}/bin/wx-config
+-	], 
+-	[
+-		WX_HOME=/usr/local/wx2
+-		if test ! -f "${WX_HOME}/bin/wx-config"
+-		then
+-			WX_HOME=/usr/local
+-			if test ! -f "${WX_HOME}/bin/wx-config"
+-			then
+-				WX_HOME=/usr
+-				if test ! -f "${WX_HOME}/bin/wx-config"
+-				then
+-					AC_MSG_ERROR([Could not find your wxWidgets installation. You might need to use the --with-wx=DIR configure option])
+-				fi
+-			fi
+-		fi
+-		WX_CONFIG=${WX_HOME}/bin/wx-config
++		WX_CONFIG="$withval"
+ 	])
+ ])
+ 
+@@ -437,11 +413,11 @@
+ 			pgadmin3_LDADD=`${WX_CONFIG} ${WX_STATIC} --libs std,stc,ogl --unicode=yes --debug=yes --version=${WX_VERSION} 2> /dev/null`
+ 			pgagent_LDADD=`${WX_CONFIG} ${WX_STATIC} --libs base --unicode=yes --debug=yes --version=${WX_VERSION} 2> /dev/null`
+ 		else
+-			WX_NEW_CPPFLAGS=`${WX_CONFIG} --cppflags --unicode=yes --debug=no --version=${WX_VERSION} 2> /dev/null`
++			WX_NEW_CPPFLAGS=`${WX_CONFIG} --cppflags --unicode=yes --debug=no --version=${WX_VERSION}`
+ 			CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -O2"
+ 		
+-			pgadmin3_LDADD=`${WX_CONFIG} ${WX_STATIC} --libs std,stc,ogl --unicode=yes --debug=no --version=${WX_VERSION} 2> /dev/null`
+-			pgagent_LDADD=`${WX_CONFIG} ${WX_STATIC} --libs base --unicode=yes --debug=no --version=${WX_VERSION} 2> /dev/null`
++			pgadmin3_LDADD=`${WX_CONFIG} ${WX_STATIC} --libs std,stc,ogl --unicode=yes --debug=no --version=${WX_VERSION}`
++			pgagent_LDADD=`${WX_CONFIG} ${WX_STATIC} --libs base --unicode=yes --debug=no --version=${WX_VERSION}`
+ 		fi
+ 
+ 		AC_MSG_CHECKING(wxWidgets in ${WX_HOME})
================================================================