sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

r15323: Fix internal popt build

Browse Source 
(This used to be commit e392c1e167da5fb2ee8c813e416b8fa51b3969e4)
This commit is contained in:
Jelmer Vernooij 2006-04-29 14:01:49 +00:00 committed by Gerald (Jerry) Carter
parent d81890c1cc
commit 25bd77ad55
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source4/lib/basic.mk
View File

@ -10,7 +10,6 @@ include tls/config.mk
include registry/config.mk
include messaging/config.mk
include events/config.mk
include popt/config.mk
include cmdline/config.mk
include socket_wrapper/config.mk
include appweb/config.mk

4
source4/lib/popt/config.m4
View File

@ -27,8 +27,8 @@ AC_MSG_CHECKING(whether to use included popt)
if test x"$INCLUDED_POPT" != x"no"; then
CPPFLAGS="$CPPFLAGS -I$srcdir/lib/popt"
SMB_SUBSYSTEM(LIBPOPT,
[],
[INT_LIB_POPT])
[lib/popt/findme.o lib/popt/popt.o lib/popt/poptconfig.o lib/popt/popthelp.o lib/popt/poptparse.o], [])
AC_MSG_RESULT(yes)
else
SMB_EXT_LIB(LIBPOPT, [${TMP_LIBPOPT_LIBS}])

10
source4/lib/popt/config.mk
View File

@ -1,10 +0,0 @@
##############################
# Start SUBSYSTEM INT_LIB_POPT
[SUBSYSTEM::INT_LIB_POPT]
OBJ_FILES = findme.o \
popt.o \
poptconfig.o \
popthelp.o \
poptparse.o
# End SUBSYSTEM INT_LIB_POPT
##############################