libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Got rid of Xorriso_with_regeX

Browse Source
This commit is contained in:
Thomas Schmitt 2008-12-08 15:46:17 +00:00
parent d8f3a0c3fd
commit cefb0a7a76
5 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libisoburn/trunk/Makefile.am
View File

@ -46,7 +46,7 @@ bin_PROGRAMS = \
# cat xorriso/xorriso_buildstamp.h # cat xorriso/xorriso_buildstamp.h
xorriso_xorriso_CPPFLAGS = -Ilibisoburn xorriso_xorriso_CPPFLAGS = -Ilibisoburn
xorriso_xorriso_CFLAGS = -DXorriso_with_maiN -DXorriso_with_regeX $(READLINE_DEF) xorriso_xorriso_CFLAGS = -DXorriso_with_maiN $(READLINE_DEF)
xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn $(THREAD_LIBS) xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn $(THREAD_LIBS)
xorriso_xorriso_SOURCES = \ xorriso_xorriso_SOURCES = \
xorriso/xorriso.h \ xorriso/xorriso.h \

2
libisoburn/trunk/xorriso/compile_xorriso.sh
View File

@ -92,7 +92,7 @@ date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >"$xorr"/xorriso_bu
echo "Build timestamp : $(sed -e 's/#define Xorriso_build_timestamP "//' -e 's/"$//' "$xorr"/xorriso_buildstamp.h)" echo "Build timestamp : $(sed -e 's/#define Xorriso_build_timestamP "//' -e 's/"$//' "$xorr"/xorriso_buildstamp.h)"
echo "compiling program $xorr/xorriso.c $static_opts $debug_opts $def_opts" echo "compiling program $xorr/xorriso.c $static_opts $debug_opts $def_opts"
cc -I. -DXorriso_with_maiN -DXorriso_with_regeX $def_libreadline \ cc -I. -DXorriso_with_maiN $def_libreadline \
$warn_opts \ $warn_opts \
$static_opts \ $static_opts \
$debug_opts \ $debug_opts \

2
libisoburn/trunk/xorriso/xorriso_makefile_am.txt
View File

@ -16,7 +16,7 @@ xorriso_xorriso_CPPFLAGS = -I./libburn -I./libisofs -I./libisoburn -I./xorriso
# No readline in the vanilla version because the necessary headers # No readline in the vanilla version because the necessary headers
# are in a separate readline-development package. # are in a separate readline-development package.
xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN -DXorriso_with_regeX $(READLINE_DEF) xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN $(READLINE_DEF)
xorriso_xorriso_LDADD = $(THREAD_LIBS) xorriso_xorriso_LDADD = $(THREAD_LIBS)

6
libisoburn/trunk/xorriso/xorriso_private.h
View File

@ -34,11 +34,7 @@
#define Xorriso_build_timestamP "-none-given-" #define Xorriso_build_timestamP "-none-given-"
#endif #endif
/* Because regex_t is mentioned in struct XorrisO */
#ifdef Xorriso_with_regeX
#include <regex.h> #include <regex.h>
#endif /* Xorriso_with_regeX */
#define Smem_malloC malloc #define Smem_malloC malloc
@ -310,10 +306,8 @@ struct XorrisO { /* the global context of xorriso */
char eternal_problem_status_text[20]; char eternal_problem_status_text[20];
/* temporary search facilities */ /* temporary search facilities */
#ifdef Xorriso_with_regeX
regex_t *re; regex_t *re;
regmatch_t match[1]; regmatch_t match[1];
#endif /* Xorriso_with_regeX */
char **re_constants; char **re_constants;
int re_count; int re_count;
int re_fill; int re_fill;

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.12.08.121106" #define Xorriso_timestamP "2008.12.08.154521"