resurrection commit. SOCKS proxy support added, lots of broken things…

… fixed

Makefile

@@ -1,20 +1,20 @@
 CC = gcc
 VERSION = 1.2.1
 CFLAGS = -g -O2
-LIBS = -lz 
+LIBS = -lcrypto -lssl -lz 
 INSTALL=/bin/install -c
 prefix=/usr/local
 bindir=$(prefix)${exec_prefix}/bin
 DESTDIR=
-FLAGS=$(CFLAGS) -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 
-OBJ=containerfiles.o outputfiles.o common.o cbsnews.o dailymotion.o  ehow.o  youtube.o servicetypes.o extract_text.o download.o display.o
+FLAGS=$(CFLAGS) -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DHAVE_LIBSSL=1 -DHAVE_LIBCRYPTO=1 
+OBJ=containerfiles.o outputfiles.o common.o ehow.o  youtube.o servicetypes.o extract_text.o download.o display.o
 
 all: $(OBJ)
-	@cd libUseful-2.0; $(MAKE)
-	$(CC) $(FLAGS) -o movgrab main.c $(LIBS) $(OBJ) libUseful-2.0/libUseful-2.0.a
+	@cd libUseful-2.4; $(MAKE)
+	$(CC) $(FLAGS) -o movgrab main.c $(LIBS) $(OBJ) libUseful-2.4/libUseful-2.4.a
 
 clean:
-	@rm -f movgrab *.o libUseful-2.0/*.o libUseful-2.0/*.a libUseful-2.0/*.so
+	@rm -f movgrab *.o libUseful-2.4/*.o libUseful-2.4/*.a libUseful-2.4/*.so
 
 containerfiles.o: containerfiles.c containerfiles.h
 	$(CC) $(FLAGS) -c containerfiles.c
@@ -25,12 +25,6 @@ outputfiles.o: outputfiles.c outputfiles.h
 common.o: common.c common.h
 	$(CC) $(FLAGS) -c common.c
 
-cbsnews.o: cbsnews.c cbsnews.h
-	$(CC) $(FLAGS) -c cbsnews.c
-
-dailymotion.o: dailymotion.c dailymotion.h
-	$(CC) $(FLAGS) -c dailymotion.c
-
 ehow.o: ehow.c ehow.h
 	$(CC) $(FLAGS) -c ehow.c
 

Makefile.in

@@ -7,14 +7,14 @@ prefix=@prefix@
 bindir=$(prefix)@bindir@
 DESTDIR=
 FLAGS=$(CFLAGS) @DEFS@ 
-OBJ=containerfiles.o outputfiles.o common.o cbsnews.o dailymotion.o  ehow.o  youtube.o servicetypes.o extract_text.o download.o display.o
+OBJ=containerfiles.o outputfiles.o common.o ehow.o  youtube.o servicetypes.o extract_text.o download.o display.o
 
 all: $(OBJ)
-	@cd libUseful-2.0; $(MAKE)
-	$(CC) $(FLAGS) -o movgrab main.c $(LIBS) $(OBJ) libUseful-2.0/libUseful-2.0.a
+	@cd libUseful-2.4; $(MAKE)
+	$(CC) $(FLAGS) -o movgrab main.c $(LIBS) $(OBJ) libUseful-2.4/libUseful-2.4.a
 
 clean:
-	@rm -f movgrab *.o libUseful-2.0/*.o libUseful-2.0/*.a libUseful-2.0/*.so
+	@rm -f movgrab *.o libUseful-2.4/*.o libUseful-2.4/*.a libUseful-2.4/*.so
 
 containerfiles.o: containerfiles.c containerfiles.h
 	$(CC) $(FLAGS) -c containerfiles.c
@@ -25,12 +25,6 @@ outputfiles.o: outputfiles.c outputfiles.h
 common.o: common.c common.h
 	$(CC) $(FLAGS) -c common.c
 
-cbsnews.o: cbsnews.c cbsnews.h
-	$(CC) $(FLAGS) -c cbsnews.c
-
-dailymotion.o: dailymotion.c dailymotion.h
-	$(CC) $(FLAGS) -c dailymotion.c
-
 ehow.o: ehow.c ehow.h
 	$(CC) $(FLAGS) -c ehow.c