[Stdair-svn] SF.net SVN: stdair:[268] trunk/stdair/config/soci.m4

[<nbo...@us...>]

Revision: 268
          http://stdair.svn.sourceforge.net/stdair/?rev=268&view=rev
Author:   nbondoux
Date:     2010-08-13 18:55:13 +0000 (Fri, 13 Aug 2010)

Log Message:
-----------
Now automatically handle systems where SOCI headers are not 'buried'.

Modified Paths:
--------------
    trunk/stdair/config/soci.m4

Modified: trunk/stdair/config/soci.m4
===================================================================
--- trunk/stdair/config/soci.m4	2010-08-13 18:23:14 UTC (rev 267)
+++ trunk/stdair/config/soci.m4	2010-08-13 18:55:13 UTC (rev 268)
@@ -122,22 +122,41 @@
 #	esac
 
 
+	SOCI_areHeadersBuried=
+
 	#
-	# Look for Soci Core API headers
+	# Look for Soci Core API headers (case of buried headers)
 	#
 	AC_MSG_CHECKING([for Soci include directory])
 	SOCI_incdir=
 	for m in $SOCI_inc_check
 	do
-		if test -d "$m" && (test -f "$m/soci/core/soci.h" || test -f "$m/soci/soci.h")
+		if test -d "$m" && test -f "$m/soci/core/soci.h"
 		then
 			SOCI_incdir=$m
+			SOCI_areHeadersBuried=true
 			break
 		fi
 	done
 
+	#
+	# if Soci Code API headers not found, look for non-buried headers
+	#
+
 	if test -z "$SOCI_incdir"
 	then
+		for m in $SOCI_inc_check
+		do
+			if test -d "$m" && test -f "$m/soci.h"
+			then
+				SOCI_incdir=$m
+				break
+			fi
+		done
+	fi	
+
+	if test -z "$SOCI_incdir"
+	then
 		AC_MSG_ERROR([Didn't find the Soci include dir in '$SOCI_inc_check'])
 	fi
 
@@ -156,7 +175,15 @@
 	then
 		SOCI_LIBS="-L${SOCI_libdir}"
 	fi
-	SOCI_CFLAGS="-DSOCI_HEADERS_BURIED -DSOCI_MYSQL_HEADERS_BURIED ${MYSQL_CFLAGS} ${SOCI_CFLAGS}"
+	
+	if test "$SOCI_areHeadersBuried" = true
+	then
+		AC_MSG_RESULT(Soci headers are buried.)
+		SOCI_CFLAGS="-DSOCI_HEADERS_BURIED -DSOCI_MYSQL_HEADERS_BURIED ${SOCI_CFLAGS}"
+	fi
+
+        SOCI_CFLAGS="${MYSQL_CFLAGS} ${SOCI_CFLAGS}"
+
 	SOCI_LIBS="${MYSQL_LIBS} ${SOCI_LIBS} -l${SOCI_CORE_LIB} -l${SOCI_MYSQL_LIB} -ldl"
 	AC_SUBST(SOCI_CFLAGS)
 	AC_SUBST(SOCI_LIBS)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.