Update autotools scripts

Signed-off-by: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>

.gitignore

@@ -1,6 +1,6 @@
 Makefile
 Makefile.in
-aclocal.m4
+*.m4
 ltmain.sh
 autom4te.cache/
 config.guess

Makefile.am

@@ -1 +1,2 @@
+ACLOCAL_AMFLAGS = -I m4
 SUBDIRS=src

bootstrap.sh

@@ -1,4 +1,4 @@
-set -x
+#set -x
 aclocal || exit 1
 libtoolize --force -c || exit 1
 automake --add-missing -c --foreign || exit 1

configure.ac

@@ -3,6 +3,8 @@
 #
 
 AC_INIT(openssl-ibmpkcs11, 1.0.0, opencryptoki-users@lists.sf.net)
+AC_CONFIG_SRCDIR([src/e_pkcs11.c]) #sanity check
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE(1.6.3)
 
 # Debugging support
@@ -14,7 +16,7 @@ AC_ARG_ENABLE(debug,
 # custom openssl location
 AC_ARG_WITH(openssl,
         [  --with-openssl[[=DIR]]    build with OpenSSL support [[/usr/local/ssl]]],
-        [openssl_prefix=$withval], 
+        [openssl_prefix=$withval],
         [openssl_prefix=]
 )
 if test "x$openssl_prefix" != x; then

m4/.dont_remove

@@ -0,0 +1,2 @@
+REQUIRED FILE, PLEASE DON'T REMOVE IT.
+The current configure.ac requires the m4 directory, but git don't save empty directories in the repository