diff options
| -rwxr-xr-x | source3/configure | 24 | ||||
| -rw-r--r-- | source3/configure.in | 6 | ||||
| -rw-r--r-- | source3/include/config.h.in | 2 |
3 files changed, 17 insertions, 15 deletions
diff --git a/source3/configure b/source3/configure index 27e0f6de40..3298e9a82f 100755 --- a/source3/configure +++ b/source3/configure @@ -477,7 +477,7 @@ echo > confdefs.h # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=byteorder.h +ac_unique_file=include/includes.h # Find the source files, if location was not specified. if test -z "$srcdir"; then @@ -3837,7 +3837,7 @@ else #define HAVE_NETMASK_IFCONF 1 #define AUTOCONF 1 -#include "netmask.c" +#include "lib/netmask.c" EOF if { (eval echo configure:3843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then @@ -3866,7 +3866,7 @@ else #define HAVE_NETMASK_IFREQ 1 #define AUTOCONF 1 -#include "netmask.c" +#include "lib/netmask.c" EOF if { (eval echo configure:3872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then @@ -3896,7 +3896,7 @@ else #define HAVE_NETMASK_AIX 1 #define AUTOCONF 1 -#include "netmask.c" +#include "lib/netmask.c" EOF if { (eval echo configure:3902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then @@ -4647,9 +4647,10 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile tests/dummy client/dummy lib/dummy lib/rpc/dummy -lib/rpc/client/dummy lib/rpc/include/dummy lib/rpc/parse/dummy -lib/rpc/server/dummy lib/smb/dummy ubiqx/dummy web/dummy config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile tests/dummy client/dummy lib/dummy ubiqx/dummy +web/dummy param/dummy nmbd/dummy smbd/dummy rpc_server/dummy +rpc_parse/dummy script/dummy include/dummy codepages/dummy +libsmb/dummy include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -4742,9 +4743,10 @@ EOF cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"Makefile tests/dummy client/dummy lib/dummy lib/rpc/dummy -lib/rpc/client/dummy lib/rpc/include/dummy lib/rpc/parse/dummy -lib/rpc/server/dummy lib/smb/dummy ubiqx/dummy web/dummy"} +CONFIG_FILES=\${CONFIG_FILES-"Makefile tests/dummy client/dummy lib/dummy ubiqx/dummy +web/dummy param/dummy nmbd/dummy smbd/dummy rpc_server/dummy +rpc_parse/dummy script/dummy include/dummy codepages/dummy +libsmb/dummy"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then @@ -4825,7 +4827,7 @@ ac_eD='%g' if test "${CONFIG_HEADERS+set}" != set; then EOF cat >> $CONFIG_STATUS <<EOF - CONFIG_HEADERS="config.h" + CONFIG_HEADERS="include/config.h" EOF cat >> $CONFIG_STATUS <<\EOF fi diff --git a/source3/configure.in b/source3/configure.in index 16c8fb889c..19b2e20d87 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -251,7 +251,7 @@ echo $ac_n "checking for netmask ifconf ... $ac_c" AC_TRY_RUN([ #define HAVE_NETMASK_IFCONF 1 #define AUTOCONF 1 -#include "netmask.c"], +#include "lib/netmask.c"], echo yes;netmask=yes;AC_DEFINE(HAVE_NETMASK_IFCONF), echo no) @@ -260,7 +260,7 @@ echo $ac_n "checking for netmask ifreq ... $ac_c" AC_TRY_RUN([ #define HAVE_NETMASK_IFREQ 1 #define AUTOCONF 1 -#include "netmask.c"], +#include "lib/netmask.c"], echo yes;netmask=yes;AC_DEFINE(HAVE_NETMASK_IFREQ), echo no) fi @@ -270,7 +270,7 @@ echo $ac_n "checking for netmask AIX ... $ac_c" AC_TRY_RUN([ #define HAVE_NETMASK_AIX 1 #define AUTOCONF 1 -#include "netmask.c"], +#include "lib/netmask.c"], echo yes;netmask=yes;AC_DEFINE(HAVE_NETMASK_AIX), echo no) fi diff --git a/source3/include/config.h.in b/source3/include/config.h.in index 3bdf5f1918..b73ee04e77 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* include/config.h.in. Generated automatically from configure.in by autoheader. */ /* Define if on AIX 3. System headers sometimes define this. |