Retry: aclocal.m4 mysql + pgsql config patch

"Shay Harding" <sharding-YCNXYxaMkU/[email protected]> Thu, 27 Feb 2003 09:03:54 -0700

Newsgroups	gmane.comp.lang.moto.devel
Organization	CCBill
Message-ID	<003a01c2de79$d3b29360$7500000a@ccbill22ms668m>

Ok, really here is the patch this time... at least Cory assures me it is :)


> -----Original Message-----
> From: Shay Harding [mailto:sharding-YCNXYxaMkU/[email protected]] 
> Sent: Wednesday, February 26, 2003 4:30 PM
> To: Moto Devel ([email protected])
> Subject: FW: aclocal.m4 mysql + pgsql config patch
> 
> 
> That's weird... the attachment didn't send... resending...
> 
> > -----Original Message-----
> > From: Shay Harding [mailto:sharding-YCNXYxaMkU/[email protected]]
> > Sent: Wednesday, February 26, 2003 4:28 PM
> > To: Moto Devel ([email protected])
> > Subject: aclocal.m4 mysql + pgsql config patch
> > 
> > 
> > I thought the postgres part of this was going to take longer.
> > Here is a cumulative patch for both MySQL and PGSQL config. 
> > You can ignore the last email I sent with only the MySQL patch.
> > 
> > It works on my Mandrake machine, but need it tested on others.
> > 
> > 
> > Shay

---
Outgoing mail is certified Virus Free.
Checked by AVG anti-virus system (http://www.grisoft.com).
Version: 6.0.456 / Virus Database: 256 - Release Date: 2/18/2003

aclocal.m4.patch (application/octet-stream, 2.2 KB)

Index: aclocal.m4
===================================================================
RCS file: /usr/local/repositories/moto_repository/moto/aclocal.m4,v
retrieving revision 1.25
diff -c -r1.25 aclocal.m4
*** aclocal.m4	2002/10/21 05:20:30	1.25
--- aclocal.m4	2003/02/26 23:20:57
***************
*** 159,165 ****
  		MYSQL_ROOT_DIR=$withval
  		MYSQL_INCLUDE_DIR=$MYSQL_ROOT_DIR/include/mysql
  		MYSQL_LIBRARY_DIR=$MYSQL_ROOT_DIR/lib/mysql
! 	else [  
  		AC_CANONICAL_HOST
                  case "$host" in
                  *linux*)
--- 159,174 ----
  		MYSQL_ROOT_DIR=$withval
  		MYSQL_INCLUDE_DIR=$MYSQL_ROOT_DIR/include/mysql
  		MYSQL_LIBRARY_DIR=$MYSQL_ROOT_DIR/lib/mysql
! 	else [ 
! 
!       MYSQL_CONFIG=`which mysql_config`
!       MYSQL_INCLUDE_DIR=`$MYSQL_CONFIG --cflags|sed -e "s/-I'\(.*\)'/\1/g"`
!       MYSQL_LIBRARY_DIR=`$MYSQL_CONFIG --libs|sed -e "s/-L'\(.*\)' .*/\1/g"`
!       MYSQL_ROOT_DIR=`echo -n $MYSQL_INCLUDE_DIR|sed -e "s/\/include\/mysql//"`
! 
!    if [ test -d "$MYSQL_LIBRARY_DIR" && test -d "$MYSQL_INCLUDE_DIR" ]; then
!       echo -n ""
!    else
  		AC_CANONICAL_HOST
                  case "$host" in
                  *linux*)
***************
*** 184,189 ****
--- 193,199 ----
                          	MYSQL_LIBRARY_DIR=/usr/local/mysql/lib ;
  			fi ;
                  esac
+    fi
  	] fi
  
          if (test -d "$MYSQL_ROOT_DIR" || test "$withval" != "yes") &&
***************
*** 235,240 ****
--- 245,259 ----
  		PGSQL_INCLUDE_DIR=$PGSQL_ROOT_DIR/include
  		PGSQL_LIBRARY_DIR=$PGSQL_ROOT_DIR/lib
  	else [  
+ 
+       PGSQL_CONFIG=`which pg_config`
+       PGSQL_INCLUDE_DIR=`$PGSQL_CONFIG --includedir`
+       PGSQL_LIBRARY_DIR=`$PGSQL_CONFIG --libdir`
+       PGSQL_ROOT_DIR=`$PGSQL_CONFIG --configure|sed -e "s/.*prefix=\(.*\) .*/\1/"`
+ 
+    if [ test -d "$PGSQL_LIBRARY_DIR" && test -d "$PGSQL_INCLUDE_DIR" ]; then
+       echo -n ""
+    else
  		AC_CANONICAL_HOST
                  case "$host" in
                  *linux*)
***************
*** 251,256 ****
--- 270,276 ----
  			PGSQL_INCLUDE_DIR=/usr/local/pgsql/include ;
  			PGSQL_LIBRARY_DIR=/usr/local/pgsql/lib ;
                  esac
+    fi
  	] fi
  
          if (test -d "$PGSQL_ROOT_DIR" || test "$withval" != "yes") &&