Permalink
Browse files

- Make this work with newer autoconf and automake.

SVN Rev: 2281
  • Loading branch information...
1 parent ed75016 commit f311f5490b1077d3b636dafbe59d20fa971c830c @derickr derickr committed Feb 26, 2007
Showing with 5 additions and 40 deletions.
  1. +3 −36 debugclient/acinclude.m4
  2. +2 −4 debugclient/configure.in
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.2 2003-09-22 09:04:55 derick Exp $
+dnl $Id: acinclude.m4,v 1.3 2007-02-26 14:38:42 derick Exp $
dnl
dnl This file contains local autoconf functions.
dnl This source file is subject to version 1.0 of the Xdebug license,
@@ -16,7 +16,7 @@ dnl
dnl XDEBUG_MODULE_ADD(modulename [, static])
dnl
XDEBUG_STATIC_LDADD=""
-AC_DEFUN(XDEBUG_MODULE_ADD,[
+AC_DEFUN([XDEBUG_MODULE_ADD],[
XDEBUG_MODULES="$XDEBUG_MODULES $1"
if test a$2 != "a"; then
XDEBUG_STATIC_MODULES="$XDEBUG_STATIC_MODULES $1"
@@ -28,41 +28,8 @@ AC_DEFUN(XDEBUG_MODULE_ADD,[
dnl
dnl XDEBUG_HELP_SEPARATOR(text)
dnl
-AC_DEFUN(XDEBUG_HELP_SEPARATOR,[
+AC_DEFUN([XDEBUG_HELP_SEPARATOR],[
AC_ARG_ENABLE([],[
$1],[])
])
-dnl
-dnl XDEBUG_SSL_CHECK
-dnl
-AC_DEFUN(XDEBUG_SSL_CHECK,[
- AC_MSG_CHECKING([where the openssl is installed])
- AC_ARG_WITH(ssl-dir,
- [ --with-ssl-dir=<dir> Define the path to OpenSSL install location. [/usr/local] ],
- [
-
- test -f $withval/lib/libcrypto.so -o -f $withval/lib/libcrypto.a && XDEBUG_SSL_DIR="$withval"
- test -f $withval/include/openssl/des.h && INCLUDES="$INCLUDES -I$withval/include"
-
- if test -z "$XDEBUG_SSL_DIR"; then
- AC_MSG_ERROR([not found. Check the path given to --with-ssl-dir=<dir>])
- else
- AC_MSG_RESULT([$XDEBUG_SSL_DIR])
- fi
-
- ],[
-
- for i in /usr/local/ssl /usr/local /usr /usr/local/openssl; do
- test -f $i/lib/libcrypto.so -o -f $i/lib/libcrypto.a && XDEBUG_SSL_DIR="$i"
- test -f $i/include/openssl/des.h && INCLUDES="$INCLUDES -I$i/include"
- done
-
- if test -z "$XDEBUG_SSL_DIR"; then
- AC_MSG_RESULT([not found.])
- else
- AC_MSG_RESULT([$XDEBUG_SSL_DIR])
- fi
-
- ])
-])
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.5 2005-09-24 20:00:12 derick Exp $
+dnl $Id: configure.in,v 1.6 2007-02-26 14:38:42 derick Exp $
dnl
dnl Process this file with autoconf to produce a configure script.
dnl
@@ -200,9 +200,7 @@ AC_SUBST(INCLUDES)
dnl
dnl Output
dnl
-MAKES="Makefile"
-
-AC_OUTPUT([$MAKES], [], [
+AC_OUTPUT([Makefile], [], [
if test "\$CONFIG_FILES" = "$MAKES" || test -z "\$CONFIG_FILES"; then
REDO_ALL=yes
fi

0 comments on commit f311f54

Please sign in to comment.