vlc_cache_gen_SOURCES = cachegen.c
vlc_cache_gen_LDADD = \
+ $(GNUGETOPT_LIBS) \
../compat/libcompat.la \
../src/libvlc.la ../src/libvlccore.la
])
])
-dnl Check for getopt (always use builtin one on win32)
-if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then
-need_getopt=:
-else
-need_getopt=false
-AC_CHECK_FUNCS(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
-[ # FreeBSD has a gnugetopt library for this:
- AC_CHECK_LIB([gnugetopt],[getopt_long],
- [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support)
- VLC_ADD_LIBS([libvlccore],[-lgnugetopt])],
- [need_getopt=:])])
-fi
-AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt})
+dnl FreeBSD has a gnugetopt library for this:
+GNUGETOPT_LIBS=""
+AC_CHECK_FUNC(getopt_long,, [
+ AC_CHECK_LIB([gnugetopt],[getopt_long], [
+ GNUGETOPT_LIBS="-lgnugetopt"
+ ])
+])
+AC_SUBST(GNUGETOPT_LIBS)
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_CHECK_LIB(m,cos,[
$(SOURCES_libvlc_win32) \
$(SOURCES_libvlc_other) \
$(SOURCES_libvlc_dirent) \
- $(SOURCES_libvlc_getopt) \
$(SOURCES_libvlc_httpd) \
$(SOURCES_libvlc_sout) \
$(SOURCES_libvlc_vlm) \
if BUILD_DIRENT
libvlccore_la_SOURCES += $(SOURCES_libvlc_dirent)
endif
-if BUILD_GETOPT
-libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt)
-endif
if BUILD_HTTPD
libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
endif
extras/dirent.c \
$(NULL)
-SOURCES_libvlc_getopt = \
- extras/getopt.c \
- extras/getopt.h \
- extras/getopt1.c \
- $(NULL)
-
SOURCES_libvlc_common = \
libvlc.c \
libvlc.h \
misc/filter_chain.c \
misc/http_auth.c \
misc/sql.c \
+ extras/getopt.c \
+ extras/getopt.h \
+ extras/getopt1.c \
$(NULL)
SOURCES_libvlc_httpd = \
$(OPT_SOURCES_libvlc_darwin) \
$(OPT_SOURCES_libvlc_win32) \
$(OPT_SOURCES_libvlc_dirent) \
- $(OPT_SOURCES_libvlc_getopt) \
$(NULL)
SOURCES_libvlc_control = \
#include <vlc_keys.h>
#include <vlc_charset.h>
-#ifdef HAVE_GETOPT_LONG
-# ifdef HAVE_GETOPT_H
-# include <getopt.h> /* getopt() */
-# endif
-#else
-# include "../extras/getopt.h"
-#endif
+#include "../extras/getopt.h"
#include "configuration.h"
#include "modules/modules.h"
*/
opterr = 0;
optind = 0; /* set to 0 to tell GNU getopt to reinitialize */
- while( ( i_cmd = getopt_long( *pi_argc, (char **)ppsz_argv, psz_shortopts,
+ while( ( i_cmd = vlc_getopt_long( *pi_argc, (char **)ppsz_argv, psz_shortopts,
p_longopts, &i_index ) ) != -1 )
{
/* A long option has been recognized */
#endif
#endif
-#ifndef ELIDE_CODE
-
/* This needs to come after some library #include
to get __GNU_LIBRARY__ defined. */
#ifdef __GNU_LIBRARY__
(int *) 0,
0);
}
-
-#endif /* Not ELIDE_CODE. */
\f
#ifdef TEST
#else /* not __GNU_LIBRARY__ */
extern int getopt();
#endif /* __GNU_LIBRARY__ */
- extern int getopt_long(int argc, char *const *argv, const char *shortopts,
+ extern int vlc_getopt_long(int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind);
extern int getopt_long_only(int argc, char *const *argv,
const char *shortopts,
int long_only);
#else /* not __STDC__ */
extern int getopt();
- extern int getopt_long();
+ extern int vlc_getopt_long();
extern int getopt_long_only();
extern int _getopt_internal();
#endif
#endif
-#ifndef ELIDE_CODE
-
/* This needs to come after some library #include
to get __GNU_LIBRARY__ defined. */
#ifdef __GNU_LIBRARY__
#endif
int
- getopt_long(argc, argv, options, long_options, opt_index)
+ vlc_getopt_long(argc, argv, options, long_options, opt_index)
int argc;
char *const *argv;
const char *options;
{
return _getopt_internal(argc, argv, options, long_options, opt_index, 1);
}
-
-#endif /* Not ELIDE_CODE. */
\f
#ifdef TEST