Changeset 296

Timestamp:

04/23/2005 04:51:16 PM (3 years ago)

Author:

moo

Message:

fix mysql -Iinclude path

Location:

trunk

Files:

• configure.in (modified) (2 diffs)
• src/Makefile.am (modified) (2 diffs)

trunk/configure.in

@@ -83 +83 @@
 dnl Checks for database.
 MYSQL_INCLUDE=""
+MYSQL_LIBS=""
 
 AC_PATH_PROG(MYSQLCONFIG, mysql_config)
@@ -97 +98 @@
       echo "--with-mysql=path-to-mysql_config"
     fi
-    MYSQL_INCLUDE="`$withval --cflags | sed s/\'//g`"
+    MYSQL_INCLUDE="`$withval --include | sed s/\'//g`"
     MYSQL_LIBS="`$withval --libs | sed s/\'//g`"
 

trunk/src/Makefile.am

@@ -75 +75 @@
 mod_mysql_vhost_la_SOURCES = mod_mysql_vhost.c
 mod_mysql_vhost_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+mod_mysql_vhost_la_CPPFLAGS = $(MYSQL_INCLUDE)
 mod_mysql_vhost_la_LIBADD = $(MYSQL_LIBS) $(common_libadd)
 
@@ -233 +234 @@
 lighttpd_LDADD = $(PCRE_LIB) $(DL_LIB) $(SENDFILE_LIB) $(ATTR_LIB) $(common_libadd) $(SSL_LIB)
 lighttpd_LDFLAGS = -export-dynamic
-lighttpd_CCPFLAGS = $(MYSQL_INCLUDES)
 
 array_SOURCES = array.c buffer.c data_string.c data_count.c