2 files changed, 9 insertions, 2 deletions
diff --git a/conf.c b/conf.c
index ac02f1b1..b249a11b 100644
--- a/conf.c
+++ b/conf.c
@@ -139,8 +139,8 @@ conf_t *conf_load(int argc, char *argv[])
 			conf_free(conf);
 			return NULL;
 		} else if (opt == 'V') {
-			printf("BitlBee %s\nAPI version %06x\n",
-			       BITLBEE_VERSION, BITLBEE_VERSION_CODE);
+			printf("BitlBee %s\nAPI version %06x\nConfigure args: %s\n",
+			       BITLBEE_VERSION, BITLBEE_VERSION_CODE, BITLBEE_CONFIGURE_ARGS);
 			conf_free(conf);
 			return NULL;
 		} else if (opt == 'u') {
diff --git a/configure b/configure
index 5ac8ffd6..f2b913c6 100755
--- a/configure
+++ b/configure
@@ -24,6 +24,8 @@ pcdir='$prefix/lib/pkgconfig'
 systemlibdirs="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib"
 sysroot=''
 
+configure_args="$@"
+
 # Set these to default-on to let it be overriden by either the user or purple
 #
 # If the user sets one of these to 1, purple won't disable them.
@@ -176,6 +178,9 @@ protocols_mods=""
 
 cat <<EOF >Makefile.settings
 ## BitlBee settings, generated by configure
+
+# ./configure $configure_args
+
 PREFIX=$prefix
 BINDIR=$bindir
 SBINDIR=$sbindir
@@ -228,6 +233,8 @@ cat<<EOF >config.h
    Do *NOT* use any of these defines in your code without thinking twice, most
    of them can/will be overridden at run-time */
 
+#define BITLBEE_CONFIGURE_ARGS "$configure_args"
+
 #define CONFIG "$config"
 #define ETCDIR "$etcdir"
 #define VARDIR "$datadir"