Changeset 168 for trunk/configure.ac

Timestamp:

Mar 15, 2008, 10:02:21 PM (17 years ago)

Author:

katerina

Message:

Zlib autoconf macro, bugfix in sh_strings.c

File:

• trunk/configure.ac (modified) (6 diffs)

trunk/configure.ac

@@ -875 +875 @@
 if test x"${mytclient}" = x-DSH_STANDALONE -o x"${mytclient}" = x-DSH_WITH_CLIENT;
 then
+dnl For threaded modules
         ACX_PTHREAD
         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
@@ -880 +881 @@
         LDFLAGS="$PTHREAD_CFLAGS $LDFLAGS"
         CC="$PTHREAD_CC"
+dnl For MODI_TXT
+        CHECK_ZLIB()
 fi
         
@@ -969 +972 @@
         fi
         if test "x${withval}" = "xmysql"; then
+          if test "x$zlib_found" = "x"
+          then
+                CHECK_ZLIB()
+          fi
           AC_CHECK_PROG(HAVE_MYSQL_CONFIG, mysql_config, yes, no)
           if test "$HAVE_MYSQL_CONFIG" = "yes"; then
-                # echo "mysql_config found"
                 sh_mysql_libs="`mysql_config --libs`"
-                # echo ${sh_mysql_libs}
                 sh_mysql_libs="`eval echo ${sh_mysql_libs}`"
-                # echo $mysql_libs
-                # save_libs="$LIBS"
-                # LIBS="$LIBS `mysql_config --libs`"
-                # echo $LIBS
                 LIBS="$LIBS ${sh_mysql_libs}"
-                # echo $LIBS
                 sh_mysql_cflags="`mysql_config --cflags`"
                 sh_mysql_cflags="`eval echo ${sh_mysql_cflags}`"
-                # CFLAGS="$CFLAGS `mysql_config --cflags`"
-                # CFLAGS="$CFLAGS ${sh_mysql_cflags}"
                 CPPFLAGS="$CPPFLAGS ${sh_mysql_cflags}"
           else
-                AC_MSG_CHECKING(for MySQL in /usr /usr/local /usr/local/mysql MYSQL_HOME)
+                AC_MSG_CHECKING([for MySQL in /usr /usr/local /usr/local/mysql MYSQL_HOME])
                 mysql_directory="/usr /usr/local /usr/local/mysql ${MYSQL_HOME}"
 
@@ -1053 +1051 @@
           AC_DEFINE(WITH_MYSQL)
           AC_DEFINE(WITH_DATABASE)
-          AC_CHECK_LIB(z, inflateEnd, [zlib_cv_libz=yes], [zlib_cv_libz=no])
-          AC_MSG_CHECKING(for zlib)
-          if test "$zlib_cv_libz" = "yes"
+          if test "x$zlib_found" = "xyes"
           then
                 LIBS="$LIBS -lz -lm"
-                AC_MSG_RESULT(ok)
           else
-                AC_MSG_RESULT(failed)
                 echo
-                echo " Either the mysql or the zlib library was not found"
-                echo " or was unusable. Possible reasons include:"
+                
+                echo " Mysql library was not found or not useable."
+                echo " Possible reasons include:"
                 echo "  - an old, incompatible version compiled from source"
                 echo "  - on Solaris, libmysql is compiled with the Solaris"
@@ -1072 +1067 @@
                 echo " message from the compiler."
                 echo
-                echo " If your mysql and zlib libraries are installed in an"
+                echo " If your mysql libraries are installed in an"
                 echo " unusual place, use --with-libs=-L/path/to/libdirectory"
-                echo " where libdirectory is the directory holding libmysql"
-                echo " or libz."
+                echo " where libdirectory is the directory holding libmysql."
                 if test x"$enable_static" = xyes; then
                   echo " Note that for compiling a static binary, you need"
@@ -1081 +1075 @@
                 fi
                 echo
-                AC_MSG_ERROR([libmysql or zlib not found or unuseable]) 
+                AC_MSG_ERROR([libmysql not found or unuseable]) 
           fi
           AC_CHECK_HEADERS(mysql/mysql.h)