summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rwxr-xr-xsource3/configure32
-rwxr-xr-xsource3/configure.developer2
-rw-r--r--source3/configure.in2
-rw-r--r--source3/include/config.h.in3
-rw-r--r--source3/include/includes.h4
5 files changed, 10 insertions, 33 deletions
diff --git a/source3/configure b/source3/configure
index f3a7b5bce4..57633fbafe 100755
--- a/source3/configure
+++ b/source3/configure
@@ -45,8 +45,6 @@ ac_help="$ac_help
--with-ssl Include SSL support
--without-ssl Don't include SSL support (default)"
ac_help="$ac_help
- --with-sslinc=DIR Tells us where the SSL stuff is (default /usr/local/ssl)"
-ac_help="$ac_help
--with-mmap Include experimental MMAP support
--without-mmap Don't include MMAP support (default)"
ac_help="$ac_help
@@ -1933,7 +1931,7 @@ else
fi
done
-for ac_hdr in sys/acl.h sys/cdefs.h glob.h
+for ac_hdr in sys/acl.h sys/cdefs.h glob.h mysql.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -8282,34 +8280,6 @@ if test "${with_ssl+set}" = set; then
#define WITH_SSL 1
EOF
- CFLAGS="-I/usr/local/ssl/include $CFLAGS"
-
- if test "${with_sslinc+set}" = set; then
-
- withval="$with_sslinc"
- case "$withval" in
- yes|no)
- echo "configure: warning: --with-sslinc called without argument - will
- use default" 1>&2
- CFLAGS="-I/usr/local/ssl/include $CFLAGS"
- LDFLAGS="-L/usr/local/ssl/lib $LDFLAGS"
- LIBS="-lssl -lcrypto $LIBS"
- ;;
- * )
- CFLAGS="-I${withval}/include $CFLAGS"
- LDFLAGS="-L${withval}/lib $LDFLAGS"
- LIBS="-lssl -lcrypto $LIBS"
- ;;
- esac
-
- else
-
- CFLAGS="-I/usr/local/ssl/include $CFLAGS"
- LDFLAGS="-L/usr/local/ssl/lib $LDFLAGS"
- LIBS="-lssl -lcrypto $LIBS"
-
- fi
-
;;
*)
echo "$ac_t""no" 1>&6
diff --git a/source3/configure.developer b/source3/configure.developer
index 7906511a16..e1fee89d46 100755
--- a/source3/configure.developer
+++ b/source3/configure.developer
@@ -1,3 +1,3 @@
#!/bin/sh
-export CFLAGS="-g -O2 -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align"
+export CFLAGS="-g -O2 -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align" -DDEBUG_PASSWORD
./configure
diff --git a/source3/configure.in b/source3/configure.in
index 44982e5afb..74685e1ef2 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -62,7 +62,7 @@ AC_CHECK_HEADERS(sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)
AC_CHECK_HEADERS(shadow.h netinet/tcp.h sys/security.h security/pam_appl.h)
AC_CHECK_HEADERS(stropts.h poll.h readline.h history.h readline/readline.h)
AC_CHECK_HEADERS(readline/history.h sys/capability.h syscall.h sys/syscall.h)
-AC_CHECK_HEADERS(sys/acl.h sys/cdefs.h glob.h)
+AC_CHECK_HEADERS(sys/acl.h sys/cdefs.h glob.h mysql.h)
AC_CHECK_SIZEOF(int,cross)
AC_CHECK_SIZEOF(long,cross)
diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index 44e7b08377..f2dcdd7765 100644
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -786,6 +786,9 @@
/* Define if you have the <utime.h> header file. */
#undef HAVE_UTIME_H
+/* Define if you have the <mysql.h> header file. */
+#undef HAVE_MYSQL_H
+
/* Define if you have the dl library (-ldl). */
#undef HAVE_LIBDL
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 74aabc0b1f..46bb4d9e5c 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -330,6 +330,10 @@
#endif
#endif /* HAVE_NETGROUP */
+#if defined(HAVE_MYSQL_H)
+#include <mysql.h>
+#endif
+
#ifndef uchar
#define uchar unsigned char
#endif